DDownloader 0.1.6__tar.gz → 0.1.7__tar.gz

DDownloader-0.1.7/DDownloader/__init__.py

@@ -0,0 +1,4 @@
+from .main import main
+from .modules import DASH, HLS
+
+__all__ = ['main', 'DASH', 'HLS']

DDownloader-0.1.7/DDownloader/main.py

@@ -0,0 +1,55 @@
+import argparse
+import logging
+from modules.dash_downloader import DASH
+from modules.hls_downloader import HLS
+
+logger = logging.getLogger("+ MAIN + ")
+coloredlogs.install(level='DEBUG', logger=logger)
+
+def parse_arguments():
+    """
+    Parse command-line arguments for the downloader.
+    """
+    parser = argparse.ArgumentParser(description="Download DASH or HLS streams with decryption keys.")
+    parser.add_argument("-u", "--url", required=True, help="Manifest URL pointing to the stream (.mpd or .m3u8).")
+    parser.add_argument("-k", "--key", action="append", help="Decryption keys in the format KID:KEY. Use multiple -k options for multiple keys.")
+    parser.add_argument("-o", "--output", required=True, help="Output file name.")
+    return parser.parse_args()
+
+def main():
+    # Parse arguments
+    args = parse_arguments()
+    
+    # Detect DASH or HLS based on URL extension
+    if args.url.endswith(".mpd"):
+        logger.info("DASH stream detected. Initializing DASH downloader...")
+        downloader = DASH()
+    elif args.url.endswith(".m3u8"):
+        logger.info("HLS stream detected. Initializing HLS downloader...")
+        downloader = HLS()
+    else:
+        logger.error("Unsupported URL format. Please provide a valid DASH (.mpd) or HLS (.m3u8) URL.")
+        return
+    
+    # Set downloader properties
+    downloader.manifest_url = args.url
+    downloader.output_name = args.output
+    downloader.decryption_keys = args.key or []  # Default to an empty list if no keys provided
+
+    # Log decryption keys
+    if downloader.decryption_keys:
+        logger.info("Decryption key(s) provided:")
+        for key in downloader.decryption_keys:
+            logger.info(f"--key {key}")
+    
+    # Start download
+    try:
+        if isinstance(downloader, DASH):
+            downloader.dash_downloader()
+        else:
+            downloader.hls_downloader()
+    except Exception as e:
+        logger.error(f"An error occurred: {e}")
+
+if __name__ == "__main__":
+    main()

DDownloader-0.1.7/DDownloader/modules/__init__.py

@@ -0,0 +1 @@
+

{DDownloader-0.1.6/DDownloader → DDownloader-0.1.7/DDownloader/modules}/dash_downloader.py

@@ -1,11 +1,10 @@
 import os
 import subprocess
 import logging
-import platform  # For platform detection
+import platform
 import coloredlogs
 from colorama import Fore
 
-# Set up logging
 logger = logging.getLogger("+ DASH + ")
 coloredlogs.install(level='DEBUG', logger=logger)
 
@@ -13,7 +12,7 @@ class DASH:
     def __init__(self):
         self.manifest_url = None
         self.output_name = None
-        self.decryption_key = None  # Default to None, making it optional
+        self.decryption_keys = []  # Store multiple keys as a list
         self.binary_path = self._get_binary_path()
 
     def _get_binary_path(self):
@@ -23,9 +22,9 @@ class DASH:
         if platform.system() == 'Windows':
             binary = f"{base_path}.exe"
         elif platform.system() == 'Linux':
-            binary = base_path  # Linux binaries usually have no extension
-        elif platform.system() == 'Darwin':  # macOS
-            binary = base_path  # Adjust if necessary for macOS-specific binaries
+            binary = base_path
+        elif platform.system() == 'Darwin':
+            binary = base_path
         else:
             logger.error(f"Unsupported platform: {platform.system()}")
             raise OSError(f"Unsupported platform: {platform.system()}")
@@ -42,43 +41,34 @@ class DASH:
             return
         
         command = self._build_command()
-        
-        # logger.debug(f"Running command: {command}")
         self._execute_command(command)
 
     def _build_command(self):
-        # Build the basic command without extra quotes
         command = [
-            self.binary_path,              # Path to the binary
-            self.manifest_url,             # The manifest URL
+            self.binary_path,
+            self.manifest_url,
             '--auto-select',
             '-mt',
-            '--thread-count', '12',
+            '-M', 'format=mp4',
             '--save-dir', 'downloads',
             '--tmp-dir', 'downloads',
-            '--save-name', self.output_name  # The output name
+            '--save-name', self.output_name
         ]
-        
-        # Only add decryption_key if it's provided
-        if self.decryption_key:
-            logger.debug(f"Decryption key provided: {self.decryption_key}")
-            command.append(f'--key {self.decryption_key}')  # Ensure correct format: KID:KEY
-        
-        # Join the command as a single string for system execution
-        command_str = ' '.join(command)
-        # logger.debug(f"Command string: {command_str}")
-        
-        return command_str
+        for key in self.decryption_keys:
+            command.extend(['--key', key])
+        logger.debug(f"Built command: {' '.join(command)}")
+        return command
 
     def _execute_command(self, command):
         try:
-            # Use os.system to run the command as a string
-            result = os.system(command)
-            
-            if result == 0:
+            result = subprocess.run(command, check=True)
+            if result.returncode == 0:
                 logger.info("Downloaded using N_m3u8DL-RE successfully.")
             else:
-                logger.error(f"Download failed with result code: {result}")
+                logger.error(f"Download failed with result code: {result.returncode}")
 
+        except subprocess.CalledProcessError as e:
+            logger.error(f"Command failed: {e}")
+            raise RuntimeError(f"Download process failed: {e}")
         except Exception as e:
             logger.error(f"An unexpected error occurred: {e}")

{DDownloader-0.1.6/DDownloader → DDownloader-0.1.7/DDownloader/modules}/hls_downloader.py

@@ -1,11 +1,10 @@
 import os
 import subprocess
 import logging
-import platform  # For platform detection
+import platform
 import coloredlogs
 from colorama import Fore
 
-# Set up logging
 logger = logging.getLogger(Fore.RED + "+ HLS + ")
 coloredlogs.install(level='DEBUG', logger=logger)
 
@@ -13,19 +12,18 @@ class HLS:
     def __init__(self):
         self.manifest_url = None
         self.output_name = None
-        self.decryption_key = None  # Default to None, making it optional
+        self.decryption_keys = []
         self.binary_path = self._get_binary_path()
 
     def _get_binary_path(self):
-        """Determine the correct binary path based on the platform."""
         base_path = os.path.join(os.path.dirname(__file__), 'bin', 'N_m3u8DL-RE')
         
         if platform.system() == 'Windows':
             binary = f"{base_path}.exe"
         elif platform.system() == 'Linux':
-            binary = base_path  # Linux binaries usually have no extension
+            binary = base_path
         elif platform.system() == 'Darwin':  # macOS
-            binary = base_path  # Adjust if necessary for macOS-specific binaries
+            binary = base_path
         else:
             logger.error(f"Unsupported platform: {platform.system()}")
             raise OSError(f"Unsupported platform: {platform.system()}")
@@ -42,42 +40,34 @@ class HLS:
             return
         
         command = self._build_command()
-        
-        # logger.debug(f"Running command: {command}")
         self._execute_command(command)
 
     def _build_command(self):
-        # Build the command to pass to os.system()
         command = [
-            self.binary_path,  # Path to the binary
-            self.manifest_url,  # Manifest URL (no need for quotes)
+            self.binary_path,
+            self.manifest_url,
             '--auto-select',
             '-mt',
-            '--thread-count', '12',
+            '-M', 'format=mp4',
             '--save-dir', 'downloads',
             '--tmp-dir', 'downloads',
-            '--save-name', self.output_name  # The output name (no quotes)
+            '--save-name', self.output_name
         ]
-        
-        # Only add decryption_key if it's provided
-        if self.decryption_key:
-            command.append(f'--key {self.decryption_key}')  # Ensure correct format: KID:KEY
-        
-        # Join the command as a single string for system execution
-        command_str = ' '.join(command)
-        # logger.debug(f"Command string: {command_str}")
-        
-        return command_str
+        for key in self.decryption_keys:
+            command.extend(['--key', key])
+        logger.debug(f"Built command: {' '.join(command)}")
+        return command
 
     def _execute_command(self, command):
         try:
-            # Use os.system to run the command as a string
-            result = os.system(command)
-            
-            if result == 0:
+            result = subprocess.run(command, check=True)
+            if result.returncode == 0:
                 logger.info("Downloaded using N_m3u8DL-RE successfully.")
             else:
-                logger.error(f"Download failed with result code: {result}")
+                logger.error(f"Download failed with result code: {result.returncode}")
 
+        except subprocess.CalledProcessError as e:
+            logger.error(f"Command failed: {e}")
+            raise RuntimeError(f"Download process failed: {e}")
         except Exception as e:
             logger.error(f"An unexpected error occurred: {e}")

{DDownloader-0.1.6 → DDownloader-0.1.7}/DDownloader.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: DDownloader
-Version: 0.1.6
+Version: 0.1.7
 Summary: A downloader for DRM-protected content.
 Home-page: https://github.com/ThatNotEasy/DDownloader
 Author: ThatNotEasy

{DDownloader-0.1.6 → DDownloader-0.1.7}/DDownloader.egg-info/SOURCES.txt

@@ -1,12 +1,14 @@
 README.md
 setup.py
 DDownloader/__init__.py
-DDownloader/dash_downloader.py
-DDownloader/hls_downloader.py
-DDownloader/streamlink.py
+DDownloader/main.py
 DDownloader.egg-info/PKG-INFO
 DDownloader.egg-info/SOURCES.txt
 DDownloader.egg-info/dependency_links.txt
 DDownloader.egg-info/entry_points.txt
 DDownloader.egg-info/requires.txt
-DDownloader.egg-info/top_level.txt
+DDownloader.egg-info/top_level.txt
+DDownloader/modules/__init__.py
+DDownloader/modules/dash_downloader.py
+DDownloader/modules/hls_downloader.py
+DDownloader/modules/streamlink.py

{DDownloader-0.1.6 → DDownloader-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: DDownloader
-Version: 0.1.6
+Version: 0.1.7
 Summary: A downloader for DRM-protected content.
 Home-page: https://github.com/ThatNotEasy/DDownloader
 Author: ThatNotEasy

{DDownloader-0.1.6 → DDownloader-0.1.7}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="DDownloader",
-    version="0.1.6",
+    version="0.1.7",
     description="A downloader for DRM-protected content.",
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",

DDownloader-0.1.6/DDownloader/__init__.py

@@ -1,11 +0,0 @@
-from .bin import *
-from .dash_downloader import DASH
-from .hls_downloader import HLS
-from .streamlink import STREAMLINK
-
-__all__ = [
-    'DDownloader',
-    'HLS',
-    'STREAMLINK',
-    'DASH'
-]