videonut 1.2.7 → 1.3.0

package/tools/downloaders/clip_grabber.py

@@ -1,83 +1,83 @@
-import os
-import sys
-import subprocess
-import argparse
-
-def download_clip(url, start_time, end_time, output_path, ffmpeg_path):
-    """
-    Downloads a specific clip from a YouTube video using yt-dlp.
-    """
-    # Ensure output directory exists if it's not the current directory
-    dir_name = os.path.dirname(output_path)
-    if dir_name:
-        os.makedirs(dir_name, exist_ok=True)
-
-    # Construct the yt-dlp command
-    # --download-sections "*start-end" downloads only that range
-    # --force-keyframes-at-cuts ensures precise cutting (requires ffmpeg)
-    cmd = [
-        "yt-dlp",
-        "--verbose",
-        "--download-sections", f"*{start_time}-{end_time}",
-        "--force-keyframes-at-cuts",
-        "--ffmpeg-location", ffmpeg_path,
-        "-o", output_path,
-        url
-    ]
-
-    print(f"Executing: ", ' '.join(cmd))
-
-    try:
-        result = subprocess.run(cmd, capture_output=True, text=True, check=True)
-        print("Download successful.")
-        print(result.stdout)
-
-        # Validate that the file was created and has content
-        if os.path.exists(output_path):
-            file_size = os.path.getsize(output_path)
-            if file_size == 0:
-                print(f"Error: Downloaded file is empty: {output_path}")
-                sys.exit(1)
-            else:
-                print(f"File validation: {output_path} created with size {file_size} bytes")
-        else:
-            print(f"Error: Downloaded file does not exist: {output_path}")
-            sys.exit(1)
-
-    except subprocess.CalledProcessError as e:
-        print("Error during download:")
-        print(e.stderr)
-        sys.exit(1)
-    except FileNotFoundError:
-        print("Error: yt-dlp not found. Please install it (pip install yt-dlp) and ensure it's in your PATH.")
-        sys.exit(1)
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description="Download a video clip.")
-    parser.add_argument("--url", required=True, help="Video URL")
-    parser.add_argument("--start", required=True, help="Start time (e.g., 00:00:10 or 10)")
-    parser.add_argument("--end", required=True, help="End time (e.g., 00:00:20 or 20)")
-    parser.add_argument("--output", required=True, help="Output file path")
-
-    # Try to find ffmpeg in system PATH first
-    import shutil
-    import platform
-    default_ffmpeg = shutil.which("ffmpeg")
-    if not default_ffmpeg:
-        # Fallback to local bin folder relative to this script
-        # Assumes structure: tools/downloaders/clip_grabber.py -> tools/bin/ffmpeg.exe (Windows) or tools/bin/ffmpeg (Unix)
-        base_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-        # Determine the appropriate executable name based on the platform
-        ffmpeg_exe = "ffmpeg.exe" if platform.system().lower() == "windows" else "ffmpeg"
-        default_ffmpeg = os.path.join(base_dir, "bin", ffmpeg_exe)
-
-        # If the fallback path doesn't exist, warn the user
-        if not os.path.exists(default_ffmpeg):
-            print(f"Warning: ffmpeg not found in PATH or at expected location: {default_ffmpeg}")
-            print("Please install ffmpeg or place it in the tools/bin/ directory.")
-
-    parser.add_argument("--ffmpeg", default=default_ffmpeg, help="Path to ffmpeg executable")
-
-    args = parser.parse_args()
-
+import os
+import sys
+import subprocess
+import argparse
+
+def download_clip(url, start_time, end_time, output_path, ffmpeg_path):
+    """
+    Downloads a specific clip from a YouTube video using yt-dlp.
+    """
+    # Ensure output directory exists if it's not the current directory
+    dir_name = os.path.dirname(output_path)
+    if dir_name:
+        os.makedirs(dir_name, exist_ok=True)
+
+    # Construct the yt-dlp command
+    # --download-sections "*start-end" downloads only that range
+    # --force-keyframes-at-cuts ensures precise cutting (requires ffmpeg)
+    cmd = [
+        "yt-dlp",
+        "--verbose",
+        "--download-sections", f"*{start_time}-{end_time}",
+        "--force-keyframes-at-cuts",
+        "--ffmpeg-location", ffmpeg_path,
+        "-o", output_path,
+        url
+    ]
+
+    print(f"Executing: ", ' '.join(cmd))
+
+    try:
+        result = subprocess.run(cmd, capture_output=True, text=True, check=True)
+        print("Download successful.")
+        print(result.stdout)
+
+        # Validate that the file was created and has content
+        if os.path.exists(output_path):
+            file_size = os.path.getsize(output_path)
+            if file_size == 0:
+                print(f"Error: Downloaded file is empty: {output_path}")
+                sys.exit(1)
+            else:
+                print(f"File validation: {output_path} created with size {file_size} bytes")
+        else:
+            print(f"Error: Downloaded file does not exist: {output_path}")
+            sys.exit(1)
+
+    except subprocess.CalledProcessError as e:
+        print("Error during download:")
+        print(e.stderr)
+        sys.exit(1)
+    except FileNotFoundError:
+        print("Error: yt-dlp not found. Please install it (pip install yt-dlp) and ensure it's in your PATH.")
+        sys.exit(1)
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description="Download a video clip.")
+    parser.add_argument("--url", required=True, help="Video URL")
+    parser.add_argument("--start", required=True, help="Start time (e.g., 00:00:10 or 10)")
+    parser.add_argument("--end", required=True, help="End time (e.g., 00:00:20 or 20)")
+    parser.add_argument("--output", required=True, help="Output file path")
+
+    # Try to find ffmpeg in system PATH first
+    import shutil
+    import platform
+    default_ffmpeg = shutil.which("ffmpeg")
+    if not default_ffmpeg:
+        # Fallback to local bin folder relative to this script
+        # Assumes structure: tools/downloaders/clip_grabber.py -> tools/bin/ffmpeg.exe (Windows) or tools/bin/ffmpeg (Unix)
+        base_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        # Determine the appropriate executable name based on the platform
+        ffmpeg_exe = "ffmpeg.exe" if platform.system().lower() == "windows" else "ffmpeg"
+        default_ffmpeg = os.path.join(base_dir, "bin", ffmpeg_exe)
+
+        # If the fallback path doesn't exist, warn the user
+        if not os.path.exists(default_ffmpeg):
+            print(f"Warning: ffmpeg not found in PATH or at expected location: {default_ffmpeg}")
+            print("Please install ffmpeg or place it in the tools/bin/ directory.")
+
+    parser.add_argument("--ffmpeg", default=default_ffmpeg, help="Path to ffmpeg executable")
+
+    args = parser.parse_args()
+
     download_clip(args.url, args.start, args.end, args.output, args.ffmpeg)

package/tools/downloaders/image_grabber.py

@@ -1,106 +1,106 @@
-import os
-import sys
-import requests
-import argparse
-import mimetypes
-from urllib.parse import urlparse
-
-def is_safe_image_type(content_type, url):
-    """
-    Check if the content type is a safe image type.
-    """
-    safe_types = {
-        'image/jpeg', 'image/jpg', 'image/png', 'image/gif',
-        'image/webp', 'image/bmp', 'image/svg+xml', 'image/tiff'
-    }
-
-    # Check content-type header
-    if content_type and content_type.lower() in safe_types:
-        return True
-
-    # Fallback: check file extension from URL
-    parsed_url = urlparse(url)
-    file_ext = os.path.splitext(parsed_url.path)[1].lower()
-    mime_type, _ = mimetypes.guess_type(f"dummy{file_ext}")
-
-    if mime_type and mime_type in safe_types:
-        return True
-
-    return False
-
-def get_file_size(response):
-    """
-    Get the file size from the response headers.
-    """
-    content_length = response.headers.get('content-length')
-    if content_length:
-        return int(content_length)
-    return 0
-
-def download_image(url, output_path):
-    """
-    Downloads an image from a URL with security validation.
-    """
-    # Ensure output directory exists if it's not the current directory
-    dir_name = os.path.dirname(output_path)
-    if dir_name:
-        os.makedirs(dir_name, exist_ok=True)
-
-    headers = {
-        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36'
-    }
-
-    try:
-        print(f"Downloading image from: {url}")
-
-        # First, make a HEAD request to check content type and size
-        head_response = requests.head(url, headers=headers, timeout=10)
-        content_type = head_response.headers.get('content-type', '').lower()
-
-        # Validate content type
-        if not is_safe_image_type(content_type, url):
-            print(f"Security Error: Content type '{content_type}' is not a safe image type.")
-            sys.exit(1)
-
-        # Check file size (limit to 50MB)
-        file_size = get_file_size(head_response)
-        if file_size > 50 * 1024 * 1024:  # 50MB
-            print(f"Security Error: File size {file_size} bytes exceeds 50MB limit.")
-            sys.exit(1)
-
-        # Actually download the file
-        response = requests.get(url, headers=headers, stream=True, timeout=10)
-        response.raise_for_status()
-
-        # Double-check content type after download
-        downloaded_content_type = response.headers.get('content-type', '').lower()
-        if not is_safe_image_type(downloaded_content_type, url):
-            print(f"Security Error: Downloaded content type '{downloaded_content_type}' is not a safe image type.")
-            sys.exit(1)
-
-        # Write file in chunks with size validation
-        total_size = 0
-        with open(output_path, 'wb') as f:
-            for chunk in response.iter_content(chunk_size=8192):
-                if chunk:  # Filter out keep-alive chunks
-                    total_size += len(chunk)
-                    if total_size > 50 * 1024 * 1024:  # 50MB limit
-                        print(f"Security Error: Downloaded file exceeds 50MB limit.")
-                        os.remove(output_path)  # Clean up partial file
-                        sys.exit(1)
-                    f.write(chunk)
-
-        print(f"Successfully saved to {output_path}")
-
-    except Exception as e:
-        print(f"Failed to download image: {e}")
-        sys.exit(1)
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description="Download an image.")
-    parser.add_argument("--url", required=True, help="Image URL")
-    parser.add_argument("--output", required=True, help="Output file path")
-
-    args = parser.parse_args()
-
+import os
+import sys
+import requests
+import argparse
+import mimetypes
+from urllib.parse import urlparse
+
+def is_safe_image_type(content_type, url):
+    """
+    Check if the content type is a safe image type.
+    """
+    safe_types = {
+        'image/jpeg', 'image/jpg', 'image/png', 'image/gif',
+        'image/webp', 'image/bmp', 'image/svg+xml', 'image/tiff'
+    }
+
+    # Check content-type header
+    if content_type and content_type.lower() in safe_types:
+        return True
+
+    # Fallback: check file extension from URL
+    parsed_url = urlparse(url)
+    file_ext = os.path.splitext(parsed_url.path)[1].lower()
+    mime_type, _ = mimetypes.guess_type(f"dummy{file_ext}")
+
+    if mime_type and mime_type in safe_types:
+        return True
+
+    return False
+
+def get_file_size(response):
+    """
+    Get the file size from the response headers.
+    """
+    content_length = response.headers.get('content-length')
+    if content_length:
+        return int(content_length)
+    return 0
+
+def download_image(url, output_path):
+    """
+    Downloads an image from a URL with security validation.
+    """
+    # Ensure output directory exists if it's not the current directory
+    dir_name = os.path.dirname(output_path)
+    if dir_name:
+        os.makedirs(dir_name, exist_ok=True)
+
+    headers = {
+        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36'
+    }
+
+    try:
+        print(f"Downloading image from: {url}")
+
+        # First, make a HEAD request to check content type and size
+        head_response = requests.head(url, headers=headers, timeout=10)
+        content_type = head_response.headers.get('content-type', '').lower()
+
+        # Validate content type
+        if not is_safe_image_type(content_type, url):
+            print(f"Security Error: Content type '{content_type}' is not a safe image type.")
+            sys.exit(1)
+
+        # Check file size (limit to 50MB)
+        file_size = get_file_size(head_response)
+        if file_size > 50 * 1024 * 1024:  # 50MB
+            print(f"Security Error: File size {file_size} bytes exceeds 50MB limit.")
+            sys.exit(1)
+
+        # Actually download the file
+        response = requests.get(url, headers=headers, stream=True, timeout=10)
+        response.raise_for_status()
+
+        # Double-check content type after download
+        downloaded_content_type = response.headers.get('content-type', '').lower()
+        if not is_safe_image_type(downloaded_content_type, url):
+            print(f"Security Error: Downloaded content type '{downloaded_content_type}' is not a safe image type.")
+            sys.exit(1)
+
+        # Write file in chunks with size validation
+        total_size = 0
+        with open(output_path, 'wb') as f:
+            for chunk in response.iter_content(chunk_size=8192):
+                if chunk:  # Filter out keep-alive chunks
+                    total_size += len(chunk)
+                    if total_size > 50 * 1024 * 1024:  # 50MB limit
+                        print(f"Security Error: Downloaded file exceeds 50MB limit.")
+                        os.remove(output_path)  # Clean up partial file
+                        sys.exit(1)
+                    f.write(chunk)
+
+        print(f"Successfully saved to {output_path}")
+
+    except Exception as e:
+        print(f"Failed to download image: {e}")
+        sys.exit(1)
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description="Download an image.")
+    parser.add_argument("--url", required=True, help="Image URL")
+    parser.add_argument("--output", required=True, help="Output file path")
+
+    args = parser.parse_args()
+
     download_image(args.url, args.output)