DDownloader 0.3.9__tar.gz → 0.4.0__tar.gz

ddownloader-0.4.0/DDownloader/modules/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.4.0"

{ddownloader-0.3.9 → ddownloader-0.4.0}/DDownloader/modules/banners.py

@@ -23,7 +23,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}A DRM-Protected & Non-Protected Content Downloader - {Fore.RED}[V0.3.9] \n{Fore.RESET}")
+    print(f"{Fore.YELLOW}[DDownloader] - {Fore.GREEN}A DRM-Protected & Non-Protected Content Downloader - {Fore.RED}[V0.4.0] \n{Fore.RESET}")
 
 # =========================================================================================================== #
 

{ddownloader-0.3.9 → ddownloader-0.4.0}/DDownloader/modules/downloader.py

@@ -34,13 +34,24 @@ class DOWNLOADER:
         else:
             raise ValueError(f"Unknown binary type: {binary_type}")
 
+        # First check project's bin directory
         binary_path = os.path.join(bin_dir, binary_name)
+        
+        # For ffmpeg on Linux, fall back to system path if not found in project
+        if binary_type == 'ffmpeg' and platform.system() == 'Linux' and not os.path.isfile(binary_path):
+            system_ffmpeg = '/usr/bin/ffmpeg'
+            if os.path.isfile(system_ffmpeg):
+                binary_path = system_ffmpeg
+                logger.info(Fore.YELLOW + f"Using system ffmpeg at: {binary_path}" + Fore.RESET)
+            else:
+                logger.error(f"ffmpeg not found in project bin or system path")
+                raise FileNotFoundError(f"ffmpeg not found in project bin or system path")
 
         if not os.path.isfile(binary_path):
             logger.error(f"Binary not found: {binary_path}")
             raise FileNotFoundError(f"Binary not found: {binary_path}")
 
-        if platform.system() == 'Linux':
+        if platform.system() == 'Linux' and not binary_path.startswith('/usr/bin/'):
             chmod_command = ['chmod', '+x', binary_path]
             try:
                 subprocess.run(chmod_command, check=True)
@@ -238,6 +249,7 @@ class DOWNLOADER:
                 "-o", f"\"{output_file}\"",  # Output file
                 "--no-check-certificate",  # Bypass certificate verification
                 "--extractor-args", "youtube:player_client=android",  # Force a specific extractor
+                "--ignore-errors",  # Ignore errors and continue downloading
             ]
 
             # Add playlist-specific options if the URL is a playlist

{ddownloader-0.3.9 → ddownloader-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: DDownloader
-Version: 0.3.9
+Version: 0.4.0
 Summary: A downloader for DRM-protected & Non DRM-protected content.
 License: MIT License
          

{ddownloader-0.3.9 → ddownloader-0.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "DDownloader"
-version = "0.3.9"
+version = "0.4.0"
 description = "A downloader for DRM-protected & Non DRM-protected content."
 readme = { file = "README.md", content-type = "text/markdown" }
 authors = [
@@ -25,7 +25,7 @@ classifiers = [
 
 [tool.poetry]
 name = "DDownloader"
-version = "0.3.9"
+version = "0.4.0"
 description = "A downloader for DRM-protected & Non DRM-protected content."
 authors = ["ThatNotEasy <apidotmy@proton.me>"]
 license = "MIT"

ddownloader-0.3.9/DDownloader/modules/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.3.9"