Update dl.py

dl.py

@@ -1,3 +1,4 @@
+import os
 import sys
 import subprocess
 
@@ -9,9 +10,11 @@ def main():
         idx = args.index('--save-name')
         if idx + 1 < len(args):
             savename = args[idx + 1]
-            args = args[:idx] + args[idx+2:]
+            args = args[:idx] + args[idx + 2:]
 
+    # Execute tasks.py and get the DASH link
     tasks_result = subprocess.run([sys.executable, 'tasks.py'] + args, capture_output=True, text=True)
+
     dash_link = None
     for line in tasks_result.stdout.splitlines():
         if line.startswith("DASH Link:"):
@@ -21,29 +24,30 @@ def main():
     get_result = subprocess.run([sys.executable, 'keys.py'] + args, capture_output=True, text=True)
     get_output = get_result.stdout.strip()
 
-    string = f"DASH Link: {dash_link}\n{get_output}" if dash_link else get_output
+    # Extract only the key part from get_output
+    key_part = get_output.split(':', 1)[0] + ':' + get_output.split(':', 1)[1].strip()
 
-    print(string)
+    print(f"Executing command with key: {key_part}")
-    if savename:
-        print(savename)
 
+    # Prepare the command
     command = [
         'N_m3u8dl-re',
-	'-sv', 'best',
+        '-M', 'mp4',
-	'-sa', 'best',
+        '-sv', 'best',
-        '--key', string,
+        '-sa', 'best',
-        '--use-shaka-packager',
+        '--key', key_part,
     ]
-    if savename:
+
-        command.extend(['--save-name', savename])
+    # Append the dash_link without additional quotes
     if dash_link:
         command.append(dash_link)
 
+    # Run the N_m3u8dl-re command
     try:
+        print("Running command...")
         subprocess.run(command, check=True)
     except subprocess.CalledProcessError as e:
         print(f"Error running N_m3u8dl-re: {e}")
 
 if __name__ == "__main__":
     main()
-