DDownloader 0.2.8__tar.gz → 0.3.0__tar.gz

{ddownloader-0.2.8 → ddownloader-0.3.0}/DDownloader/main.py

@@ -16,26 +16,32 @@ logger = logging.getLogger("+ DDOWNLOADER + ")
 coloredlogs.install(level='DEBUG', logger=logger)
 
 def validate_directories():
+    """Ensure necessary directories exist."""
     downloads_dir = 'downloads'
-    if not os.path.exists(downloads_dir):
-        os.makedirs(downloads_dir)
-        # logger.debug(f"Created '{downloads_dir}' directory.")
+    try:
+        os.makedirs(downloads_dir, exist_ok=True)
+        # logger.debug(f"Validated existence of directory: '{downloads_dir}'.")
+    except Exception as e:
+        logger.error(f"Failed to create or validate downloads directory: {e}")
+        exit(1)
 
 def display_help():
     """Display custom help message with emoji."""
     print(
-        f"{Fore.WHITE}+" + "=" * 80 + f"+{Style.RESET_ALL}\n"
+        f"{Fore.WHITE}+" + "=" * 100 + f"+{Style.RESET_ALL}\n"
         f"{Fore.CYAN}{'Option':<40}{'Description':<90}{Style.RESET_ALL}\n"
-        f"{Fore.WHITE}+" + "=" * 80 + f"+{Style.RESET_ALL}\n"
+        f"{Fore.WHITE}+" + "=" * 100 + f"+{Style.RESET_ALL}\n"
         f"  {Fore.GREEN}-u, --url{' ' * 22}{Style.RESET_ALL}URL of the manifest (mpd/m3u8) 🌐\n"
         f"  {Fore.GREEN}-p, --proxy{' ' * 20}{Style.RESET_ALL}A proxy with protocol (http://ip:port) 🌍\n"
         f"  {Fore.GREEN}-o, --output{' ' * 19}{Style.RESET_ALL}Name of the output file 💾\n"
         f"  {Fore.GREEN}-k, --key{' ' * 22}{Style.RESET_ALL}Decryption key in KID:KEY format 🔑\n"
-        f"  {Fore.GREEN}-h, --help{' ' * 21}{Style.RESET_ALL}Show this help message and exit ❓\n"
-        f"{Fore.WHITE}+" + "=" * 80 + f"+{Style.RESET_ALL}\n"
+        f"  {Fore.GREEN}-h, --header{' ' * 19}{Style.RESET_ALL}Custom HTTP headers (e.g., User-Agent: value) 📋\n"
+        f"  {Fore.GREEN}-?, --help{' ' * 21}{Style.RESET_ALL}Show this help message and exit ❓\n"
+        f"{Fore.WHITE}+" + "=" * 100 + f"+{Style.RESET_ALL}\n"
     )
 
 def main():
+    """Main entry point for the downloader."""
     clear_and_print()
     platform_name = detect_platform()
     if platform_name == 'Unknown':
@@ -54,6 +60,8 @@ def main():
     clear_and_print()
 
     validate_directories()
+
+    # Parse arguments
     try:
         args = parse_arguments()
     except SystemExit:
@@ -78,12 +86,20 @@ def main():
     downloader.decryption_keys = args.key or []
     downloader.proxy = args.proxy  # Add proxy if provided
 
+    # Add headers if specified
+    if hasattr(args, 'header') and args.header:
+        downloader.headers = args.header  # Pass headers to downloader
+        logger.info("Custom HTTP headers provided:")
+        for header in args.header:
+            logger.info(f"  --header {header}")
+        print(Fore.MAGENTA + "=" * 100 + Fore.RESET)
+
     # Log provided decryption keys
     if downloader.decryption_keys:
         logger.info("Decryption keys provided:")
         for key in downloader.decryption_keys:
             logger.info(f"  --key {key}")
-        print(Fore.MAGENTA + "=" * 80 + Fore.RESET)
+        print(Fore.MAGENTA + "=" * 100 + Fore.RESET)
 
     # Execute downloader
     try:

ddownloader-0.3.0/DDownloader/modules/args_parser.py

@@ -0,0 +1,58 @@
+import argparse
+from colorama import Fore, Style
+
+def parse_arguments():
+    """Parse and return command-line arguments."""
+    # Create the ArgumentParser with a custom usage and help message
+    parser = argparse.ArgumentParser(
+        add_help=False,  # Disable default help
+        usage=f"""{Fore.CYAN}Usage:{Style.RESET_ALL}
+  script.py {Fore.YELLOW}-u{Style.RESET_ALL} <manifest_url> {Fore.YELLOW}-o{Style.RESET_ALL} <output_name> [{Fore.YELLOW}-p{Style.RESET_ALL} <proxy>] [{Fore.YELLOW}-k{Style.RESET_ALL} <key>] [{Fore.YELLOW}-h{Style.RESET_ALL} <header>]"""
+    )
+
+    # Add arguments (no default descriptions, suppress help visibility)
+    parser.add_argument(
+        "-u", "--url",
+        required=True,
+        help=argparse.SUPPRESS
+    )
+    parser.add_argument(
+        "-p", "--proxy",
+        help=argparse.SUPPRESS
+    )
+    parser.add_argument(
+        "-o", "--output",
+        required=True,
+        help=argparse.SUPPRESS
+    )
+    parser.add_argument(
+        "-k", "--key",
+        action="append",  # Allow multiple keys
+        help=argparse.SUPPRESS
+    )
+    parser.add_argument(
+        "-h", "--header",
+        action="append",  # Allow multiple headers
+        help=argparse.SUPPRESS
+    )
+    parser.add_argument(
+        "-?", "--help",
+        action="help",
+        default=argparse.SUPPRESS,
+        help=argparse.SUPPRESS
+    )
+
+    # Parse arguments
+    args = parser.parse_args()
+
+    # Validate mandatory arguments
+    if not args.url:
+        print(f"{Fore.RED}Error: The URL (-u) is required.{Style.RESET_ALL}")
+        parser.print_usage()
+        exit(1)
+    if not args.output:
+        print(f"{Fore.RED}Error: The output (-o) is required.{Style.RESET_ALL}")
+        parser.print_usage()
+        exit(1)
+
+    return args

{ddownloader-0.2.8 → ddownloader-0.3.0}/DDownloader/modules/banners.py

@@ -19,7 +19,7 @@ def banners():
     stdout.write(""+Fore.YELLOW   +"╔════════════════════════════════════════════════════════════════════════════╝\n")
     stdout.write(""+Fore.YELLOW   +"║ \x1b[38;2;255;20;147m• "+Fore.GREEN+"GITHUB             "+Fore.RED+"    |"+Fore.LIGHTWHITE_EX+"   GITHUB.COM/THATNOTEASY                        "+Fore.YELLOW+"║\n")
     stdout.write(""+Fore.YELLOW   +"╚════════════════════════════════════════════════════════════════════════════╝\n") 
-    print(f"{Fore.YELLOW}[DDownloader] - {Fore.GREEN}Download DASH or HLS streams with decryption keys. - {Fore.RED}[V0.2.8] \n{Fore.RESET}")
+    print(f"{Fore.YELLOW}[DDownloader] - {Fore.GREEN}Download DASH or HLS streams with decryption keys. - {Fore.RED}[V0.3.0] \n{Fore.RESET}")
     
 def clear_and_print():
     time.sleep(1)

{ddownloader-0.2.8 → ddownloader-0.3.0}/DDownloader/modules/dash_downloader.py

@@ -14,6 +14,7 @@ class DASH:
         self.output_name = None
         self.proxy = None
         self.decryption_keys = []
+        self.headers = []
         self.binary_path = self._get_binary_path()
 
     def _get_binary_path(self):
@@ -61,19 +62,24 @@ class DASH:
             '--select-audio', 'BEST',
             '-mt',
             '-M', 'format=mp4',
-            '--save-dir', 'downloads',
-            '--tmp-dir', 'downloads',
+            '--save-dir', '"downloads"',
+            '--tmp-dir', '"downloads"',
             '--del-after-done',
-            '--save-name', self.output_name
+            '--save-name', f'"{self.output_name}"'
         ]
 
         for key in self.decryption_keys:
-            command.extend(['--key', key])
+            command.extend(['--key', f'"{key}"'])
 
         if self.proxy:
             if not self.proxy.startswith("http://"):
                 self.proxy = f"http://{self.proxy}"
-            command.extend(['--custom-proxy', self.proxy])
+            command.extend(['--custom-proxy', f'"{self.proxy}"'])
+
+        # Add headers if any are provided
+        for header in self.headers:
+            command.extend(['-H', f'"{header}"'])
+
         # logger.debug(f"Built command: {' '.join(command)}")
         return command
 

{ddownloader-0.2.8 → ddownloader-0.3.0}/DDownloader/modules/hls_downloader.py

@@ -14,6 +14,7 @@ class HLS:
         self.output_name = None
         self.proxy = None
         self.decryption_keys = []
+        self.headers = []
         self.binary_path = self._get_binary_path()
 
     def _get_binary_path(self):
@@ -61,19 +62,24 @@ class HLS:
             '--select-audio', 'BEST',
             '-mt',
             '-M', 'format=mp4',
-            '--save-dir', 'downloads',
-            '--tmp-dir', 'downloads',
+            '--save-dir', '"downloads"',
+            '--tmp-dir', '"downloads"',
             '--del-after-done',
-            '--save-name', self.output_name
+            '--save-name', f'"{self.output_name}"'
         ]
 
         for key in self.decryption_keys:
-            command.extend(['--key', key])
+            command.extend(['--key', f'"{key}"'])
 
         if self.proxy:
             if not self.proxy.startswith("http://"):
                 self.proxy = f"http://{self.proxy}"
-            command.extend(['--custom-proxy', self.proxy])
+            command.extend(['--custom-proxy', f'"{self.proxy}"'])
+
+        # Add headers if any are provided
+        for header in self.headers:
+            command.extend(['-H', f'"{header}"'])
+
         # logger.debug(f"Built command: {' '.join(command)}")
         return command
 

{ddownloader-0.2.8 → ddownloader-0.3.0}/DDownloader.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: DDownloader
-Version: 0.2.8
+Version: 0.3.0
 Summary: A downloader for DRM-protected content.
 Author-email: ThatNotEasy <apidotmy@proton.me>
 License: MIT License

{ddownloader-0.2.8 → ddownloader-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: DDownloader
-Version: 0.2.8
+Version: 0.3.0
 Summary: A downloader for DRM-protected content.
 Author-email: ThatNotEasy <apidotmy@proton.me>
 License: MIT License

{ddownloader-0.2.8 → ddownloader-0.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "DDownloader"
-version = "0.2.8"
+version = "0.3.0"
 description = "A downloader for DRM-protected content."
 readme = { file = "README.md", content-type = "text/markdown" }
 authors = [

ddownloader-0.2.8/DDownloader/modules/args_parser.py

@@ -1,24 +0,0 @@
-import argparse
-from colorama import Fore, Style
-
-def parse_arguments():
-    """Parse and return command-line arguments."""
-    # Create the ArgumentParser with no default help and no description
-    parser = argparse.ArgumentParser(
-        add_help=False,  # Disable default help
-        usage="",  # Suppress the default usage message
-    )
-
-    # Add arguments (these will not include the default descriptions)
-    parser.add_argument("-u", "--url", required=True, help=argparse.SUPPRESS)
-    parser.add_argument("-p", "--proxy", help=argparse.SUPPRESS)
-    parser.add_argument("-o", "--output", required=True, help=argparse.SUPPRESS)
-    parser.add_argument("-k", "--key", action="append", help=argparse.SUPPRESS)
-    parser.add_argument(
-        "-h", "--help",
-        action="help",
-        default=argparse.SUPPRESS,
-        help=argparse.SUPPRESS
-    )
-
-    return parser.parse_args()