DDownloader 0.3.8__tar.gz → 0.4.0__tar.gz

{ddownloader-0.3.8 → ddownloader-0.4.0}/DDownloader/main.py

@@ -72,7 +72,6 @@ def main():
 
     downloader = DOWNLOADER()
 
-    # Handle downloading if URL is provided
     if args.url:
         if re.search(r"\.mpd\b", args.url, re.IGNORECASE):
             logger.info("DASH stream detected. Initializing DASH downloader...")
@@ -85,8 +84,19 @@ def main():
             print(Fore.RED + "═" * 100 + Fore.RESET)
             downloader.normal_downloader(args.url, os.path.join(downloads_dir, args.output))
             exit(1)
+        elif re.search(r"(youtube\.com|youtu\.be)", args.url, re.IGNORECASE):
+            logger.info("YouTube URL detected. Initializing YouTube downloader...")
+            print(Fore.RED + "═" * 100 + Fore.RESET)
+            is_playlist = "list=" in args.url
+            downloader.youtube_downloader(
+                url=args.url,
+                output_file=os.path.join(downloads_dir, args.output),
+                download_type="mp4",
+                playlist=is_playlist
+            )
+            exit(0)
         else:
-            logger.error("Unsupported URL format. Please provide a valid DASH (.mpd), HLS (.m3u8), or ISM (.ism) URL.")
+            logger.error("Unsupported URL format. Please provide a valid DASH (.mpd), HLS (.m3u8), ISM (.ism), or YouTube URL.")
             exit(1)
 
         downloader.manifest_url = args.url

ddownloader-0.4.0/DDownloader/modules/__init__.py

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

{ddownloader-0.3.8 → 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.8] \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.8 → ddownloader-0.4.0}/DDownloader/modules/downloader.py

@@ -29,16 +29,29 @@ class DOWNLOADER:
             binary_name = 'N_m3u8DL-RE.exe' if platform.system() == 'Windows' else 'N_m3u8DL-RE'
         elif binary_type == 'ffmpeg':
             binary_name = 'ffmpeg.exe' if platform.system() == 'Windows' else 'ffmpeg'
+        elif binary_type == 'yt-dlp':
+            binary_name = 'yt-dlp.exe' if platform.system() == 'Windows' else 'yt-dlp'
         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)
@@ -105,7 +118,7 @@ class DOWNLOADER:
 
 # =========================================================================================================== #
 
-    def re_encode_content(self, input_file, quality, codec="libx265", crf=20, preset="medium", audio_bitrate="256k"):
+    def re_encode_content(self, input_file, quality, codec="libx265", crf=23, preset="superfast", audio_bitrate="256k", fps=60):
         resolutions = {
             "HD": "1280:720",
             "FHD": "1920:1080",
@@ -128,22 +141,26 @@ class DOWNLOADER:
 
         self.binary_path = self._get_binary_path("ffmpeg")
 
-        logger.info(f"Re-encoding {input_file} to {quality} ({resolution}) using codec {codec}...")
+        logger.info(f"Re-encoding {input_file} to {quality} ({resolution}) at {fps} FPS using codec {codec}...")
         logger.info(f"Output file: {output_file}")
 
         os.makedirs(os.path.dirname(output_file), exist_ok=True)
 
-        # Build the ffmpeg command
+        # Build the ffmpeg command with multi-threading & FPS increase
         command = [
             self.binary_path,
             "-i", f"\"{input_file}\"",
-            "-vf", f"scale={resolution}",
+            "-r", str(fps),  # Increase FPS
+            "-vf", f"scale={resolution}:flags=lanczos,unsharp=5:5:1.0:5:5:0.0,hqdn3d=1.5:1.5:6:6",  # Scaling + Sharpening + Denoising
             "-c:v", codec,
-            "-crf", str(crf),
+            "-b:v", "25M",  # Video bitrate set to 25 Mbps for better quality
+            "-crf", str(crf),  # CRF still included for quality control
             "-preset", preset,
+            "-threads", "0",  # Enables multi-threading (uses all available CPU cores)
             "-c:a", "aac",
             "-b:a", audio_bitrate,
             "-movflags", "+faststart",
+            "-pix_fmt", "yuv444p",  # Ensures compatibility
             f"\"{output_file}\""
         ]
 
@@ -152,7 +169,7 @@ class DOWNLOADER:
 
         # Check if output file exists to confirm success
         if os.path.isfile(output_file):
-            logger.info(f"Re-encoding to {quality} completed successfully. Output saved to: {output_file}")
+            logger.info(f"Re-encoding to {quality} at {fps} FPS completed successfully. Output saved to: {output_file}")
             return output_file
         else:
             logger.error(f"Re-encoding failed. Output file not created: {output_file}")
@@ -199,4 +216,88 @@ class DOWNLOADER:
             print(f"Download complete: {output_file}")
 
         except requests.exceptions.RequestException as e:
-            print(f"Error during download: {e}")
+            print(f"Error during download: {e}")
+            
+# =========================================================================================================== #
+
+    def youtube_downloader(self, url, output_file, download_type="mp4", playlist=False):
+        """
+        Download a video, audio, or playlist from YouTube using yt-dlp.
+
+        Args:
+            url (str): The YouTube video or playlist URL.
+            output_file (str): The output file path to save the video or audio.
+            download_type (str): The type of download ("mp4" for video, "mp3" for audio).
+            playlist (bool): Whether the URL is a playlist.
+        """
+        try:
+            # Get the yt-dlp binary path
+            yt_dlp_path = self._get_binary_path("yt-dlp")
+
+            # Determine the output file extension based on download type
+            if download_type == "mp3":
+                output_file = os.path.splitext(output_file)[0] + ".mp3"
+            elif download_type == "mp4":
+                output_file = os.path.splitext(output_file)[0] + ".mp4"
+            else:
+                logger.error(Fore.RED + f"Invalid download type: {download_type}. Use 'mp4' or 'mp3'." + Fore.RESET)
+                return
+
+            # Build the yt-dlp command
+            command = [
+                yt_dlp_path,
+                "-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
+            if playlist:
+                command.extend([
+                    "--yes-playlist",  # Force downloading the playlist
+                    "--output", f"\"{output_file}/%(playlist_index)s - %(title)s.%(ext)s\"",  # Organize files in a folder
+                ])
+            else:
+                command.extend([
+                    "--no-playlist",  # Ignore playlists if the URL is a single video
+                ])
+
+            # Add audio extraction options if downloading MP3
+            if download_type == "mp3":
+                command.extend([
+                    "--extract-audio",  # Extract audio
+                    "--audio-format", "mp3",  # Convert to MP3
+                    "--audio-quality", "0",  # Best quality
+                ])
+            else:
+                # For MP4, download the best video and audio formats and merge them
+                command.extend([
+                    "-f", "bv*+ba/b",  # Download best video + best audio, or fallback to best combined format
+                    "--merge-output-format", "mp4",  # Merge into MP4
+                ])
+
+            # Add the YouTube URL
+            command.append(url)
+
+            # Execute the command
+            self._execute_command(command)
+
+            # Check if output file(s) exist to confirm success
+            if playlist:
+                if os.path.exists(output_file) and os.listdir(output_file):
+                    logger.info(f"Playlist download completed successfully. Files saved to: {output_file}")
+                    return output_file
+                else:
+                    logger.error(f"Playlist download failed. No files were created in: {output_file}")
+                    return None
+            else:
+                if os.path.isfile(output_file):
+                    logger.info(f"Download from YouTube completed successfully. Output saved to: {output_file}")
+                    return output_file
+                else:
+                    logger.error(f"Download from YouTube failed. Output file not created: {output_file}")
+                    return None
+
+        except Exception as e:
+            logger.error(Fore.RED + f"An unexpected error occurred: {e}" + Fore.RESET)

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

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

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

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "DDownloader"
-version = "0.3.8"
+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.8"
+version = "0.4.0"
 description = "A downloader for DRM-protected & Non DRM-protected content."
 authors = ["ThatNotEasy <apidotmy@proton.me>"]
 license = "MIT"

ddownloader-0.3.8/DDownloader/modules/__init__.py

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