DDownloader 0.3.6__py3-none-any.whl → 0.3.8__py3-none-any.whl

DDownloader/modules/__init__.py

@@ -1 +1 @@
-__version__ = "0.3.6"
+__version__ = "0.3.8"

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

DDownloader/modules/downloader.py

@@ -61,17 +61,16 @@ class DOWNLOADER:
 # =========================================================================================================== #
 
     def _build_command(self):
-        self.binary_path = self._get_binary_path("N_m3u8DL-RE")
         command = [
-            self.binary_path,
+            self._get_binary_path("N_m3u8DL-RE"),
             f'"{self.manifest_url}"',
-            '--select-video', 'BEST',
-            '--select-audio', 'BEST',
             '-mt',
             '-M', 'format=mp4',
             '--save-dir', '"downloads"',
             '--tmp-dir', '"downloads"',
             '--del-after-done',
+            '--decryption-engine', '"FFMPEG"',
+            '--decryption-binary-path', f'"{self._get_binary_path("ffmpeg")}"',
             '--save-name', f'"{self.output_name}"'
         ]
 

DDownloader/modules/helper.py

@@ -92,52 +92,89 @@ def detect_platform():
 
 def get_media_info(file_path):
     try:
-        logger.info(f"Parsing media file: {file_path}")
+        logger.info(f"📂 Parsing media file: {file_path}")
         media_info = MediaInfo.parse(file_path)
-        result = {"file_path": file_path, "tracks": []}
+
+        result = {
+            "file_path": file_path,
+            "tracks": [],
+            "container": None,
+            "file_size": None,
+            "duration": None,
+            "bit_rate": None,
+        }
 
         for track in media_info.tracks:
             track_info = {"track_type": track.track_type}
 
-            if track.track_type == "Video":
+            if track.track_type == "General":
+                result.update({
+                    "container": getattr(track, "format", None),
+                    "file_size": getattr(track, "file_size", None),
+                    "duration": getattr(track, "duration", None),
+                    "bit_rate": getattr(track, "overall_bit_rate", None),
+                    "title": getattr(track, "title", None),
+                    "encoded_application": getattr(track, "encoded_application", None),
+                    "encoded_library": getattr(track, "encoded_library", None),
+                    "writing_library": getattr(track, "writing_library", None),
+                    "file_creation_date": getattr(track, "file_created_date", None),
+                })
+
+            elif track.track_type == "Video":
                 track_info.update({
-                    "codec": track.codec,
-                    "width": track.width,
-                    "height": track.height,
-                    "frame_rate": track.frame_rate,
-                    "bit_rate": track.bit_rate,
-                    "duration": track.duration,
-                    "aspect_ratio": track.display_aspect_ratio,
+                    "codec": getattr(track, "codec_id", getattr(track, "format", None)),
+                    "codec_profile": getattr(track, "format_profile", None),
+                    "width": getattr(track, "width", None),
+                    "height": getattr(track, "height", None),
+                    "frame_rate": getattr(track, "frame_rate", None),
+                    "bit_rate": getattr(track, "bit_rate", None),
+                    "duration": getattr(track, "duration", None),
+                    "aspect_ratio": getattr(track, "display_aspect_ratio", None),
+                    "hdr_format": getattr(track, "hdr_format", None),
+                    "bit_depth": getattr(track, "bit_depth", None),
+                    "color_space": getattr(track, "colour_primaries", None),
+                    "color_range": getattr(track, "colour_range", None),
+                    "color_transfer": getattr(track, "transfer_characteristics", None),
+                    "chroma_subsampling": getattr(track, "chroma_subsampling", None),
                 })
+
             elif track.track_type == "Audio":
                 track_info.update({
-                    "codec": track.codec,
-                    "channels": track.channel_s,
-                    "sample_rate": track.sampling_rate,
-                    "bit_rate": track.bit_rate,
-                    "duration": track.duration,
-                    "language": track.language,
+                    "codec": getattr(track, "codec_id", getattr(track, "format", None)),
+                    "codec_profile": getattr(track, "format_profile", None),
+                    "channels": getattr(track, "channel_s", None),
+                    "sample_rate": getattr(track, "sampling_rate", None),
+                    "bit_rate": getattr(track, "bit_rate", None),
+                    "duration": getattr(track, "duration", None),
+                    "language": getattr(track, "language", "Unknown"),
+                    "compression_mode": getattr(track, "compression_mode", None),
+                    "bit_depth": getattr(track, "bit_depth", None),
                 })
+
             elif track.track_type == "Text":
                 track_info.update({
-                    "language": track.language,
-                    "format": track.format,
+                    "format": getattr(track, "format", None),
+                    "language": getattr(track, "language", "Unknown"),
+                    "default": getattr(track, "default", None),
+                    "forced": getattr(track, "forced", None),
+                    "format_profile": getattr(track, "format_profile", None),
                 })
-            elif track.track_type == "General":
+
+            elif track.track_type == "Chapters":
                 track_info.update({
-                    "file_size": track.file_size,
-                    "format": track.format,
-                    "duration": track.duration,
-                    "overall_bit_rate": track.overall_bit_rate,
+                    "title": getattr(track, "title", None),
+                    "chapter_count": getattr(track, "part_count", None),
                 })
 
-            result["tracks"].append(track_info)
+            if any(value is not None for value in track_info.values()):  # Avoid empty entries
+                result["tracks"].append(track_info)
 
-        logger.info(f"Successfully extracted media information for: {file_path}")
+        logger.info(f"✅ Successfully extracted media info for: {file_path}")
         return result
 
     except Exception as e:
-        logger.error(f"Error occurred while parsing media file '{file_path}': {e}")
+        logger.error(f"❌ Error parsing media file '{file_path}': {e}")
         return None
+
     
 # =========================================================================================================== #

{DDownloader-0.3.6.dist-info → ddownloader-0.3.8.dist-info}/METADATA

@@ -1,127 +1,135 @@
-Metadata-Version: 2.2
-Name: DDownloader
-Version: 0.3.6
-Summary: A downloader for DRM-protected content.
-Author-email: ThatNotEasy <apidotmy@proton.me>
-License: MIT License
-        
-        Copyright (c) [2024] [DDownloader]
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following condition:
-        
-        The above copyright notice and this permission notice shall be included in
-        all copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        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.
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.7
-Description-Content-Type: text/markdown
-License-File: LICENSE
-
-# DDownloader
-_DDownloader is a powerful Python-based tool and library designed to download and decrypt DRM-protected content from DASH, HLS, and ISM manifests. It provides seamless support for encrypted media streams, extracting metadata and ensuring high compatibility with various DRM standards._
-
-## Features
-- **Download and Decrypt**: Supports DASH, HLS, and ISM manifests with seamless decryption using provided keys.
-- **Automatic Detection**: Automatically detects manifest types (.mpd, .m3u8, .ism) and processes accordingly.
-- **Media Information Extraction**: Extracts metadata (e.g., codec, resolution, duration) for .mp4 files and saves it in a `logs/` directory.
-- **CLI and Library Support**: Flexible usage via command-line or Python library.
-- **Detailed Logging**: Provides real-time progress and logs errors for debugging.
-
-## Requirements
-
-- **Python**: Version 3.7 or higher.
-- **Required binaries**:
-  
-    - `N_m3u8DL-RE` for downloading protected DRM content.
-    - `mp4decrypt` for decrypting protected media files.
-    - `ffmpeg` for re-encoding and muxer method
-    - a proper environment variable configuration for binaries.
-
-##  Installation
-- Install `DDownloader` using pip:
-  
-	```bash
-	pip install DDownloader
-	```
-
-##  Usage
-- Download Content:
-  
-	```python
-	from DDownloader.modules.downloader import DOWNLOADER
-
-	downloader = DOWNLOADER()
-	downloader.manifest_url = "https://example.com/path/to/manifest"  # DASH, HLS, or ISM manifest URL
-	downloader.output_name = "output.mp4"  # Desired output file name
-	downloader.decryption_keys = ["12345:678910"]  # Provide decryption keys if needed
-	downloader.download()  # Start the downloading and decryption process
-	```
- 
-- Extract Media Information:
-  
-	```python
-	from DDownloader.modules.helper import get_media_info
-
-	file_path = "downloads/example.mp4"
-	media_info = get_media_info(file_path)
-	print(media_info)
-	```
-
-- Re-encoding:
-
-	```python
-	from DDownloader.modules.downloader import DOWNLOADER
-
- 	re_encode = DOWNLOADER()
-	quality = ["HD", "FHD", "UHD"]
-	input_content = "downloads/example.mp4"
-	output_content = "/path/to/output.mp4"
- 	re_encode.re_encode_content(input_file=input_content,quality=quality,codec="libx265",crf=20,preset="medium")
-	```
-  
-## CLI Usage
-- Download Media
-  
-	```bash
-	DDownloader -u https://example.com/path/to/manifest -o output.mp4
-	```
- 
-- Specify Decryption Keys
-  
-	```bash
-	DDownloader -u https://example.com/path/to/manifest -o output.mp4 -k 12345:678910
-	```
-
-- Re-encoding
-
-	```bash
- 	DDownloader -i "input.mp4" -o "output.mp4" -q "HD, FHD, UHD"
- 	```
-
-
-- Display Help
-  
-	```bash
-	DDownloader -h
-	```
-
-- ![image](https://github.com/user-attachments/assets/8c73a79e-fcac-4bde-a07c-5628db0d19df)
+Metadata-Version: 2.3
+Name: DDownloader
+Version: 0.3.8
+Summary: A downloader for DRM-protected & Non DRM-protected content.
+License: MIT License
+         
+         Copyright (c) [2024] [DDownloader]
+         
+         Permission is hereby granted, free of charge, to any person obtaining a copy
+         of this software and associated documentation files (the "Software"), to deal
+         in the Software without restriction, including without limitation the rights
+         to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+         copies of the Software, and to permit persons to whom the Software is
+         furnished to do so, subject to the following condition:
+         
+         The above copyright notice and this permission notice shall be included in
+         all copies or substantial portions of the Software.
+         
+         THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+         IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+         FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+         AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+         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.
+Author: ThatNotEasy
+Author-email: apidotmy@proton.me
+Requires-Python: >=3.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Dist: colorama (>=0.4.5)
+Requires-Dist: coloredlogs (>=15.0)
+Requires-Dist: loguru (>=0.6.0)
+Requires-Dist: pymediainfo (>=6.1.0,<7.0.0)
+Requires-Dist: requests (>=2.26.0)
+Requires-Dist: tqdm (>=4.64.0)
+Project-URL: Homepage, https://github.com/ThatNotEasy/DDownloader
+Description-Content-Type: text/markdown
+
+# DDownloader
+_DDownloader is a powerful Python-based tool and library designed to download and decrypt DRM-protected content from DASH, HLS, and ISM manifests. It provides seamless support for encrypted media streams, extracting metadata and ensuring high compatibility with various DRM standards._
+
+## Features
+- **Download and Decrypt**: Supports DASH, HLS, and ISM manifests with seamless decryption using provided keys.
+- **Automatic Detection**: Automatically detects manifest types (.mpd, .m3u8, .ism) and processes accordingly.
+- **Media Information Extraction**: Extracts metadata (e.g., codec, resolution, duration) for .mp4 files and saves it in a `logs/` directory.
+- **CLI and Library Support**: Flexible usage via command-line or Python library.
+- **Detailed Logging**: Provides real-time progress and logs errors for debugging.
+
+## Requirements
+
+- **Python**: Version 3.7 or higher.
+- **Required binaries**:
+  
+    - `N_m3u8DL-RE` for downloading protected DRM content.
+    - `mp4decrypt` for decrypting protected media files.
+    - `ffmpeg` for re-encoding and muxer method
+    - a proper environment variable configuration for binaries.
+
+##  Installation
+- Install `DDownloader` using pip:
+  
+	```bash
+	pip install DDownloader
+	```
+
+##  Usage
+- Download Content:
+  
+	```python
+	from DDownloader.modules.downloader import DOWNLOADER
+
+	downloader = DOWNLOADER()
+	downloader.manifest_url = "https://example.com/path/to/manifest"  # DASH, HLS, or ISM manifest URL
+	downloader.output_name = "output.mp4"  # Desired output file name
+	downloader.decryption_keys = ["12345:678910"]  # Provide decryption keys if needed
+	downloader.download()  # Start the downloading and decryption process
+	```
+ 
+- Extract Media Information:
+  
+	```python
+	from DDownloader.modules.helper import get_media_info
+
+	file_path = "downloads/example.mp4"
+	media_info = get_media_info(file_path)
+	print(media_info)
+	```
+
+- Re-encoding:
+
+	```python
+	from DDownloader.modules.downloader import DOWNLOADER
+
+ 	re_encode = DOWNLOADER()
+	quality = ["HD", "FHD", "UHD"]
+	input_content = "downloads/example.mp4"
+	output_content = "/path/to/output.mp4"
+ 	re_encode.re_encode_content(input_file=input_content,quality=quality,codec="libx265",crf=20,preset="medium")
+	```
+  
+## CLI Usage
+- Download Media
+  
+	```bash
+	DDownloader -u https://example.com/path/to/manifest -o output.mp4
+	```
+ 
+- Specify Decryption Keys
+  
+	```bash
+	DDownloader -u https://example.com/path/to/manifest -o output.mp4 -k 12345:678910
+	```
+
+- Re-encoding
+
+	```bash
+ 	DDownloader -i "input.mp4" -o "output.mp4" -q "HD, FHD, UHD"
+ 	```
+
+
+- Display Help
+  
+	```bash
+	DDownloader -h
+	```
+
+- ![image](https://github.com/user-attachments/assets/8c73a79e-fcac-4bde-a07c-5628db0d19df)
+

ddownloader-0.3.8.dist-info/RECORD

@@ -0,0 +1,20 @@
+DDownloader/__init__.py,sha256=lVZwmZNId0Dai7XBQpxglmJtIxAtZplRHDsvobL2UNo,33
+DDownloader/bin/aria2c.exe,sha256=7NovO7hmaCdsPJK3Hue8N5mefFlAcJMjU_LnUnE9f6g,4840960
+DDownloader/bin/ffmpeg.exe,sha256=NqWbY4tJ-ObGIvTefEyKr4RC8wE4pYiC7irz9BDl_Vw,148103168
+DDownloader/bin/mkvmerge.exe,sha256=s2WkBPBuhpWPNHKXwDBfQ4vOMXLYTfxu62PbnRqK55A,19144712
+DDownloader/bin/mp4decrypt.exe,sha256=JnI7mk4UduPVnUDg1aZBr4y_SWRFy8s-u_H6gG5xeOg,452096
+DDownloader/bin/N_m3u8DL-RE.exe,sha256=5ck6jeDFjFCSLBeoo7q9fSGT-0Oxp_rNCxjeknTvgGE,17197568
+DDownloader/bin/shaka-packager.exe,sha256=oQmfiToKeryylxsR9BiKuhXR_fS-PqPEu9W9rEsbrt8,5369344
+DDownloader/bin/yt-dlp.exe,sha256=TYiozhv_gpxxZ90h6LSo7rDbFEG8JzQPCJa754HJw8A,19557107
+DDownloader/main.py,sha256=7XJrLtMaw_5taymEoPfDgfQCw9K3JJmW8gScR6gVOPw,5792
+DDownloader/modules/__init__.py,sha256=kd0YV9qLZ1Lpx7vbSzAMrAwjgdZJD_tInTnDqY6-nTY,21
+DDownloader/modules/args_parser.py,sha256=Xc9ZzBu-QPFrBURIcq7rl8IJbrdPMy7EMWc-odVM2QU,1105
+DDownloader/modules/banners.py,sha256=yiMLSbH92XXf_92g4No5i7wLF50bPyp2wuBh4rfV5Yk,5656
+DDownloader/modules/downloader.py,sha256=Ul0zCB5t9DR8sx1YisP_RFzCWVWm7J8mor4rhOKudNA,7867
+DDownloader/modules/helper.py,sha256=-PMfT0pd3AsXY1K_WP1mER3dpw9gJ99Y-Erque_62nQ,8242
+DDownloader/modules/streamlink.py,sha256=t7aaHCnINzSFybTmAd-dvfGFQkepFHJwrOBcNxyJviY,504
+ddownloader-0.3.8.dist-info/entry_points.txt,sha256=36xFMHKWyVvFKBCCMd3ctyd6tyujf685-qilrMpsA1E,53
+ddownloader-0.3.8.dist-info/LICENSE,sha256=cnjTim3BMjb9cVC_b3oS41FESKLuvuDsufVHa_ymZRw,1090
+ddownloader-0.3.8.dist-info/METADATA,sha256=hM7TxtkmJc31-ftcjhhTcmNhyjm7Xz-a7ILCZq9fGUI,4906
+ddownloader-0.3.8.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+ddownloader-0.3.8.dist-info/RECORD,,

{DDownloader-0.3.6.dist-info → ddownloader-0.3.8.dist-info}/WHEEL

@@ -1,5 +1,4 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: poetry-core 2.1.1
 Root-Is-Purelib: true
 Tag: py3-none-any
-

ddownloader-0.3.8.dist-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+DDownloader=DDownloader.main:main
+

DDownloader-0.3.6.dist-info/RECORD

@@ -1,14 +0,0 @@
-DDownloader/__init__.py,sha256=lVZwmZNId0Dai7XBQpxglmJtIxAtZplRHDsvobL2UNo,33
-DDownloader/main.py,sha256=7XJrLtMaw_5taymEoPfDgfQCw9K3JJmW8gScR6gVOPw,5792
-DDownloader/modules/__init__.py,sha256=eauHvAzEXc0aJ5xQZmFSxwn1EEN1n8i04B7G0Sk7rzI,21
-DDownloader/modules/args_parser.py,sha256=Xc9ZzBu-QPFrBURIcq7rl8IJbrdPMy7EMWc-odVM2QU,1105
-DDownloader/modules/banners.py,sha256=vJQF9XCbTkeoGa4kOn92PyNJw_8NRjXj6jhBBb6PDXY,5656
-DDownloader/modules/downloader.py,sha256=3PJfD0sxK66IR2OPVPjsG_-iQREkBKYFlG5lNnzQ0eI,7861
-DDownloader/modules/helper.py,sha256=b8h-h4_JqE02D26qBzSRW11LWhYUTnBkNIeYlWRO-ZY,5951
-DDownloader/modules/streamlink.py,sha256=t7aaHCnINzSFybTmAd-dvfGFQkepFHJwrOBcNxyJviY,504
-DDownloader-0.3.6.dist-info/LICENSE,sha256=cnjTim3BMjb9cVC_b3oS41FESKLuvuDsufVHa_ymZRw,1090
-DDownloader-0.3.6.dist-info/METADATA,sha256=hZdSKKDaGMl7YBy1PbXAXGDynGf4neYlF4wF6qApUIQ,4730
-DDownloader-0.3.6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-DDownloader-0.3.6.dist-info/entry_points.txt,sha256=tCZVr_SRONlWlMFsVKgcPj3lxe9gBtWD4GuWukMv75g,54
-DDownloader-0.3.6.dist-info/top_level.txt,sha256=INZYgY1vEHV1MIWTPXKJL8j8-ZXjWb8u4XLuU3S8umY,12
-DDownloader-0.3.6.dist-info/RECORD,,

DDownloader-0.3.6.dist-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-DDownloader = DDownloader.main:main

DDownloader-0.3.6.dist-info/top_level.txt

@@ -1 +0,0 @@
-DDownloader