media-downloader 0.11.14__py2.py3-none-any.whl → 0.11.15__py2.py3-none-any.whl

media_downloader/media_downloader.py

@@ -51,61 +51,15 @@ class YtDlpLogger:
 
 
 class MediaDownloader:
-
-    def __init__(
-        self, links: list = [], download_directory: str = None, audio: bool = False
-    ):
-        self.links = links
-        if download_directory:
-            self.download_directory = download_directory
-        else:
-            self.download_directory = f'{os.path.expanduser("~")}/Downloads'
-        self.audio = audio
-        self.logger = logging.getLogger("MediaDownloader")
-
-    def open_file(self, file):
-        youtube_urls = open(file, "r")
-        for url in youtube_urls:
-            self.links.append(url)
-        self.links = list(dict.fromkeys(self.links))
-
-    def get_save_path(self) -> str:
-        return self.download_directory
-
-    def set_save_path(self, download_directory):
-        self.download_directory = download_directory.replace(os.sep, "/")
-        self.logger.debug(f"Set download directory to: {self.download_directory}")
-
-    def reset_links(self):
-        self.logger.debug("Resetting links")
+    def __init__(self):
         self.links = []
+        self.download_directory = f"{os.path.expanduser('~')}/Downloads"
+        self.audio = False
+        self.logger = logging.getLogger("MediaDownloader")
+        self.progress_callback = None  # Store callback for progress updates
 
-    def extend_links(self, urls):
-        self.logger.debug(f"Extending links: {urls}")
-        self.links.extend(urls)
-        self.links = list(dict.fromkeys(self.links))
-
-    def append_link(self, url):
-        self.logger.debug(f"Appending link: {url}")
-        self.links.append(url)
-        self.links = list(dict.fromkeys(self.links))
-
-    def get_links(self) -> List[str]:
-        return self.links
-
-    def set_audio(self, audio=False):
-        self.audio = audio
-        self.logger.debug(f"Audio mode set to: {audio}")
-
-    def download_all(self):
-        self.logger.debug(f"Downloading {len(self.links)} links")
-        pool = Pool(processes=os.cpu_count())
-        try:
-            pool.map(self.download_video, self.links)
-        finally:
-            pool.close()
-            pool.join()
-        self.reset_links()
+    def set_progress_callback(self, callback):
+        self.progress_callback = callback
 
     def download_video(self, link):
         self.logger.debug(f"Downloading video: {link}")
@@ -125,10 +79,10 @@ class MediaDownloader:
         ydl_opts = {
             "format": "bestaudio/best" if self.audio else "best",
             "outtmpl": outtmpl,
-            "quiet": True,  # Suppress yt_dlp console output
-            "no_warnings": True,  # Suppress warnings
-            "progress_with_newline": False,  # Disable progress output
-            "logger": YtDlpLogger(self.logger),  # Use custom logger
+            "quiet": True,
+            "no_warnings": True,
+            "progress_hooks": [self.progress_hook],  # Add progress hook
+            "logger": YtDlpLogger(self.logger),
         }
         if self.audio:
             ydl_opts["postprocessors"] = [
@@ -142,7 +96,7 @@ class MediaDownloader:
         try:
             with yt_dlp.YoutubeDL(ydl_opts) as ydl:
                 info = ydl.extract_info(link, download=True)
-                return ydl.prepare_filename(info)  # Return the actual file path
+                return ydl.prepare_filename(info)
         except Exception as e:
             self.logger.error(f"Failed to download {link}: {str(e)}")
             try:
@@ -156,43 +110,18 @@ class MediaDownloader:
                 return None
 
     def get_channel_videos(self, channel, limit=-1):
-        self.logger.debug(f"Fetching videos for channel: {channel}, limit: {limit}")
-        username = channel
-        attempts = 0
-        while attempts < 3:
-            url = f"https://www.youtube.com/user/{username}/videos"
-            self.logger.debug(f"Trying URL: {url}")
-            page = requests.get(url).content
-            data = str(page).split(" ")
-            item = 'href="/watch?'
-            vids = [
-                line.replace('href="', "youtube.com") for line in data if item in line
-            ]
-            if vids:
-                self.logger.debug(f"Found {len(vids)} videos")
-                x = 0
-                for vid in vids:
-                    if limit < 0 or x < limit:
-                        self.append_link(vid)
-                    x += 1
-                return
-            else:
-                url = f"https://www.youtube.com/c/{channel}/videos"
+            self.logger.debug(f"Fetching videos for channel: {channel}, limit: {limit}")
+            username = channel
+            attempts = 0
+            while attempts < 3:
+                url = f"https://www.youtube.com/user/{username}/videos"
                 self.logger.debug(f"Trying URL: {url}")
                 page = requests.get(url).content
                 data = str(page).split(" ")
-                item = "https://i.ytimg.com/vi/"
-                vids = []
-                for line in data:
-                    if item in line:
-                        try:
-                            found = re.search(
-                                "https://i.ytimg.com/vi/(.+?)/hqdefault.", line
-                            ).group(1)
-                            vid = f"https://www.youtube.com/watch?v={found}"
-                            vids.append(vid)
-                        except AttributeError:
-                            continue
+                item = 'href="/watch?'
+                vids = [
+                    line.replace('href="', "youtube.com") for line in data if item in line
+                ]
                 if vids:
                     self.logger.debug(f"Found {len(vids)} videos")
                     x = 0
@@ -201,8 +130,59 @@ class MediaDownloader:
                             self.append_link(vid)
                         x += 1
                     return
-            attempts += 1
-        self.logger.error(f"Could not find user or channel: {channel}")
+                else:
+                    url = f"https://www.youtube.com/c/{channel}/videos"
+                    self.logger.debug(f"Trying URL: {url}")
+                    page = requests.get(url).content
+                    data = str(page).split(" ")
+                    item = "https://i.ytimg.com/vi/"
+                    vids = []
+                    for line in data:
+                        if item in line:
+                            try:
+                                found = re.search(
+                                    "https://i.ytimg.com/vi/(.+?)/hqdefault.", line
+                                ).group(1)
+                                vid = f"https://www.youtube.com/watch?v={found}"
+                                vids.append(vid)
+                            except AttributeError:
+                                continue
+                    if vids:
+                        self.logger.debug(f"Found {len(vids)} videos")
+                        x = 0
+                        for vid in vids:
+                            if limit < 0 or x < limit:
+                                self.append_link(vid)
+                            x += 1
+                        return
+                attempts += 1
+            self.logger.error(f"Could not find user or channel: {channel}")
+
+    def progress_hook(self, d):
+        if self.progress_callback and d["status"] == "downloading":
+            if d.get("total_bytes") and d.get("downloaded_bytes"):
+                progress = (d["downloaded_bytes"] / d["total_bytes"]) * 100
+                self.progress_callback(progress=progress, total=100)
+            elif d.get("downloaded_bytes"):
+                # Indeterminate progress if total_bytes is unavailable
+                self.progress_callback(progress=d["downloaded_bytes"])
+        elif d["status"] == "finished":
+            if self.progress_callback:
+                self.progress_callback(progress=100, total=100)
+
+    def download_all(self):
+        self.logger.debug(f"Downloading {len(self.links)} links")
+        pool = Pool(processes=os.cpu_count())
+        try:
+            results = pool.map(self.download_video, self.links)
+            self.reset_links()
+            for result in results:
+                if result and os.path.exists(result):
+                    return result
+            return None
+        finally:
+            pool.close()
+            pool.join()
 
 
 def media_downloader(argv):

media_downloader/media_downloader_mcp.py

@@ -32,27 +32,40 @@ async def download_media(
         RuntimeError: If the download fails.
     """
     logger = logging.getLogger("MediaDownloader")
-    logger.debug(
-        f"Starting download for URL: {video_url}, directory: {download_directory}, audio_only: {audio_only}"
-    )
+    logger.debug(f"Starting download for URL: {video_url}, directory: {download_directory}, audio_only: {audio_only}")
 
     try:
-        # Validate inputs
         if not video_url or not download_directory:
             raise ValueError("video_url and download_directory must not be empty")
-
-        # Ensure the download directory exists
         os.makedirs(download_directory, exist_ok=True)
 
-        # Initialize MediaDownloader
         downloader = MediaDownloader(
             download_directory=download_directory, audio=audio_only
         )
+
+        # Set progress callback for yt_dlp
+        async def progress_callback(progress, total=None):
+            if ctx:
+                await ctx.report_progress(progress=progress, total=total)
+                logger.debug(f"Reported progress: {progress}/{total}")
+
+        downloader.set_progress_callback(progress_callback)
+
+        # Report initial progress
+        if ctx:
+            await ctx.report_progress(progress=0, total=100)
+            logger.debug("Reported initial progress: 0/100")
+
+        # Perform the download
         file_path = downloader.download_video(link=video_url)
 
-        # Check if the file was downloaded
-#         if not file_path:
-#             raise RuntimeError("Download failed or file not found")
+        if not file_path or not os.path.exists(file_path):
+            raise RuntimeError("Download failed or file not found")
+
+        # Report completion
+        if ctx:
+            await ctx.report_progress(progress=100, total=100)
+            logger.debug("Reported final progress: 100/100")
 
         logger.debug(f"Download completed, file path: {file_path}")
         return file_path

media_downloader/version.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # coding: utf-8
 
-__version__ = "0.11.14"
+__version__ = "0.11.15"
 __author__ = "Audel Rouhi"
 __credits__ = "Audel Rouhi"

{media_downloader-0.11.14.dist-info → media_downloader-0.11.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: media-downloader
-Version: 0.11.14
+Version: 0.11.15
 Summary: Download audio/videos from the internet!
 Home-page: https://github.com/Knuckles-Team/media-downloader
 Author: Audel Rouhi
@@ -21,7 +21,7 @@ Classifier: Programming Language :: Python :: 3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: fastmcp (>=2.11.3)
-Requires-Dist: yt-dlp (>=2023.12.30)
+Requires-Dist: yt-dlp (>=2025.8.20)
 
 # Media Downloader
 
@@ -45,7 +45,7 @@ Requires-Dist: yt-dlp (>=2023.12.30)
 ![PyPI - Wheel](https://img.shields.io/pypi/wheel/media-downloader)
 ![PyPI - Implementation](https://img.shields.io/pypi/implementation/media-downloader)
 
-*Version: 0.11.14*
+*Version: 0.11.15*
 
 Download videos and audio from the internet!
 

media_downloader-0.11.15.dist-info/RECORD

@@ -0,0 +1,11 @@
+media_downloader/__init__.py,sha256=d0PDULMlfmN1E52NKz20Wprllpq-UYMsBU3-2p4ZEk8,460
+media_downloader/__main__.py,sha256=aHajZBE7fyiC7E5qjV5LMe9nCPkQV2YKu6FU8Ubkdm4,112
+media_downloader/media_downloader.py,sha256=Ihre9gBnaqorHSmOCFXyF_wYhUL_ohS3JFguZW2mAgQ,8894
+media_downloader/media_downloader_mcp.py,sha256=fULxaUQe3-YBveYvOP3eKpaWBa2nrKHaNtr02t4kGU0,3547
+media_downloader/version.py,sha256=D9vc4IaPvZ2ts54UPiI9aLExP3B_yt4LOaTNPUSXy_o,118
+media_downloader-0.11.15.dist-info/LICENSE,sha256=Z1xmcrPHBnGCETO_LLQJUeaSNBSnuptcDVTt4kaPUOE,1060
+media_downloader-0.11.15.dist-info/METADATA,sha256=3--6QBQ1aSppevqUfntO5O6pG5K_gpBtz3maPxN0SIU,5522
+media_downloader-0.11.15.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
+media_downloader-0.11.15.dist-info/entry_points.txt,sha256=Hjp1vLkHPq_bABsuh4kpL5nddi1wn9Ftota-72_GgW4,142
+media_downloader-0.11.15.dist-info/top_level.txt,sha256=B2OBmgONOm0hIyx2HJ8qFPOI_p5HOeolrYvmslVC1fc,17
+media_downloader-0.11.15.dist-info/RECORD,,

media_downloader-0.11.14.dist-info/RECORD

@@ -1,11 +0,0 @@
-media_downloader/__init__.py,sha256=d0PDULMlfmN1E52NKz20Wprllpq-UYMsBU3-2p4ZEk8,460
-media_downloader/__main__.py,sha256=aHajZBE7fyiC7E5qjV5LMe9nCPkQV2YKu6FU8Ubkdm4,112
-media_downloader/media_downloader.py,sha256=IALP6PvypBjvtFbqHyG8FN3B7BONBJpNiz1vsJrPUoY,9139
-media_downloader/media_downloader_mcp.py,sha256=zFjamIgQznRQvRdF98XWgdDeWN3A59dyaugXnHxBZrI,2983
-media_downloader/version.py,sha256=lsEyJBBq_52dtz5_4fHeohUPAKr4Tf_LbF6XI2Xid5s,118
-media_downloader-0.11.14.dist-info/LICENSE,sha256=Z1xmcrPHBnGCETO_LLQJUeaSNBSnuptcDVTt4kaPUOE,1060
-media_downloader-0.11.14.dist-info/METADATA,sha256=FQ-gxkQ9yOqP-BXqwcZXZl0xDqkYq48elNYmFKPktHk,5523
-media_downloader-0.11.14.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
-media_downloader-0.11.14.dist-info/entry_points.txt,sha256=Hjp1vLkHPq_bABsuh4kpL5nddi1wn9Ftota-72_GgW4,142
-media_downloader-0.11.14.dist-info/top_level.txt,sha256=B2OBmgONOm0hIyx2HJ8qFPOI_p5HOeolrYvmslVC1fc,17
-media_downloader-0.11.14.dist-info/RECORD,,