DDownloader 0.2.4__tar.gz → 0.2.6__tar.gz

{ddownloader-0.2.4 → ddownloader-0.2.6}/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("+ MAIN + ")
+logger = logging.getLogger("+ DDOWNLOADER + ")
 coloredlogs.install(level='DEBUG', logger=logger)
 
 def validate_directories():
@@ -38,12 +38,17 @@ def display_help():
 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}")
     time.sleep(1)
     
     logger.info(f"Downloading binaries... Please wait!\n")
     bin_dir = Path(__file__).resolve().parent / "bin"
     download_binaries(bin_dir)
+    
     time.sleep(1)
     logger.info(f"{Fore.GREEN}Downloading completed! Bye!{Fore.RESET}")
     clear_and_print()

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

ddownloader-0.2.6/DDownloader/modules/helper.py

@@ -0,0 +1,94 @@
+import os
+import requests
+from tqdm import tqdm
+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 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, platform_name):
+    """
+    Downloads platform-specific binaries to the specified directory.
+    """
+    os.makedirs(bin_dir, exist_ok=True)
+    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 platform_binaries:
+        try:
+            filename = binary_url.split("/")[-1]
+            filepath = os.path.join(bin_dir, filename)
+
+            if os.path.exists(filepath):
+                logger.info(f"{Style.BRIGHT}{Fore.YELLOW}Skipping {filename} (already exists).")
+                continue
+
+            logger.info(f"{Fore.GREEN}Downloading {Fore.WHITE}{filename}...{Fore.RESET}")
+            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}")
+            # 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'
+    elif system_platform == 'linux':
+        return 'Linux'
+    elif system_platform == 'darwin':
+        return 'MacOS'
+    else:
+        return 'Unknown'

{ddownloader-0.2.4 → ddownloader-0.2.6}/DDownloader.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: DDownloader
-Version: 0.2.4
+Version: 0.2.6
 Summary: A downloader for DRM-protected content.
 Author-email: ThatNotEasy <apidotmy@proton.me>
 License: MIT License
@@ -34,6 +34,8 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests>=2.26.0
 Requires-Dist: coloredlogs>=15.0
+Requires-Dist: tqdm>=4.64.0
+Requires-Dist: colorama>=0.4.5
 Requires-Dist: loguru>=0.6.0
 
 # DDownloader
@@ -44,6 +46,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.4 → ddownloader-0.2.6}/DDownloader.egg-info/requires.txt

@@ -1,3 +1,5 @@
 requests>=2.26.0
 coloredlogs>=15.0
+tqdm>=4.64.0
+colorama>=0.4.5
 loguru>=0.6.0

{ddownloader-0.2.4 → ddownloader-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: DDownloader
-Version: 0.2.4
+Version: 0.2.6
 Summary: A downloader for DRM-protected content.
 Author-email: ThatNotEasy <apidotmy@proton.me>
 License: MIT License
@@ -34,6 +34,8 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests>=2.26.0
 Requires-Dist: coloredlogs>=15.0
+Requires-Dist: tqdm>=4.64.0
+Requires-Dist: colorama>=0.4.5
 Requires-Dist: loguru>=0.6.0
 
 # DDownloader
@@ -44,6 +46,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.4 → ddownloader-0.2.6}/README.md

@@ -6,6 +6,9 @@
 - 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.4 → ddownloader-0.2.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "DDownloader"
-version = "0.2.4"
+version = "0.2.6"
 description = "A downloader for DRM-protected content."
 readme = { file = "README.md", content-type = "text/markdown" }
 authors = [
@@ -21,6 +21,8 @@ classifiers = [
 dependencies = [
     "requests>=2.26.0",
     "coloredlogs>=15.0",
+    "tqdm>=4.64.0",
+    "colorama>=0.4.5",
     "loguru>=0.6.0"
 ]
 
@@ -31,4 +33,4 @@ homepage = "https://github.com/ThatNotEasy/DDownloader"
 include = ["DDownloader", "DDownloader.*"]
 
 [project.scripts]
-DDownloader = "DDownloader.main:main"
+DDownloader = "DDownloader.main:main"

ddownloader-0.2.4/DDownloader/modules/helper.py

@@ -1,69 +0,0 @@
-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-dlp.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"{Fore.GREEN}Downloading {Fore.WHITE}{filename}...{Fore.RESET}")
-            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'