DDownloader 0.2.2__tar.gz → 0.2.3__tar.gz

{ddownloader-0.2.2 → ddownloader-0.2.3}/DDownloader/main.py

@@ -2,8 +2,10 @@ import os
 import re
 import logging
 import coloredlogs
+import time
+from pathlib import Path
 from colorama import Fore, Style
-import platform, time # Added to detect platform
+from DDownloader.modules.helper import download_binaries, detect_platform
 from DDownloader.modules.args_parser import parse_arguments
 from DDownloader.modules.banners import banners
 from DDownloader.modules.dash_downloader import DASH
@@ -14,23 +16,10 @@ logger = logging.getLogger("+ MAIN + ")
 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.")
-
-def detect_platform():
-    """Detect the platform the script is running on."""
-    system_platform = platform.system().lower()
-    if system_platform == 'windows':
-        return 'Windows'
-    elif system_platform == 'linux':
-        return 'Linux'
-    elif system_platform == 'darwin':
-        return 'MacOS'
-    else:
-        return 'Unknown'
+        # logger.debug(f"Created '{downloads_dir}' directory.")
 
 def display_help():
     """Display custom help message with emoji."""
@@ -50,9 +39,16 @@ def main():
     banners()
     time.sleep(1)
     platform_name = detect_platform()
-    logger.info(f"Running on platform: {platform_name}\n")
+    logger.info(f"Running on platform: {platform_name}")
     time.sleep(1)
     
+    logger.info(f"Downloading binaries... Please wait!")
+    bin_dir = Path(__file__).resolve().parent / "bin"
+    download_binaries(bin_dir)
+    logger.info(f"{Fore.GREEN}Downloading completed! Bye!{Fore.RESET}")
+    time.sleep(1)
+    banners()
+
     validate_directories()
     try:
         args = parse_arguments()

{ddownloader-0.2.2 → ddownloader-0.2.3}/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.2.2] \n{Fore.RESET}")
+    print(f"{Fore.YELLOW}[DDownloader] - {Fore.GREEN}Download DASH or HLS streams with decryption keys. - {Fore.RED}[V0.2.3] \n{Fore.RESET}")
 
 
 

{ddownloader-0.2.2 → ddownloader-0.2.3}/DDownloader/modules/dash_downloader.py

@@ -17,13 +17,24 @@ class DASH:
         self.binary_path = self._get_binary_path()
 
     def _get_binary_path(self):
-        base_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-        bin_dir = os.path.join(base_dir, 'bin')
+        """
+        Dynamically determine the path to the binary file in the 'bin' directory relative to the main module.
+        """
+        # Locate the base directory for the project (relative to main.py)
+        base_dir = os.path.dirname(os.path.abspath(__file__))  # Directory containing the current module
+        project_root = os.path.dirname(base_dir)  # Go up one level to the project root
+        bin_dir = os.path.join(project_root, 'bin')  # Bin directory is under the project root
+
+        # Determine the binary file name based on the platform
         binary_name = 'N_m3u8DL-RE.exe' if platform.system() == 'Windows' else 'N_m3u8DL-RE'
         binary = os.path.join(bin_dir, binary_name)
+
+        # Check if the binary exists
         if not os.path.isfile(binary):
             logger.error(f"Binary not found: {binary}")
             raise FileNotFoundError(f"Binary not found: {binary}")
+
+        # Ensure the binary is executable on Linux
         if platform.system() == 'Linux':
             chmod_command = ['chmod', '+x', binary]
             try:
@@ -32,6 +43,7 @@ class DASH:
             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):

ddownloader-0.2.3/DDownloader/modules/helper.py

@@ -0,0 +1,69 @@
+import os
+import requests
+from tqdm import tqdm
+from colorama import Fore
+import logging
+import coloredlogs
+import platform
+
+logger = logging.getLogger(Fore.GREEN + "+ HELPER + ")
+coloredlogs.install(level='DEBUG', logger=logger)
+
+binaries = [
+    "https://github.com/ThatNotEasy/DDownloader/raw/refs/heads/main/DDownloader/bin/N_m3u8DL-RE",
+    "https://github.com/ThatNotEasy/DDownloader/raw/refs/heads/main/DDownloader/bin/N_m3u8DL-RE.exe",
+    "https://github.com/ThatNotEasy/DDownloader/raw/refs/heads/main/DDownloader/bin/ffmpeg.exe",
+    "https://github.com/ThatNotEasy/DDownloader/raw/refs/heads/main/DDownloader/bin/aria2c.exe",
+    "https://github.com/ThatNotEasy/DDownloader/raw/refs/heads/main/DDownloader/bin/mp4decrypt.exe",
+    "https://github.com/ThatNotEasy/DDownloader/raw/refs/heads/main/DDownloader/bin/shaka-packager.exe",
+    "https://github.com/ThatNotEasy/DDownloader/raw/refs/heads/main/DDownloader/bin/yt-dl.exe",
+    "https://github.com/ThatNotEasy/DDownloader/raw/refs/heads/main/DDownloader/bin/mkvmerge.exe"
+]
+
+def download_binaries(bin_dir):
+    os.makedirs(bin_dir, exist_ok=True)
+    # logger.info(f"Created or confirmed directory: {bin_dir}")
+
+    for binary_url in binaries:
+        try:
+            filename = binary_url.split("/")[-1]
+            filepath = os.path.join(bin_dir, filename)
+
+            if os.path.exists(filepath):
+                logger.info(f"Skipping {filename} (already exists).")
+                continue
+
+            logger.info(f"Downloading {filename} from {binary_url}...")
+            response = requests.get(binary_url, stream=True, timeout=30)
+            response.raise_for_status()
+
+            # Total size for progress bar
+            total_size = int(response.headers.get('content-length', 0))
+            with open(filepath, "wb") as file, tqdm(
+                total=total_size,
+                unit='B',
+                unit_scale=True,
+                desc=f"{Fore.CYAN}{filename}{Fore.RESET}",
+                dynamic_ncols=True,
+                bar_format="{l_bar}{bar} | {n_fmt}/{total_fmt} [{rate_fmt}]"
+            ) as progress_bar:
+                for chunk in response.iter_content(chunk_size=8192):
+                    file.write(chunk)
+                    progress_bar.update(len(chunk))
+
+            logger.info(f"{Fore.GREEN}Downloaded and saved: {filepath}{Fore.RESET}")
+        except requests.exceptions.RequestException as e:
+            logger.error(f"{Fore.RED}Failed to download {binary_url}: {e}{Fore.RESET}")
+        except Exception as e:
+            logger.error(f"{Fore.RED}Unexpected error for {binary_url}: {e}{Fore.RESET}")
+
+def detect_platform():
+    system_platform = platform.system().lower()
+    if system_platform == 'windows':
+        return 'Windows'
+    elif system_platform == 'linux':
+        return 'Linux'
+    elif system_platform == 'darwin':
+        return 'MacOS'
+    else:
+        return 'Unknown'

{ddownloader-0.2.2 → ddownloader-0.2.3}/DDownloader/modules/hls_downloader.py

@@ -17,13 +17,24 @@ class HLS:
         self.binary_path = self._get_binary_path()
 
     def _get_binary_path(self):
-        base_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-        bin_dir = os.path.join(base_dir, 'bin')
+        """
+        Dynamically determine the path to the binary file in the 'bin' directory relative to the main module.
+        """
+        # Locate the base directory for the project (relative to main.py)
+        base_dir = os.path.dirname(os.path.abspath(__file__))  # Directory containing the current module
+        project_root = os.path.dirname(base_dir)  # Go up one level to the project root
+        bin_dir = os.path.join(project_root, 'bin')  # Bin directory is under the project root
+
+        # Determine the binary file name based on the platform
         binary_name = 'N_m3u8DL-RE.exe' if platform.system() == 'Windows' else 'N_m3u8DL-RE'
         binary = os.path.join(bin_dir, binary_name)
+
+        # Check if the binary exists
         if not os.path.isfile(binary):
             logger.error(f"Binary not found: {binary}")
             raise FileNotFoundError(f"Binary not found: {binary}")
+
+        # Ensure the binary is executable on Linux
         if platform.system() == 'Linux':
             chmod_command = ['chmod', '+x', binary]
             try:
@@ -32,7 +43,7 @@ class HLS:
             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):

{ddownloader-0.2.2 → ddownloader-0.2.3}/DDownloader.egg-info/PKG-INFO

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

{ddownloader-0.2.2 → ddownloader-0.2.3}/DDownloader.egg-info/SOURCES.txt

@@ -13,5 +13,6 @@ DDownloader/modules/__init__.py
 DDownloader/modules/args_parser.py
 DDownloader/modules/banners.py
 DDownloader/modules/dash_downloader.py
+DDownloader/modules/helper.py
 DDownloader/modules/hls_downloader.py
 DDownloader/modules/streamlink.py

{ddownloader-0.2.2 → ddownloader-0.2.3}/PKG-INFO

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

{ddownloader-0.2.2 → ddownloader-0.2.3}/pyproject.toml

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