DDownloader 0.2.3__py3-none-any.whl → 0.2.5__py3-none-any.whl

DDownloader/main.py

@@ -7,12 +7,12 @@ from pathlib import Path
 from colorama import Fore, Style
 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.banners import clear_and_print
 from DDownloader.modules.dash_downloader import DASH
 from DDownloader.modules.hls_downloader import HLS
 
 # Setup logger
-logger = logging.getLogger("+ MAIN + ")
+logger = logging.getLogger("+ DDOWNLOADER + ")
 coloredlogs.install(level='DEBUG', logger=logger)
 
 def validate_directories():
@@ -36,18 +36,22 @@ def display_help():
     )
 
 def main():
-    banners()
-    time.sleep(1)
+    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}")
     time.sleep(1)
     
-    logger.info(f"Downloading binaries... Please wait!")
+    logger.info(f"Downloading binaries... Please wait!\n")
     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()
+    logger.info(f"{Fore.GREEN}Downloading completed! Bye!{Fore.RESET}")
+    clear_and_print()
 
     validate_directories()
     try:

DDownloader/modules/banners.py

@@ -1,4 +1,4 @@
-import os
+import os, time
 from sys import stdout
 from colorama import Fore, Style
 
@@ -6,7 +6,6 @@ def clear_screen():
     os.system('cls' if os.name == 'nt' else 'clear')
     
 def banners():
-    clear_screen()
     stdout.write("                                                                                         \n")
     stdout.write(""+Fore.LIGHTRED_EX +"██████╗ ██████╗  ██████╗ ██╗    ██╗███╗   ██╗██╗      ██████╗  █████╗ ██████╗  █████╗ ███████╗██████╗ \n")
     stdout.write(""+Fore.LIGHTRED_EX +"██╔══██╗██╔══██╗██╔═══██╗██║    ██║████╗  ██║██║     ██╔═══██╗██╔══██╗██╔══██╗██╔══██╗██╔════╝██╔══██╗\n")
@@ -20,7 +19,12 @@ 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.3] \n{Fore.RESET}")
+    print(f"{Fore.YELLOW}[DDownloader] - {Fore.GREEN}Download DASH or HLS streams with decryption keys. - {Fore.RED}[V0.2.5] \n{Fore.RESET}")
+    
+def clear_and_print():
+    time.sleep(1)
+    clear_screen()
+    banners()
 
 
 

DDownloader/modules/helper.py

@@ -1,39 +1,58 @@
 import os
 import requests
 from tqdm import tqdm
-from colorama import Fore
+from colorama import Fore, Style, init
 import logging
 import coloredlogs
 import platform
 
+# Initialize Colorama for Windows compatibility
+init(autoreset=True)
+
+# Logger setup
 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"
-]
+# Binaries with platform-specific handling
+binaries = {
+    "Windows": [
+        "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-dlp.exe",
+        "https://github.com/ThatNotEasy/DDownloader/raw/refs/heads/main/DDownloader/bin/mkvmerge.exe"
+    ],
+    "Linux": [
+        "https://github.com/ThatNotEasy/DDownloader/raw/refs/heads/main/DDownloader/bin/N_m3u8DL-RE"
+    ]
+}
 
-def download_binaries(bin_dir):
+def download_binaries(bin_dir, platform_name):
+    """
+    Downloads platform-specific binaries to the specified directory.
+    """
     os.makedirs(bin_dir, exist_ok=True)
-    # logger.info(f"Created or confirmed directory: {bin_dir}")
+    logger.info(f"Platform detected: {platform_name}")
+    logger.info(f"Using binary directory: {bin_dir}")
+    
+    platform_binaries = binaries.get(platform_name, [])
+    
+    if not platform_binaries:
+        logger.error(f"No binaries available for platform: {platform_name}")
+        return
 
-    for binary_url in binaries:
+    for binary_url in platform_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).")
+                logger.info(f"{Style.BRIGHT}{Fore.YELLOW}Skipping {filename} (already exists).")
                 continue
 
-            logger.info(f"Downloading {filename} from {binary_url}...")
+            logger.info(f"{Fore.GREEN}Downloading {Fore.WHITE}{filename}...{Fore.RESET}")
             response = requests.get(binary_url, stream=True, timeout=30)
             response.raise_for_status()
 
@@ -52,12 +71,18 @@ def download_binaries(bin_dir):
                     progress_bar.update(len(chunk))
 
             logger.info(f"{Fore.GREEN}Downloaded and saved: {filepath}{Fore.RESET}")
+            # Make binary executable on Linux
+            if platform_name == "Linux":
+                os.chmod(filepath, 0o755)
         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():
+    """
+    Detects the current operating system platform.
+    """
     system_platform = platform.system().lower()
     if system_platform == 'windows':
         return 'Windows'

{DDownloader-0.2.3.dist-info → DDownloader-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: DDownloader
-Version: 0.2.3
+Version: 0.2.5
 Summary: A downloader for DRM-protected content.
 Author-email: ThatNotEasy <apidotmy@proton.me>
 License: MIT License
@@ -44,6 +44,9 @@ Requires-Dist: loguru>=0.6.0
 - Download DASH manifests and segments.
 - Decrypt media files using mp4decrypt.
 
+# Footprints Notes:
+- It is better if you have set your own environment variables.
+
 # Installation
 Use the package manager pip to install DDownloader.
 ```pip install DDownloader```

{DDownloader-0.2.3.dist-info → DDownloader-0.2.5.dist-info}/RECORD

@@ -1,15 +1,15 @@
 DDownloader/__init__.py,sha256=lVZwmZNId0Dai7XBQpxglmJtIxAtZplRHDsvobL2UNo,33
-DDownloader/main.py,sha256=6nCcnznPLmo4TTz2plg1mNtsx7-osuutOXdls6cJ1nI,3563
+DDownloader/main.py,sha256=tzBOATpwdBWEM__S805UaibUiE5gGhAgjH5joCvAJZs,3710
 DDownloader/modules/__init__.py,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
 DDownloader/modules/args_parser.py,sha256=JsmemrQcxBSz8aWHWTpAO6I4BfGoK6GmJvJFuhRhZ7Y,919
-DDownloader/modules/banners.py,sha256=_ZxH7nIyQhTV7iSW5lVsjN8BWKbDR_wMo8FZzCSw3nA,3989
+DDownloader/modules/banners.py,sha256=S_MNMWv2xPRWt-B1OYeCmy_sAW6466qPe9g1Ahotxzo,4059
 DDownloader/modules/dash_downloader.py,sha256=EJhNl7hRSO085ra2c9y5UdDL3x67Nb1VtDeO4svmn0I,3766
-DDownloader/modules/helper.py,sha256=DnyQa4HNlhatTOcq8tj6l6bhvql9d9bbaxn3wI4_KHo,2983
+DDownloader/modules/helper.py,sha256=EIhvwpy8xFt5-SjY_G0iuMO1TYm_5LNTv6zXoyJyOrQ,3809
 DDownloader/modules/hls_downloader.py,sha256=e-PdWdgi0msVcxBPOJl8xmPpRS2ItBX4AAkZpgtGw1M,3761
 DDownloader/modules/streamlink.py,sha256=F8vneSkxgGgqxRBhCHxvID-KwltpDG2QerH6QsAHuxE,506
-DDownloader-0.2.3.dist-info/LICENSE,sha256=cnjTim3BMjb9cVC_b3oS41FESKLuvuDsufVHa_ymZRw,1090
-DDownloader-0.2.3.dist-info/METADATA,sha256=nrlEMfyUJDFAyZycHjYpfr_22-Bid55UCJFOXXdbpDg,3402
-DDownloader-0.2.3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-DDownloader-0.2.3.dist-info/entry_points.txt,sha256=tCZVr_SRONlWlMFsVKgcPj3lxe9gBtWD4GuWukMv75g,54
-DDownloader-0.2.3.dist-info/top_level.txt,sha256=INZYgY1vEHV1MIWTPXKJL8j8-ZXjWb8u4XLuU3S8umY,12
-DDownloader-0.2.3.dist-info/RECORD,,
+DDownloader-0.2.5.dist-info/LICENSE,sha256=cnjTim3BMjb9cVC_b3oS41FESKLuvuDsufVHa_ymZRw,1090
+DDownloader-0.2.5.dist-info/METADATA,sha256=Mmv636Iu54PRUH3rmNx0xbhGLYJ6b4xfkTVJDhps2YM,3489
+DDownloader-0.2.5.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+DDownloader-0.2.5.dist-info/entry_points.txt,sha256=tCZVr_SRONlWlMFsVKgcPj3lxe9gBtWD4GuWukMv75g,54
+DDownloader-0.2.5.dist-info/top_level.txt,sha256=INZYgY1vEHV1MIWTPXKJL8j8-ZXjWb8u4XLuU3S8umY,12
+DDownloader-0.2.5.dist-info/RECORD,,