From f24fa2d3a1589252f7c18e79f16f78433575a132 Mon Sep 17 00:00:00 2001 From: adef17286-sudo Date: Tue, 14 Oct 2025 16:34:53 +0000 Subject: [PATCH] Update dl.py --- dl.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/dl.py b/dl.py index f1baf27..d3fdd5c 100644 --- a/dl.py +++ b/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) - if savename: - print(savename) + print(f"Executing command with key: {key_part}") + # Prepare the command command = [ 'N_m3u8dl-re', - '-sv', 'best', - '-sa', 'best', - '--key', string, - '--use-shaka-packager', + '-M', 'mp4', + '-sv', 'best', + '-sa', 'best', + '--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() -