media-downloader 1.0.11__tar.gz → 2.0.0__tar.gz

{media_downloader-1.0.11/media_downloader.egg-info → media_downloader-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: media-downloader
-Version: 1.0.11
+Version: 2.0.0
 Summary: Download audio/videos from the internet!
 Author-email: Audel Rouhi <knucklessg1@gmail.com>
 License: MIT
@@ -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: 1.0.11*
+*Version: 2.0.0*
 
 Download videos and audio from the internet!
 

{media_downloader-1.0.11 → media_downloader-2.0.0}/README.md

@@ -20,7 +20,7 @@
 ![PyPI - Wheel](https://img.shields.io/pypi/wheel/media-downloader)
 ![PyPI - Implementation](https://img.shields.io/pypi/implementation/media-downloader)
 
-*Version: 1.0.11*
+*Version: 2.0.0*
 
 Download videos and audio from the internet!
 

{media_downloader-1.0.11 → media_downloader-2.0.0}/media_downloader/__init__.py

@@ -3,10 +3,12 @@
 
 from media_downloader.media_downloader import (
     media_downloader,
-    main,
     setup_logging,
     MediaDownloader,
 )
+from media_downloader.media_downloader_mcp import (
+    media_downloader_mcp,
+)
 
 """
 media-downloader
@@ -14,4 +16,9 @@ media-downloader
 Download videos and audio from the internet!
 """
 
-__all__ = ["media_downloader", "main", "setup_logging", "MediaDownloader"]
+__all__ = [
+    "media_downloader",
+    "media_downloader_mcp",
+    "setup_logging",
+    "MediaDownloader",
+]

media_downloader-2.0.0/media_downloader/__main__.py

@@ -0,0 +1,8 @@
+#!/usr/bin/python
+# coding: utf-8
+from media_downloader.media_downloader_mcp import (
+    media_downloader_mcp,
+)
+
+if __name__ == "__main__":
+    media_downloader_mcp()

{media_downloader-1.0.11 → media_downloader-2.0.0}/media_downloader/media_downloader.py

@@ -4,7 +4,7 @@
 import os
 import sys
 import re
-import getopt
+import argparse
 import logging
 import requests
 import yt_dlp
@@ -65,6 +65,12 @@ class MediaDownloader:
     def set_progress_callback(self, callback):
         self.progress_callback = callback
 
+    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 download_video(self, link):
         self.logger.debug(f"Downloading video: {link}")
         outtmpl = f"{self.download_directory}/%(uploader)s - %(title)s.%(ext)s"
@@ -189,39 +195,6 @@ class MediaDownloader:
             pool.join()
 
 
-def media_downloader(argv):
-    logger = setup_logging(is_mcp_server=False)
-    video_downloader_instance = MediaDownloader()
-    try:
-        opts, args = getopt.getopt(
-            argv,
-            "hac:d:f:l:",
-            ["help", "audio", "channel=", "directory=", "file=", "links="],
-        )
-    except getopt.GetoptError:
-        usage()
-        logger.error("Incorrect arguments")
-        sys.exit(2)
-    for opt, arg in opts:
-        if opt in ("-h", "--help"):
-            usage()
-            sys.exit()
-        elif opt in ("-a", "--audio"):
-            video_downloader_instance.audio = True
-        elif opt in ("-c", "--channel"):
-            video_downloader_instance.get_channel_videos(arg)
-        elif opt in ("-d", "--directory"):
-            video_downloader_instance.download_directory = arg
-        elif opt in ("-f", "--file"):
-            video_downloader_instance.open_file(arg)
-        elif opt in ("-l", "--links"):
-            url_list = arg.replace(" ", "").split(",")
-            for url in url_list:
-                video_downloader_instance.links.extend(url_list)
-
-    video_downloader_instance.download_all()
-
-
 def usage():
     print(
         "Media-Downloader: A tool to download any video off the internet!\n"
@@ -237,9 +210,38 @@ def usage():
     )
 
 
-def main():
-    media_downloader(sys.argv[1:])
+def media_downloader():
+    parser = argparse.ArgumentParser(description="Download media from various sources.")
+    parser.add_argument(
+        "-a", "--audio", action="store_true", help="Download audio only"
+    )
+    parser.add_argument("-c", "--channel", help="Download videos from a channel URL")
+    parser.add_argument("-d", "--directory", help="Specify download directory")
+    parser.add_argument("-f", "--file", help="Read URLs from a file")
+    parser.add_argument(
+        "-l", "--links", help="Comma-separated list of URLs to download"
+    )
+
+    args = parser.parse_args()
+
+    logger = setup_logging(is_mcp_server=False)
+    video_downloader_instance = MediaDownloader()
+
+    if args.audio:
+        video_downloader_instance.audio = True
+    if args.channel:
+        video_downloader_instance.get_channel_videos(args.channel)
+    if args.directory:
+        video_downloader_instance.download_directory = args.directory
+    if args.file:
+        video_downloader_instance.open_file(args.file)
+    if args.links:
+        url_list = args.links.replace(" ", "").split(",")
+        video_downloader_instance.links.extend(url_list)
+
+    logger.info("Kicking off downloads...")
+    video_downloader_instance.download_all()
 
 
 if __name__ == "__main__":
-    media_downloader(sys.argv[1:])
+    media_downloader()

{media_downloader-1.0.11 → media_downloader-2.0.0}/media_downloader/media_downloader_mcp.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 # coding: utf-8
-import getopt
+import argparse
 import os
 import sys
 import logging
@@ -14,13 +14,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
     normalized = str(string).strip().lower()
 
     # Define valid true/false values
-    true_values = {'t', 'true', 'y', 'yes', '1'}
-    false_values = {'f', 'false', 'n', 'no', '0'}
+    true_values = {"t", "true", "y", "yes", "1"}
+    false_values = {"f", "false", "n", "no", "0"}
 
     if normalized in true_values:
         return True
@@ -29,11 +30,6 @@ def to_boolean(string):
     else:
         raise ValueError(f"Cannot convert '{string}' to boolean")
 
-environment_download_directory = os.environ.get("DOWNLOAD_DIRECTORY", None)
-environment_audio_only = os.environ.get("AUDIO_ONLY", False)
-
-if environment_audio_only:
-    environment_audio_only = to_boolean(environment_audio_only)
 
 @mcp.tool(
     annotations={
@@ -49,9 +45,15 @@ 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=environment_download_directory),
-    audio_only: Optional[bool] = Field(description="Downloads only the audio", default=environment_audio_only),
-    ctx: Context = Field(description="MCP context for progress reporting.", default=None),
+        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:
     """Downloads media from a given URL to the specified directory."""
     logger = logging.getLogger("MediaDownloader")
@@ -101,47 +103,37 @@ async def download_media(
         raise RuntimeError(f"Failed to download media: {str(e)}")
 
 
-def media_downloader_mcp(argv):
-    transport = "stdio"
-    host = "0.0.0.0"
-    port = 8000
-    try:
-        opts, args = getopt.getopt(
-            argv,
-            "ht:h:p:",
-            ["help", "transport=", "host=", "port="],
-        )
-    except getopt.GetoptError:
-        sys.exit(2)
-    for opt, arg in opts:
-        if opt in ("-h", "--help"):
-            sys.exit()
-        elif opt in ("-t", "--transport"):
-            transport = arg
-        elif opt in ("-h", "--host"):
-            host = arg
-        elif opt in ("-p", "--port"):
-            try:
-                port = int(arg)  # Attempt to convert port to integer
-                if not (0 <= port <= 65535):  # Valid port range
-                    print(f"Error: Port {arg} is out of valid range (0-65535).")
-                    sys.exit(1)
-            except ValueError:
-                print(f"Error: Port {arg} is not a valid integer.")
-                sys.exit(1)
-    if transport == "stdio":
+def media_downloader_mcp():
+    parser = argparse.ArgumentParser(description="Run media downloader MCP server.")
+    parser.add_argument(
+        "-t",
+        "--transport",
+        default="stdio",
+        choices=["stdio", "http"],
+        help="Transport method (stdio or http, default: stdio)",
+    )
+    parser.add_argument(
+        "-s", "--host", default="0.0.0.0", help="Host address (default: 0.0.0.0)"
+    )
+    parser.add_argument(
+        "-p", "--port", type=int, default=8000, help="Port number (default: 8000)"
+    )
+
+    args = parser.parse_args()
+
+    if args.port < 0 or args.port > 65535:
+        print(f"Error: Port {args.port} is out of valid range (0-65535).")
+        sys.exit(1)
+
+    if args.transport == "stdio":
         mcp.run(transport="stdio")
-    elif transport == "http":
-        mcp.run(transport="http", host=host, port=port)
+    elif args.transport == "http":
+        mcp.run(transport="http", host=args.host, port=args.port)
     else:
         logger = logging.getLogger("MediaDownloader")
         logger.error("Transport not supported")
         sys.exit(1)
 
 
-def main():
-    media_downloader_mcp(sys.argv[1:])
-
-
 if __name__ == "__main__":
-    media_downloader_mcp(sys.argv[1:])
+    media_downloader_mcp()

{media_downloader-1.0.11 → media_downloader-2.0.0/media_downloader.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: media-downloader
-Version: 1.0.11
+Version: 2.0.0
 Summary: Download audio/videos from the internet!
 Author-email: Audel Rouhi <knucklessg1@gmail.com>
 License: MIT
@@ -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: 1.0.11*
+*Version: 2.0.0*
 
 Download videos and audio from the internet!
 

media_downloader-2.0.0/media_downloader.egg-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+media-downloader = media_downloader.media_downloader:media_downloader
+media-downloader-mcp = media_downloader.media_downloader_mcp:media_downloader_mcp

{media_downloader-1.0.11 → media_downloader-2.0.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "media-downloader"
-version = "1.0.11"
+version = "2.0.0"
 description = "Download audio/videos from the internet!\nHost an MCP Server for Agentic AI to download videos!"
 readme = "README.md"
 authors = [{ name = "Audel Rouhi", email = "knucklessg1@gmail.com" }]
@@ -23,12 +23,12 @@ dependencies = [
 ]
 
 [project.scripts]
-media-downloader = "media_downloader.media_downloader:main"
-media-downloader-mcp = "media_downloader.media_downloader_mcp:main"
+media-downloader = "media_downloader.media_downloader:media_downloader"
+media-downloader-mcp = "media_downloader.media_downloader_mcp:media_downloader_mcp"
 
 [tool.setuptools.packages.find]
 where = ["."]
 
 [tool.setuptools]
 include-package-data = true
-package-data = { "media_downloader" = ["media_downloader"] }
+package-data = { "media_downloader" = ["media_downloader"] }

media_downloader-1.0.11/media_downloader/__main__.py

@@ -1,6 +0,0 @@
-#!/usr/bin/python
-# coding: utf-8
-from .media_downloader_mcp import main
-
-if __name__ == "__main__":
-    main()

media_downloader-1.0.11/media_downloader.egg-info/entry_points.txt

@@ -1,3 +0,0 @@
-[console_scripts]
-media-downloader = media_downloader.media_downloader:main
-media-downloader-mcp = media_downloader.media_downloader_mcp:main