media-downloader 2.1.2__py3-none-any.whl → 2.1.3__py3-none-any.whl

media_downloader/__init__.py

@@ -1,24 +1,29 @@
 #!/usr/bin/env python
 # coding: utf-8
 
-from media_downloader.media_downloader import (
-    media_downloader,
-    setup_logging,
-    MediaDownloader,
-)
-from media_downloader.media_downloader_mcp import (
-    media_downloader_mcp,
-)
+import importlib
+import inspect
+
+# List of modules to import from
+MODULES = [
+    'media_downloader.media_downloader',
+    'media_downloader.media_downloader_mcp',
+]
+
+# Initialize __all__ to expose all public classes and functions
+__all__ = []
+
+# Dynamically import all classes and functions from the specified modules
+for module_name in MODULES:
+    module = importlib.import_module(module_name)
+    for name, obj in inspect.getmembers(module):
+        # Include only classes and functions, excluding private (starting with '_')
+        if (inspect.isclass(obj) or inspect.isfunction(obj)) and not name.startswith('_'):
+            globals()[name] = obj
+            __all__.append(name)
 
 """
 media-downloader
 
 Download videos and audio from the internet!
-"""
-
-__all__ = [
-    "media_downloader",
-    "media_downloader_mcp",
-    "setup_logging",
-    "MediaDownloader",
-]
+"""

media_downloader/media_downloader_mcp.py

@@ -4,7 +4,7 @@ import argparse
 import os
 import sys
 import logging
-from typing import Optional
+from typing import Optional, Union, Dict, Any
 from media_downloader import MediaDownloader, setup_logging
 from fastmcp import FastMCP, Context
 from pydantic import Field
@@ -15,14 +15,14 @@ setup_logging(is_mcp_server=True, log_file="media_downloader_mcp.log")
 mcp = FastMCP(name="MediaDownloaderServer")
 
 
-def to_boolean(string):
-    # Normalize the string: strip whitespace and convert to lowercase
+def to_boolean(string: Union[str, bool] = None) -> bool:
+    if isinstance(string, bool):
+        return string
+    if not string:
+        return False
     normalized = str(string).strip().lower()
-
-    # Define valid true/false values
     true_values = {"t", "true", "y", "yes", "1"}
     false_values = {"f", "false", "n", "no", "0"}
-
     if normalized in true_values:
         return True
     elif normalized in false_values:
@@ -31,6 +31,7 @@ def to_boolean(string):
         raise ValueError(f"Cannot convert '{string}' to boolean")
 
 
+
 @mcp.tool(
     annotations={
         "title": "Download Media",
@@ -42,22 +43,22 @@ def to_boolean(string):
     tags={"collection_management"},
 )
 async def download_media(
-    video_url: str = Field(description="Video URL to Download", default=None),
-    download_directory: Optional[str] = Field(
-        description="The directory where the media will be saved. If None, uses default directory.",
-        default=os.environ.get("DOWNLOAD_DIRECTORY", None),
-    ),
-    audio_only: Optional[bool] = Field(
-        description="Downloads only the audio",
-        default=to_boolean(os.environ.get("AUDIO_ONLY", False)),
-    ),
-    ctx: Context = Field(
-        description="MCP context for progress reporting.", default=None
-    ),
-) -> str:
+        video_url: str = Field(description="Video URL to Download", default=None),
+        download_directory: Optional[str] = Field(
+            description="The directory where the media will be saved. If None, uses default directory.",
+            default=os.environ.get("DOWNLOAD_DIRECTORY", None),
+        ),
+        audio_only: Optional[bool] = Field(
+            description="Downloads only the audio",
+            default=to_boolean(os.environ.get("AUDIO_ONLY", False)),
+        ),
+        ctx: Context = Field(
+            description="MCP context for progress reporting.", default=None
+        ),
+) -> Dict[str, Any]:
     """
-    Downloads media from a given URL to the specified directory. Download as a video or audio file
-    Returns the location of the Downloaded file
+    Downloads media from a given URL to the specified directory. Download as a video or audio file.
+    Returns a Dictionary response with status, download directory, audio only, and other details.
     """
     logger = logging.getLogger("MediaDownloader")
     logger.debug(
@@ -66,9 +67,21 @@ async def download_media(
 
     try:
         if not video_url:
-            raise ValueError("video_url must not be empty")
-
-        download_directory = f'{os.path.expanduser("~")}/Downloads'
+            return {
+                "status": 400,
+                "message": "Invalid input: video_url must not be empty",
+                "data": {
+                    "video_url": video_url,
+                    "download_directory": download_directory,
+                    "audio_only": audio_only
+                },
+                "error": "video_url must not be empty"
+            }
+
+        if download_directory:
+            download_directory = os.path.expanduser(download_directory)
+        else:
+            download_directory = f'{os.path.expanduser("~")}/Downloads'
         os.makedirs(download_directory, exist_ok=True)
 
         downloader = MediaDownloader(
@@ -92,7 +105,16 @@ async def download_media(
         file_path = downloader.download_video(link=video_url)
 
         if not file_path or not os.path.exists(file_path):
-            raise RuntimeError("Download failed or file not found")
+            return {
+                "status": 500,
+                "message": "Download failed: file not found",
+                "data": {
+                    "video_url": video_url,
+                    "download_directory": download_directory,
+                    "audio_only": audio_only
+                },
+                "error": "Download failed or file not found"
+            }
 
         # Report completion
         if ctx:
@@ -100,15 +122,32 @@ async def download_media(
             logger.debug("Reported final progress: 100/100")
 
         logger.debug(f"Download completed, file path: {file_path}")
-        return file_path
+        return {
+            "status": 200,
+            "message": "Media downloaded successfully",
+            "data": {
+                "file_path": file_path,
+                "download_directory": download_directory,
+                "audio_only": audio_only,
+                "video_url": video_url
+            }
+        }
     except Exception as e:
-        logger.error(f"Failed to download media: {str(e)}")
-        raise RuntimeError(f"Failed to download media: {str(e)}")
+        logger.error(f"Failed to download media: {str(e)}\nParams: video_url: {video_url}, download directory: {download_directory}, audio only: {audio_only}")
+        return {
+            "status": 500,
+            "message": "Failed to download media",
+            "data": {
+                "video_url": video_url,
+                "download_directory": download_directory,
+                "audio_only": audio_only
+            },
+            "error": str(e)
+        }
 
 
 def media_downloader_mcp():
     parser = argparse.ArgumentParser(description="Run media downloader MCP server.")
-
     parser.add_argument(
         "-t",
         "--transport",

{media_downloader-2.1.2.dist-info → media_downloader-2.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: media-downloader
-Version: 2.1.2
+Version: 2.1.3
 Summary: Download audio/videos from the internet!
 Author-email: Audel Rouhi <knucklessg1@gmail.com>
 License: MIT
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: yt-dlp>=2025.8.20
+Requires-Dist: yt-dlp>=2025.9.26
 Requires-Dist: fastmcp>=2.11.3
 Dynamic: license-file
 
@@ -38,7 +38,7 @@ Dynamic: license-file
 ![PyPI - Wheel](https://img.shields.io/pypi/wheel/media-downloader)
 ![PyPI - Implementation](https://img.shields.io/pypi/implementation/media-downloader)
 
-*Version: 2.1.2*
+*Version: 2.1.3*
 
 Download videos and audio from the internet!
 

media_downloader-2.1.3.dist-info/RECORD

@@ -0,0 +1,11 @@
+media_downloader/__init__.py,sha256=rnzjpKVjjq1kruHPnSoIdD_munB1olHMJA5onxM2dc0,798
+media_downloader/__main__.py,sha256=5T-EOUX1ANJOd2ut4GoI9mvDpNCo25yZcOAZdnhzQI0,169
+media_downloader/media_downloader.py,sha256=L20XUnnJ5UWq4ZZQIdmi7ZrOl2hXKSZkjNDH6l0eqKc,9097
+media_downloader/media_downloader_mcp.py,sha256=8XPfTVOqjvkNY3V4stXDe5kGTA0OiWM-rOZLXQjIY0I,6378
+media_downloader-2.1.3.dist-info/licenses/LICENSE,sha256=Z1xmcrPHBnGCETO_LLQJUeaSNBSnuptcDVTt4kaPUOE,1060
+tests/test_mcp.py,sha256=mbe5O75w2SDr7-7nbzDSAHhMYx4qZKccU77h8Cp5LSo,1509
+media_downloader-2.1.3.dist-info/METADATA,sha256=DDVpPSIvjd1Dj6fN-f_e6eg1Tl1cXsKW1bL5RL-fVFE,5979
+media_downloader-2.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+media_downloader-2.1.3.dist-info/entry_points.txt,sha256=X_Ig7LdYJePZ9BQPMGyA2dSmBIQIYMHXCnTOeEbhgio,170
+media_downloader-2.1.3.dist-info/top_level.txt,sha256=baD75VEFaytQEs4mmqyK1M0iZ5Y0HGF62vvtbSfbZCA,23
+media_downloader-2.1.3.dist-info/RECORD,,

media_downloader-2.1.2.dist-info/RECORD

@@ -1,11 +0,0 @@
-media_downloader/__init__.py,sha256=kSGgs6_eniQMrwlOcvtjwNeq5xbFl93KUciQpdY2NDw,414
-media_downloader/__main__.py,sha256=5T-EOUX1ANJOd2ut4GoI9mvDpNCo25yZcOAZdnhzQI0,169
-media_downloader/media_downloader.py,sha256=L20XUnnJ5UWq4ZZQIdmi7ZrOl2hXKSZkjNDH6l0eqKc,9097
-media_downloader/media_downloader_mcp.py,sha256=IqfxtmIw12QTFwBtows4r7749baJfz8zoUZBRmhBarg,4820
-media_downloader-2.1.2.dist-info/licenses/LICENSE,sha256=Z1xmcrPHBnGCETO_LLQJUeaSNBSnuptcDVTt4kaPUOE,1060
-tests/test_mcp.py,sha256=mbe5O75w2SDr7-7nbzDSAHhMYx4qZKccU77h8Cp5LSo,1509
-media_downloader-2.1.2.dist-info/METADATA,sha256=wNKKHXAlomUmAKR3kwfdkLckgj50N6TRHxeRKkrfItU,5979
-media_downloader-2.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-media_downloader-2.1.2.dist-info/entry_points.txt,sha256=X_Ig7LdYJePZ9BQPMGyA2dSmBIQIYMHXCnTOeEbhgio,170
-media_downloader-2.1.2.dist-info/top_level.txt,sha256=baD75VEFaytQEs4mmqyK1M0iZ5Y0HGF62vvtbSfbZCA,23
-media_downloader-2.1.2.dist-info/RECORD,,