Merge pull request #18 from thehellruler/main

Upgrade MegaDL

Author: XronTrix10

colab_leecher/downlader/mega.py

@@ -6,77 +6,39 @@
 from datetime import datetime
 from colab_leecher.utility.helper import status_bar
 from colab_leecher.utility.variables import BotTimes, Messages, Paths
-
+from pymegatools import Megatools,MegaError
 
 async def megadl(link: str, num: int):
 
     global BotTimes, Messages
     BotTimes.task_start = datetime.now()
+    mega= Megatools()
+    try:
+        await mega.async_download(link,progress=pro_for_mega,path= Paths.down_path)
+    except MegaError as e:
+        logging.error(f"An Error occured : {e}")
 
-    # TODO: Check the type of link and set the commands accordingly. i.e, Check if private or public, file or folder
-
-    # Create a command to run megadl with the link
-    command = [
-        "megadl",
-        "--no-ask-password",
-        "--path",
-        Paths.down_path,
-        link,
-    ]
-
-    process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE,  bufsize=0)
-
-    while True:
-        output = process.stdout.readline()  # Read output line by line # type: ignore
-        if output == b'' and process.poll() is not None:
-            break  # Exit loop when process terminates and output is empty
-
-        try:
-            await extract_info(output.strip().decode("utf-8"))
-        except Exception as e:
-            logging.error(f"{e}")
-
-
-async def extract_info(line):
 
-    # Split the line by colon and space
-    parts = line.split(": ")
-    subparts = []
-    # Split the second part by space
-    if len(parts) > 1:
-        subparts = parts[1].split()
-    
+async def pro_for_mega(stream, process):
+    line =stream[-1]
     file_name = "N/A"
-    progress = "N/A"
+    percentage = 0
     downloaded_size = "N/A"
     total_size = "N/A"
     speed = "N/A"
-
-    if len(subparts) > 10:
-        
-        try:
-            # Get the file name from the first part
-            file_name = parts[0]
-            Messages.download_name = file_name
-            # Get the progress from the first subpart
-            progress = subparts[0][:-1]
-            # Get the downloaded size and bytes from the subpart
-            downloaded_size = f"{subparts[2]} {subparts[3]}"
-            # downloaded_bytes = subparts[4][1:-1]
-            # Get the total size from the subpart
-            total_size = f"{subparts[7]} {subparts[8]}"
-            # Get the speed from the subpart
-            speed = f"{subparts[9][1:]} {subparts[10][:-1]}"
-        except Exception:
-            logging.error(f"Got this \n{parts}")
-        
+    try :
+        ok =line.split(":")
+        file_name = ok[0]
+        ok=ok[1].split()
+        percentage = float(ok[0][:-1])
+        downloaded_size = ok[2]+" "+ok[3]
+        total_size =  ok[7]+" "+ok[8]
+        speed = ok[9][1:]+" "+ok[10][:-1]
+    except Exception:
+        pass
+    Messages.download_name = file_name
     Messages.status_head = f"<b>📥 DOWNLOADING FROM MEGA » </b>\n\n<b>🏷️ Name » </b><code>{file_name}</code>\n"
 
-    try:
-        percentage = round(float(progress)) 
-    except Exception:
-        percentage = 0
-      
     await status_bar(
         Messages.status_head,
         speed,

requirements.txt

@@ -15,3 +15,4 @@ requests
 tgcrypto
 uvloop
 yt_dlp
+pymegatools