DDownloader 0.4.0__tar.gz → 0.4.2__tar.gz

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

@@ -71,6 +71,7 @@ def main():
         exit(1)
 
     downloader = DOWNLOADER()
+    downloader.auto_select = args.auto_select
 
     if args.url:
         if re.search(r"\.mpd\b", args.url, re.IGNORECASE):
@@ -88,6 +89,7 @@ def main():
             logger.info("YouTube URL detected. Initializing YouTube downloader...")
             print(Fore.RED + "═" * 100 + Fore.RESET)
             is_playlist = "list=" in args.url
+            downloader.cookies = args.cookies
             downloader.youtube_downloader(
                 url=args.url,
                 output_file=os.path.join(downloads_dir, args.output),
@@ -95,8 +97,20 @@ def main():
                 playlist=is_playlist
             )
             exit(0)
+        elif re.search(r"iq\.com", args.url, re.IGNORECASE):
+            logger.info("IQ.com URL detected. Initializing IQ.com downloader...")
+            print(Fore.RED + "═" * 100 + Fore.RESET)
+            # Set default output name if not provided
+            output_name = args.output if args.output else "iq_video"
+            downloader.cookies = args.cookies
+            downloader.iq_downloader(
+                url=args.url,
+                output_file=os.path.join(downloads_dir, output_name),
+                download_type="mp4"
+            )
+            exit(0)
         else:
-            logger.error("Unsupported URL format. Please provide a valid DASH (.mpd), HLS (.m3u8), ISM (.ism), or YouTube URL.")
+            logger.error("Unsupported URL format. Please provide a valid DASH (.mpd), HLS (.m3u8), ISM (.ism), YouTube, or IQ.com URL.")
             exit(1)
 
         downloader.manifest_url = args.url
@@ -122,6 +136,10 @@ def main():
             for key in downloader.decryption_keys:
                 logger.info(f"  - {key}")
             print(Fore.RED + "═" * 100 + Fore.RESET + "\n")
+            
+        if downloader.auto_select:
+            logger.info("Auto-select enabled - will choose best quality automatically")
+            print(Fore.RED + "═" * 100 + Fore.RESET + "\n")
 
         try:
             downloader.drm_downloader()

ddownloader-0.4.2/DDownloader/modules/__init__.py

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

{ddownloader-0.4.0 → ddownloader-0.4.2}/DDownloader/modules/args_parser.py

@@ -15,8 +15,12 @@ def parse_arguments():
     parser.add_argument("-o", "--output", help=argparse.SUPPRESS)
     parser.add_argument("-k", "--key", action="append", help=argparse.SUPPRESS)
     parser.add_argument("-H", "--header", action="append", help=argparse.SUPPRESS)
+    parser.add_argument("-c", "--cookies", help=argparse.SUPPRESS)
     parser.add_argument("-i", "--input", help=argparse.SUPPRESS)
     parser.add_argument("-q", "--quality", help=argparse.SUPPRESS)
+    parser.add_argument("--auto-select", 
+                      action="store_true",
+                      help=argparse.SUPPRESS)
     parser.add_argument(
         "-h", "--help",
         action="help",

{ddownloader-0.4.0 → ddownloader-0.4.2}/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.4.0] \n{Fore.RESET}")
+    print(f"{Fore.YELLOW}[DDownloader] - {Fore.GREEN}A DRM-Protected & Non-Protected Content Downloader - {Fore.RED}[V0.4.2] \n{Fore.RESET}")
 
 # =========================================================================================================== #
 
@@ -45,6 +45,7 @@ def display_help():
         f"  {Fore.GREEN}-o, --output{' ' * 19}{Style.RESET_ALL}Name of the output file 💾\n"
         f"  {Fore.GREEN}-k, --key{' ' * 22}{Style.RESET_ALL}Decryption key in KID:KEY format 🔑\n"
         f"  {Fore.GREEN}-H, --header{' ' * 19}{Style.RESET_ALL}Custom HTTP headers (e.g., User-Agent: value) 📋\n"
+        f"  {Fore.GREEN}-c, --cookies{' ' * 19}{Style.RESET_ALL}Cookies file (e.g., netscape/json formatter) 📋\n"
         f"{Fore.RED}.++" + "═" * 100 + f"++.{Style.RESET_ALL}\n"
         f"  {Fore.GREEN}-i, --input{' ' * 20}{Style.RESET_ALL}Input file for re-encoding. 📂\n"
         f"  {Fore.GREEN}-q, --quality{' ' * 18}{Style.RESET_ALL}Target quality: HD, FHD, UHD. 🎥\n"

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

@@ -16,7 +16,9 @@ class DOWNLOADER:
         self.proxy = None
         self.decryption_keys = []
         self.headers = []
+        self.cookies = None
         self.binary_path = None
+        self.auto_select = False
 
 # =========================================================================================================== #
 
@@ -94,6 +96,9 @@ class DOWNLOADER:
             if not self.proxy.startswith("http://"):
                 self.proxy = f"http://{self.proxy}"
             command.extend(['--custom-proxy', f'"{self.proxy}"'])
+            
+        if self.auto_select:
+            command.extend(['--auto-select'])
 
         for header in self.headers:
             command.extend(['-H', f'"{header}"'])
@@ -116,6 +121,73 @@ class DOWNLOADER:
         except Exception as e:
             logger.error(Fore.RED + f"An unexpected error occurred: {e}" + Fore.RESET)
 
+# =========================================================================================================== #
+
+    def iq_downloader(self, url, output_file, download_type="mp4"):
+        """
+        Download a video from IQ.com using yt-dlp.
+
+        Args:
+            url (str): The IQ.com video URL.
+            output_file (str): The output file path to save the video.
+            download_type (str): The type of download ("mp4" for video, "mp3" for audio).
+        """
+        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 for IQ.com
+            command = [
+                yt_dlp_path,
+                "-o", f"\"{output_file}\"",  # Output file
+                "--no-check-certificate",  # Bypass certificate verification
+                "--ignore-errors",  # Ignore errors and continue downloading
+            ]
+
+            # Add cookies if provided
+            if self.cookies:
+                command.extend(["--cookies", f"\"{self.cookies}\""])
+
+            # 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 IQ.com URL
+            command.append(url)
+
+            # Execute the command
+            self._execute_command(command)
+
+            # Check if output file exists to confirm success
+            if os.path.isfile(output_file):
+                logger.info(f"Download from IQ.com completed successfully. Output saved to: {output_file}")
+                return output_file
+            else:
+                logger.error(f"Download from IQ.com 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)
+
 # =========================================================================================================== #
 
     def re_encode_content(self, input_file, quality, codec="libx265", crf=23, preset="superfast", audio_bitrate="256k", fps=60):
@@ -252,6 +324,10 @@ class DOWNLOADER:
                 "--ignore-errors",  # Ignore errors and continue downloading
             ]
 
+            # Add cookies if provided
+            if self.cookies:
+                command.extend(["--cookies", f"\"{self.cookies}\""])
+
             # Add playlist-specific options if the URL is a playlist
             if playlist:
                 command.extend([

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: DDownloader
-Version: 0.4.0
+Version: 0.4.2
 Summary: A downloader for DRM-protected & Non DRM-protected content.
 License: MIT License
          
@@ -23,6 +23,7 @@ License: MIT License
          LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
          FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
          IN THE SOFTWARE.
+License-File: LICENSE
 Author: ThatNotEasy
 Author-email: apidotmy@proton.me
 Requires-Python: >=3.7

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

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

ddownloader-0.4.0/DDownloader/modules/__init__.py

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