DDownloader 0.3.0__tar.gz → 0.3.2__tar.gz

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

@@ -12,18 +12,14 @@ 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():
-    """Ensure necessary directories exist."""
     downloads_dir = 'downloads'
-    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)
+    if not os.path.exists(downloads_dir):
+        os.makedirs(downloads_dir)
+        # logger.debug(f"Created '{downloads_dir}' directory.")
 
 def display_help():
     """Display custom help message with emoji."""
@@ -35,40 +31,28 @@ def display_help():
         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}-?, --help{' ' * 21}{Style.RESET_ALL}Show this help message and exit ❓\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}+" + "=" * 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':
-        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()
-
-    # Parse arguments
     try:
         args = parse_arguments()
     except SystemExit:
         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...")
@@ -84,14 +68,22 @@ 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
-
-    # 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}")
+    
+    if downloader.proxy:
+        print(Fore.MAGENTA + "=" * 100 + Fore.RESET)
+        if not downloader.proxy.startswith("http://"):
+            downloader.proxy = f"http://{downloader.proxy}"
+            logger.info(f"Proxy: {downloader.proxy}")
+            print(Fore.MAGENTA + "=" * 100 + Fore.RESET)
+            
+    # 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
@@ -112,4 +104,4 @@ def main():
         exit(1)
 
 if __name__ == "__main__":
-    main()
+    main()

ddownloader-0.3.2/DDownloader/modules/args_parser.py

@@ -0,0 +1,25 @@
+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", "--header", action="append", help=argparse.SUPPRESS)
+    parser.add_argument(
+        "-h", "--help",
+        action="help",
+        default=argparse.SUPPRESS,
+        help=argparse.SUPPRESS
+    )
+
+    return parser.parse_args()

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

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

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

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

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

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

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

ddownloader-0.3.0/DDownloader/modules/args_parser.py

@@ -1,58 +0,0 @@
-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