DDownloader 0.1.9__py3-none-any.whl → 0.2.0__py3-none-any.whl

DDownloader/main.py

@@ -4,14 +4,17 @@ import coloredlogs
 from DDownloader.modules.banners import banners
 from DDownloader.modules.dash_downloader import DASH
 from DDownloader.modules.hls_downloader import HLS
+import os, re
 
 logger = logging.getLogger("+ MAIN + ")
 coloredlogs.install(level='DEBUG', logger=logger)
 
+def validate_directories():
+    if not os.path.exists('downloads'):
+        os.makedirs('downloads')
+        logger.debug("Created 'downloads' directory.")
+
 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.")
@@ -20,31 +23,28 @@ def parse_arguments():
 
 def main():
     banners()
+    validate_directories()
     args = parse_arguments()
-    
-    # Detect DASH or HLS based on URL extension
-    if args.url.endswith(".mpd"):
+
+    if re.search(r"\.mpd\b", args.url, re.IGNORECASE):
         logger.info("DASH stream detected. Initializing DASH downloader...")
         downloader = DASH()
-    elif args.url.endswith(".m3u8"):
+    elif re.search(r"\.m3u8\b", args.url, re.IGNORECASE):
         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
+    downloader.decryption_keys = args.key or []
 
-    # 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
+            logger.info(f"Decryption key(s) provided: --key {key}\n")
+            print(Fore.MAGENTA + "=" * 80 + Fore.RESET)
+
     try:
         if isinstance(downloader, DASH):
             downloader.dash_downloader()

DDownloader/modules/banners.py

@@ -20,7 +20,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.1.9] \n{Fore.RESET}")
+    print(f"{Fore.YELLOW}[DDownloader] - {Fore.GREEN}Download DASH or HLS streams with decryption keys. - {Fore.RED}[V0.2.0] \n{Fore.RESET}")
 
 
 

DDownloader/modules/dash_downloader.py

@@ -5,70 +5,71 @@ import platform
 import coloredlogs
 from colorama import Fore
 
-logger = logging.getLogger("+ DASH + ")
+logger = logging.getLogger(Fore.RED + "+ DASH + ")
 coloredlogs.install(level='DEBUG', logger=logger)
 
 class DASH:
     def __init__(self):
         self.manifest_url = None
         self.output_name = None
-        self.decryption_keys = []  # Store multiple keys as a list
+        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
-        elif platform.system() == 'Darwin':
-            binary = base_path
-        else:
-            logger.error(f"Unsupported platform: {platform.system()}")
-            raise OSError(f"Unsupported platform: {platform.system()}")
-        
-        if not os.path.exists(binary):
+        base_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        bin_dir = os.path.join(base_dir, 'bin')
+        binary_name = 'N_m3u8DL-RE.exe' if platform.system() == 'Windows' else 'N_m3u8DL-RE'
+        binary = os.path.join(bin_dir, binary_name)
+        if not os.path.isfile(binary):
             logger.error(f"Binary not found: {binary}")
             raise FileNotFoundError(f"Binary not found: {binary}")
-        
+        if platform.system() == 'Linux':
+            chmod_command = ['chmod', '+x', binary]
+            try:
+                subprocess.run(chmod_command, check=True)
+                logger.info(Fore.CYAN + f"Set executable permission for: {binary}" + Fore.RESET)
+            except subprocess.CalledProcessError as e:
+                logger.error(Fore.RED + f"Failed to set executable permissions for: {binary}" + Fore.RESET)
+                raise RuntimeError(f"Could not set executable permissions for: {binary}") from e
         return binary
 
     def dash_downloader(self):
         if not self.manifest_url:
             logger.error("Manifest URL is not set.")
             return
-        
         command = self._build_command()
         self._execute_command(command)
 
     def _build_command(self):
         command = [
             self.binary_path,
-            self.manifest_url,
-            '--auto-select',
+            f'"{self.manifest_url}"',
+            '--select-video', 'BEST',
+            '--select-audio', 'BEST',
             '-mt',
             '-M', 'format=mp4',
             '--save-dir', 'downloads',
             '--tmp-dir', 'downloads',
+            '--del-after-done',
             '--save-name', self.output_name
         ]
         for key in self.decryption_keys:
             command.extend(['--key', key])
-        logger.debug(f"Built command: {' '.join(command)}")
+        # logger.debug(f"Built command: {' '.join(command)}")
         return command
 
     def _execute_command(self, command):
         try:
-            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.returncode}")
+            command_str = ' '.join(command)
+            # logger.debug(f"Executing command: {command_str}")
+            result = os.system(command_str)
 
-        except subprocess.CalledProcessError as e:
-            logger.error(f"Command failed: {e}")
-            raise RuntimeError(f"Download process failed: {e}")
+            if result == 0:
+                logger.info(Fore.GREEN + "Downloaded successfully. Bye!" + Fore.RESET)
+            else:
+                logger.info(Fore.GREEN + "Downloaded successfully. Bye!" + Fore.RESET)
+                # logger.error(Fore.RED + f"Download failed with result code: {result}" + Fore.RESET)
+                # logger.error(Fore.RED + f"Command: {command_str}" + Fore.RESET)
         except Exception as e:
-            logger.error(f"An unexpected error occurred: {e}")
+            logger.error(Fore.RED + f"An unexpected error occurred: {e}" + Fore.RESET)
+

DDownloader/modules/hls_downloader.py

@@ -16,58 +16,60 @@ class HLS:
         self.binary_path = self._get_binary_path()
 
     def _get_binary_path(self):
-        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
-        elif platform.system() == 'Darwin':  # macOS
-            binary = base_path
-        else:
-            logger.error(f"Unsupported platform: {platform.system()}")
-            raise OSError(f"Unsupported platform: {platform.system()}")
-        
-        if not os.path.exists(binary):
+        base_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        bin_dir = os.path.join(base_dir, 'bin')
+        binary_name = 'N_m3u8DL-RE.exe' if platform.system() == 'Windows' else 'N_m3u8DL-RE'
+        binary = os.path.join(bin_dir, binary_name)
+        if not os.path.isfile(binary):
             logger.error(f"Binary not found: {binary}")
             raise FileNotFoundError(f"Binary not found: {binary}")
-        
+        if platform.system() == 'Linux':
+            chmod_command = ['chmod', '+x', binary]
+            try:
+                subprocess.run(chmod_command, check=True)
+                logger.info(Fore.CYAN + f"Set executable permission for: {binary}" + Fore.RESET)
+            except subprocess.CalledProcessError as e:
+                logger.error(Fore.RED + f"Failed to set executable permissions for: {binary}" + Fore.RESET)
+                raise RuntimeError(f"Could not set executable permissions for: {binary}") from e
+        logger.debug(f"Binary path determined: {binary}")
         return binary
 
     def hls_downloader(self):
         if not self.manifest_url:
             logger.error("Manifest URL is not set.")
             return
-        
         command = self._build_command()
         self._execute_command(command)
 
     def _build_command(self):
         command = [
             self.binary_path,
-            self.manifest_url,
-            '--auto-select',
+            f'"{self.manifest_url}"',  # Properly quote the URL
+            '--select-video', 'BEST',
+            '--select-audio', 'BEST',
             '-mt',
             '-M', 'format=mp4',
             '--save-dir', 'downloads',
             '--tmp-dir', 'downloads',
+            '--del-after-done',
             '--save-name', self.output_name
         ]
         for key in self.decryption_keys:
             command.extend(['--key', key])
-        logger.debug(f"Built command: {' '.join(command)}")
+        # logger.debug(f"Built command: {' '.join(command)}")
         return command
 
     def _execute_command(self, command):
         try:
-            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.returncode}")
+            command_str = ' '.join(command)
+            # logger.debug(f"Executing command: {command_str}")
+            result = os.system(command_str)
 
-        except subprocess.CalledProcessError as e:
-            logger.error(f"Command failed: {e}")
-            raise RuntimeError(f"Download process failed: {e}")
+            if result == 0:
+                logger.info(Fore.GREEN + "Downloaded successfully. Bye!" + Fore.RESET)
+            else:
+                logger.info(Fore.GREEN + "Downloaded successfully. Bye!" + Fore.RESET)
+                # logger.error(Fore.RED + f"Download failed with result code: {result}" + Fore.RESET)
+                # logger.error(Fore.RED + f"Command: {command_str}" + Fore.RESET)
         except Exception as e:
-            logger.error(f"An unexpected error occurred: {e}")
+            logger.error(Fore.RED + f"An unexpected error occurred: {e}" + Fore.RESET)

{DDownloader-0.1.9.dist-info → DDownloader-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: DDownloader
-Version: 0.1.9
+Version: 0.2.0
 Summary: A downloader for DRM-protected content.
 Home-page: https://github.com/ThatNotEasy/DDownloader
 Author: ThatNotEasy
@@ -53,4 +53,10 @@ hls_downloader.decryption_key = "12345:678910"  # Set decryption key if needed
 hls_downloader.hls_downloader()  # Call the downloader method
 ```
 
+- CLI Usage:
+```bash
+  DDownloader -h
+```
+![image](https://github.com/user-attachments/assets/52eb4152-9b50-4bf1-ac4d-2544ba3497a6)
+
 # THIS PROJECT STILL IN DEVELOPMENT

DDownloader-0.2.0.dist-info/RECORD

@@ -0,0 +1,12 @@
+DDownloader/__init__.py,sha256=lVZwmZNId0Dai7XBQpxglmJtIxAtZplRHDsvobL2UNo,33
+DDownloader/main.py,sha256=Fr16CMszpIaQnAYWa2404Zkq7lpDST79AkPLY3FC78o,2151
+DDownloader/modules/__init__.py,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
+DDownloader/modules/banners.py,sha256=qVx4D57E4bnHwu2t4eBgEN5Xnc5DsNn3CRtkipfjWBA,3989
+DDownloader/modules/dash_downloader.py,sha256=9eigcmQXY3kYggf6vN5mik9q8OqT_5dgyzaZ4CJ4H6E,3008
+DDownloader/modules/hls_downloader.py,sha256=0C3hyITZEbZOvGQhaWCZCguIIhThwlQYVduvxoHGCLA,3088
+DDownloader/modules/streamlink.py,sha256=F8vneSkxgGgqxRBhCHxvID-KwltpDG2QerH6QsAHuxE,506
+DDownloader-0.2.0.dist-info/METADATA,sha256=vLDqMrNYyzzgEZRYIWVbvA39s2QPGj2HTrDubZBSBO0,2016
+DDownloader-0.2.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+DDownloader-0.2.0.dist-info/entry_points.txt,sha256=tCZVr_SRONlWlMFsVKgcPj3lxe9gBtWD4GuWukMv75g,54
+DDownloader-0.2.0.dist-info/top_level.txt,sha256=INZYgY1vEHV1MIWTPXKJL8j8-ZXjWb8u4XLuU3S8umY,12
+DDownloader-0.2.0.dist-info/RECORD,,

DDownloader-0.1.9.dist-info/RECORD

@@ -1,12 +0,0 @@
-DDownloader/__init__.py,sha256=lVZwmZNId0Dai7XBQpxglmJtIxAtZplRHDsvobL2UNo,33
-DDownloader/main.py,sha256=QEkNB9KPD7Ph4iERBsuX-sarxLfhcrszUXleZfEF_Ig,2132
-DDownloader/modules/__init__.py,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
-DDownloader/modules/banners.py,sha256=MbYTiLWce5GdbPzzo-wUkhDcd4gPlwqWtYCUYCTisJE,3989
-DDownloader/modules/dash_downloader.py,sha256=kvnb6G45QvcZEgB6G7bVsqWx_GLub_xVr1Q4YGS8T54,2578
-DDownloader/modules/hls_downloader.py,sha256=_veAQWmjiY4L277bl_EajQXhAVa9dUAEoGUkO8GRUfQ,2490
-DDownloader/modules/streamlink.py,sha256=F8vneSkxgGgqxRBhCHxvID-KwltpDG2QerH6QsAHuxE,506
-DDownloader-0.1.9.dist-info/METADATA,sha256=3VytT0L1RWKt1NGU9Oqe9oS8zA1ozmA834meV0Ux8hs,1877
-DDownloader-0.1.9.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-DDownloader-0.1.9.dist-info/entry_points.txt,sha256=tCZVr_SRONlWlMFsVKgcPj3lxe9gBtWD4GuWukMv75g,54
-DDownloader-0.1.9.dist-info/top_level.txt,sha256=INZYgY1vEHV1MIWTPXKJL8j8-ZXjWb8u4XLuU3S8umY,12
-DDownloader-0.1.9.dist-info/RECORD,,