DDownloader 0.2.9__tar.gz → 0.3.1__tar.gz

{ddownloader-0.2.9 → ddownloader-0.3.1}/DDownloader/main.py

@@ -12,7 +12,7 @@ from DDownloader.modules.dash_downloader import DASH
 from DDownloader.modules.hls_downloader import HLS
 
 # Setup logger
-logger = logging.getLogger("+ DDOWNLOADER + ")
+logger = logging.getLogger("+ MAIN + ")
 coloredlogs.install(level='DEBUG', logger=logger)
 
 def validate_directories():
@@ -24,33 +24,26 @@ def validate_directories():
 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, --header{' ' * 19}{Style.RESET_ALL}Custom HTTP headers (e.g., User-Agent: value) 📋\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.WHITE}+" + "=" * 100 + f"+{Style.RESET_ALL}\n"
     )
 
 def main():
     clear_and_print()
     platform_name = detect_platform()
-    if platform_name == 'Unknown':
-        logger.error(f"Unsupported platform: {platform_name}")
-        exit(1)
-        
-    logger.info(f"Running on platform: {platform_name}")
+    logger.info(f"Downloading binaries... Please wait!")
+    print(Fore.MAGENTA + "=" * 100 + Fore.RESET)
     time.sleep(1)
-    
-    logger.info(f"Downloading binaries... Please wait!\n")
     bin_dir = Path(__file__).resolve().parent / "bin"
     download_binaries(bin_dir, platform_name)
-    
-    time.sleep(1)
-    logger.info(f"{Fore.GREEN}Downloading completed! Bye!{Fore.RESET}")
     clear_and_print()
 
     validate_directories()
@@ -60,7 +53,6 @@ def main():
         display_help()
         exit(1)
 
-    # Detect and initialize appropriate downloader
     downloader = None
     if re.search(r"\.mpd\b", args.url, re.IGNORECASE):
         logger.info("DASH stream detected. Initializing DASH downloader...")
@@ -76,14 +68,23 @@ def main():
     downloader.manifest_url = args.url
     downloader.output_name = args.output
     downloader.decryption_keys = args.key or []
+    downloader.headers = args.header or []
     downloader.proxy = args.proxy  # Add proxy if provided
+    
+    # Log provided headers
+    if downloader.headers:
+        print(Fore.MAGENTA + "=" * 100 + Fore.RESET)
+        logger.info("Headers provided:")
+        for header in downloader.headers:
+            logger.info(f"  -H {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:
@@ -96,4 +97,4 @@ def main():
         exit(1)
 
 if __name__ == "__main__":
-    main()
+    main()

{ddownloader-0.2.9 → ddownloader-0.3.1}/DDownloader/modules/args_parser.py

@@ -14,6 +14,7 @@ def parse_arguments():
     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", "--header", action="append", help=argparse.SUPPRESS)
     parser.add_argument(
         "-h", "--help",
         action="help",
@@ -21,4 +22,4 @@ def parse_arguments():
         help=argparse.SUPPRESS
     )
 
-    return parser.parse_args()
+    return parser.parse_args()

{ddownloader-0.2.9 → ddownloader-0.3.1}/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.9] \n{Fore.RESET}")
+    print(f"{Fore.YELLOW}[DDownloader] - {Fore.GREEN}Download DASH or HLS streams with decryption keys. - {Fore.RED}[V0.3.1] \n{Fore.RESET}")
     
 def clear_and_print():
     time.sleep(1)

{ddownloader-0.2.9 → ddownloader-0.3.1}/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):
@@ -55,25 +56,30 @@ class DASH:
 
     def _build_command(self):
         command = [
-            f'"{self.binary_path}"',
+            self.binary_path,
             f'"{self.manifest_url}"',
             '--select-video', 'BEST',
             '--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.9 → ddownloader-0.3.1}/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):
@@ -55,25 +56,30 @@ class HLS:
 
     def _build_command(self):
         command = [
-            f'"{self.binary_path}"',
+            self.binary_path,
             f'"{self.manifest_url}"',
             '--select-video', 'BEST',
             '--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.9 → ddownloader-0.3.1}/DDownloader.egg-info/PKG-INFO

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

{ddownloader-0.2.9 → ddownloader-0.3.1}/PKG-INFO

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

{ddownloader-0.2.9 → ddownloader-0.3.1}/pyproject.toml

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