media-downloader 0.11.21__py2.py3-none-any.whl → 0.11.23__py2.py3-none-any.whl

media_downloader/media_downloader.py

@@ -5,7 +5,6 @@ import os
 import sys
 import re
 import getopt
-from typing import List
 import logging
 import requests
 import yt_dlp
@@ -52,8 +51,8 @@ class YtDlpLogger:
 
 class MediaDownloader:
     def __init__(
-            self, links: list = [], download_directory: str = None, audio: bool = False
-        ):
+        self, links: list = [], download_directory: str = None, audio: bool = False
+    ):
         self.links = links
         if download_directory:
             self.download_directory = download_directory
@@ -115,18 +114,43 @@ 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"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"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
-                ]
+                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
@@ -135,33 +159,8 @@ class MediaDownloader:
                             self.append_link(vid)
                         x += 1
                     return
-                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}")
+            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":

media_downloader/media_downloader_mcp.py

@@ -16,24 +16,30 @@ mcp = FastMCP(name="MediaDownloaderServer")
 
 @mcp.tool()
 async def download_media(
-    video_url: str, download_directory: Optional[str] = None, audio_only: Optional[bool] = False, ctx: Context = None
+    video_url: str,
+    download_directory: Optional[str] = None,
+    audio_only: Optional[bool] = False,
+    ctx: Context = None,
 ) -> str:
     """Downloads media from a given URL to the specified directory.
 
     Args:
         video_url (str): The URL of the media to download.
-        download_directory (str): The directory where the media will be saved.
+        download_directory (Optional[str]): The directory where the media will be saved. If None, uses default directory.
         audio_only (bool): If True, downloads only the audio. Defaults to False.
+        ctx (Context, optional): MCP context for progress reporting.
 
     Returns:
         str: The path to the downloaded media file.
 
     Raises:
-        ValueError: If the URL or directory is invalid.
+        ValueError: If the URL is invalid.
         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:
         if not video_url:
@@ -109,7 +115,7 @@ def media_downloader_mcp(argv):
 
 
 def main():
-    mcp.run(transport="stdio")
+    media_downloader_mcp(sys.argv[1:])
 
 
 if __name__ == "__main__":

media_downloader/version.py

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

{media_downloader-0.11.21.dist-info → media_downloader-0.11.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: media-downloader
-Version: 0.11.21
+Version: 0.11.23
 Summary: Download audio/videos from the internet!
 Home-page: https://github.com/Knuckles-Team/media-downloader
 Author: Audel Rouhi
@@ -45,7 +45,7 @@ Requires-Dist: yt-dlp (>=2025.8.20)
 ![PyPI - Wheel](https://img.shields.io/pypi/wheel/media-downloader)
 ![PyPI - Implementation](https://img.shields.io/pypi/implementation/media-downloader)
 
-*Version: 0.11.21*
+*Version: 0.11.23*
 
 Download videos and audio from the internet!
 

media_downloader-0.11.23.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=fK8CWskZQQTTZ91YnD7gJafvk5fZGp9oOOJYJy5Fwfo,8876
+media_downloader/media_downloader_mcp.py,sha256=zJOXaKevO9PBBdmQC-I3gd1vEAJA5VsS4Kn7F58pnDk,3780
+media_downloader/version.py,sha256=-FvewQrvJKpPjsUeOjUwPrvYixuOCJLRq-wapfVyej0,118
+media_downloader-0.11.23.dist-info/LICENSE,sha256=Z1xmcrPHBnGCETO_LLQJUeaSNBSnuptcDVTt4kaPUOE,1060
+media_downloader-0.11.23.dist-info/METADATA,sha256=5FH_uCi8WAP80UYZfiuzeAMCBaOv8uiU-xtkQK5RzCM,5522
+media_downloader-0.11.23.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
+media_downloader-0.11.23.dist-info/entry_points.txt,sha256=Hjp1vLkHPq_bABsuh4kpL5nddi1wn9Ftota-72_GgW4,142
+media_downloader-0.11.23.dist-info/top_level.txt,sha256=B2OBmgONOm0hIyx2HJ8qFPOI_p5HOeolrYvmslVC1fc,17
+media_downloader-0.11.23.dist-info/RECORD,,

media_downloader-0.11.21.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=26o0PORszTvcs4Lk57OFNIFb2WAD7txH0YJi-kB3xt0,9096
-media_downloader/media_downloader_mcp.py,sha256=tFNLuZ54t68DiH1Ak3F10_v1Mxi0Kid-LKCfleRqCH4,3646
-media_downloader/version.py,sha256=80Iz1aYF7oJ7XbOjepmIlgAyTL8H5hK3ALLfooDSfGg,118
-media_downloader-0.11.21.dist-info/LICENSE,sha256=Z1xmcrPHBnGCETO_LLQJUeaSNBSnuptcDVTt4kaPUOE,1060
-media_downloader-0.11.21.dist-info/METADATA,sha256=xuJiXbmcMeONnFKKIt5I3Zjg0AVLeLnxtLq2CQOOnpg,5522
-media_downloader-0.11.21.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
-media_downloader-0.11.21.dist-info/entry_points.txt,sha256=Hjp1vLkHPq_bABsuh4kpL5nddi1wn9Ftota-72_GgW4,142
-media_downloader-0.11.21.dist-info/top_level.txt,sha256=B2OBmgONOm0hIyx2HJ8qFPOI_p5HOeolrYvmslVC1fc,17
-media_downloader-0.11.21.dist-info/RECORD,,