Fix video filters, text overlay, burn subtitles (en, hi, ur), add ZIP download and Beautify preset

app.py

@@ -556,6 +556,63 @@ def merge_videos():
         traceback.print_exc()
         return jsonify({'success': False, 'error': str(e)}), 500
 
+def download_youtube_subtitles(url, lang, job_id):
+    """
+    Downloads subtitles or auto-generated subtitles for a YouTube video using yt-dlp.
+    Respects rate limits by employing cookies, proxy, and user impersonation.
+    """
+    ytdlp_bin = get_pip_binary('yt-dlp')
+    has_cookies = os.path.exists(COOKIES_FILE_PATH) and os.path.getsize(COOKIES_FILE_PATH) > 0
+    yt_proxy = os.environ.get('YT_PROXY', '')
+    
+    try:
+        import curl_cffi
+        has_curl_cffi = True
+    except ImportError:
+        has_curl_cffi = False
+
+    output_template = os.path.join(UPLOAD_FOLDER, f"{job_id}_subs")
+    
+    cmd = [
+        ytdlp_bin, '--skip-download',
+        '--write-subs', '--write-auto-subs',
+        '--sub-format', 'srt',
+        '--sub-langs', lang,
+        '--geo-bypass', '--no-check-certificates', '-4',
+        '--socket-timeout', '15', '--retries', '1',
+        '-o', f"{output_template}.%(ext)s"
+    ]
+    
+    if has_cookies:
+        cmd.extend(['--cookies', COOKIES_FILE_PATH])
+    if yt_proxy:
+        cmd.extend(['--proxy', yt_proxy])
+    if has_curl_cffi:
+        cmd.extend(['--impersonate', 'chrome'])
+        cmd.extend(['--extractor-args', 'youtube:player_client=ios,android,web'])
+    else:
+        cmd.extend(['--extractor-args', 'youtube:player_client=default,-tv'])
+        
+    cmd.append(url)
+    
+    print(f"[subtitles] Requesting subtitles ({lang}) for {url} ...")
+    try:
+        res = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=20)
+        print(f"[subtitles] yt-dlp exit status: {res.returncode}")
+        
+        # Look for matching srt file in UPLOAD_FOLDER
+        import glob
+        matches = glob.glob(os.path.join(UPLOAD_FOLDER, f"{job_id}_subs.*.srt"))
+        if matches:
+            print(f"[subtitles] Found downloaded subtitles: {matches[0]}")
+            return matches[0]
+        else:
+            stderr_out = res.stderr.decode('utf-8', errors='ignore')[-300:]
+            print(f"[subtitles] Subtitle download returned no srt file. Stderr: {stderr_out}")
+    except Exception as e:
+        print(f"[subtitles] Exception during subtitle download: {e}")
+    return None
+
 @app.route('/api/clip', methods=['POST'])
 def clip_youtube_video():
     """
@@ -578,19 +635,29 @@ def clip_youtube_video():
         except ValueError:
             b_width = 0
             
+        job_id = str(uuid.uuid4())
+        
+        # Subtitle Handling
+        caption_lang = request.form.get('caption_lang', 'none')
+        subtitle_file_path = None
+        if caption_lang != 'none' and url:
+            subtitle_file_path = download_youtube_subtitles(url, caption_lang, job_id)
+            
         filters = {
             'aspect_ratio': request.form.get('aspect_ratio', 'original'),
-            'mirror': request.form.get('mirror', 'true') == 'true',
+            'mirror_mode': request.form.get('mirror_mode', 'none'),
             'zoom': request.form.get('zoom', 'true') == 'true',
+            'color_filter': request.form.get('color_filter', 'none'),
+            'vignette': request.form.get('vignette', 'false') == 'true',
+            'noise_grain': request.form.get('noise_grain', 'false') == 'true',
             'speed': float(request.form.get('speed', 1.04)),
             'pitch_shift': float(request.form.get('pitch_shift', 0.8)),
             'border_color': request.form.get('border_color', 'none'),
             'border_width': b_width,
             'text_overlay': request.form.get('text_overlay', ''),
-            'color_shift': request.form.get('color_shift', 'false') == 'true'
+            'subtitle_file_path': subtitle_file_path
         }
         
-        job_id = str(uuid.uuid4())
         raw_download_path = os.path.join(UPLOAD_FOLDER, f"{job_id}_raw.mp4")
         
         dl_success = False
@@ -735,7 +802,7 @@ def clip_youtube_video():
             if os.path.exists(out_path):
                 processed_files.append(out_filename)
                 
-        # Cleanup raw downloaded file & sliced folder
+        # Cleanup raw downloaded file & sliced folder & subtitles
         if os.path.exists(raw_download_path):
             os.remove(raw_download_path)
             
@@ -743,6 +810,12 @@ def clip_youtube_video():
         if os.path.exists(temp_clips_dir):
             shutil.rmtree(temp_clips_dir)
             
+        if subtitle_file_path and os.path.exists(subtitle_file_path):
+            try:
+                os.remove(subtitle_file_path)
+            except Exception:
+                pass
+            
         return jsonify({
             'success': True,
             'message': f'YouTube video processed into {len(processed_files)} clips!',
@@ -750,6 +823,18 @@ def clip_youtube_video():
         })
         
     except Exception as e:
+        import shutil
+        # Cleanup files in case of error
+        if 'raw_download_path' in locals() and os.path.exists(raw_download_path):
+            try: os.remove(raw_download_path)
+            except Exception: pass
+        if 'temp_clips_dir' in locals() and os.path.exists(temp_clips_dir):
+            try: shutil.rmtree(temp_clips_dir)
+            except Exception: pass
+        if 'subtitle_file_path' in locals() and subtitle_file_path and os.path.exists(subtitle_file_path):
+            try: os.remove(subtitle_file_path)
+            except Exception: pass
+            
         import traceback
         traceback.print_exc()
         return jsonify({'success': False, 'error': str(e)}), 500
@@ -856,6 +941,42 @@ def download_file(filename):
     return send_from_directory(OUTPUT_FOLDER, filename)
 
 
+@app.route('/api/download-all', methods=['GET'])
+def download_all():
+    """
+    ZIP all exported MP4 clips in the outputs directory and return as a single download.
+    """
+    import zipfile
+    import io
+    from flask import send_file
+    from datetime import datetime
+
+    try:
+        # Create in-memory zip
+        zip_buffer = io.BytesIO()
+        with zipfile.ZipFile(zip_buffer, 'w', zipfile.ZIP_DEFLATED) as zip_file:
+            for f in os.listdir(OUTPUT_FOLDER):
+                # skip temp / partial files
+                if f.endswith('.mp4') and not any(pat in f for pat in ['.temp', 'TEMP_MPY', '.part', '.tmp']):
+                    path = os.path.join(OUTPUT_FOLDER, f)
+                    if os.path.exists(path) and os.path.getsize(path) > 0:
+                        zip_file.write(path, f)
+                        
+        zip_buffer.seek(0)
+        
+        zip_filename = f"exported_clips_{datetime.now().strftime('%Y%m%d_%H%M%S')}.zip"
+        return send_file(
+            zip_buffer,
+            mimetype='application/zip',
+            as_attachment=True,
+            download_name=zip_filename
+        )
+    except Exception as e:
+        import traceback
+        traceback.print_exc()
+        return jsonify({'success': False, 'error': f"Failed to zip files: {str(e)}"}), 500
+
+
 if __name__ == '__main__':
     import os
     port = int(os.environ.get('PORT', 5005))

static/css/style.css

@@ -996,6 +996,12 @@ body.light-theme .library-action-btn {
     border-color: rgba(244, 63, 94, 0.3);
 }
 
+.zip-btn:hover {
+    color: var(--success);
+    background: var(--success-light);
+    border-color: rgba(16, 185, 129, 0.3);
+}
+
 .refresh-btn:hover svg {
     transform: rotate(180deg);
     transition: transform 0.5s ease;

static/index.html

@@ -267,24 +267,63 @@
 
                         <div class="toggles-grid">
                             <label class="toggle-control">
-                                <span class="toggle-label">↔ Flip</span>
-                                <input type="checkbox" name="mirror" value="true" checked>
+                                <span class="toggle-label">🔍 Zoom</span>
+                                <input type="checkbox" name="zoom" value="true" checked>
                                 <span class="toggle-switch"></span>
                             </label>
 
                             <label class="toggle-control">
-                                <span class="toggle-label">🔍 Zoom</span>
-                                <input type="checkbox" name="zoom" value="true" checked>
+                                <span class="toggle-label">🎭 Vignette</span>
+                                <input type="checkbox" name="vignette" value="true">
                                 <span class="toggle-switch"></span>
                             </label>
 
                             <label class="toggle-control">
-                                <span class="toggle-label">🎨 Color</span>
-                                <input type="checkbox" name="color_shift" value="true" checked>
+                                <span class="toggle-label">📺 Grain/Noise</span>
+                                <input type="checkbox" name="noise_grain" value="true">
                                 <span class="toggle-switch"></span>
                             </label>
                         </div>
 
+                        <div class="form-grid-2col">
+                            <div class="form-group">
+                                <label for="mirror_mode">↔ Mirror Flip Mode</label>
+                                <select id="mirror_mode" name="mirror_mode">
+                                    <option value="none">No Flip</option>
+                                    <option value="horizontal" selected>Horizontal Flip</option>
+                                    <option value="vertical">Vertical Flip</option>
+                                    <option value="both">Both Flip</option>
+                                </select>
+                            </div>
+                            <div class="form-group">
+                                <label for="color_filter">🎨 Color Grading</label>
+                                <select id="color_filter" name="color_filter">
+                                    <option value="none">No Filter</option>
+                                    <option value="beautify" selected>Beautiful Glow (Skin/Details)</option>
+                                    <option value="cinematic">Cinematic Contrast</option>
+                                    <option value="vibrant">Vibrant Saturation</option>
+                                    <option value="warm">Warm Sepia</option>
+                                    <option value="cool">Cool Blue</option>
+                                    <option value="vintage">Vintage Retro</option>
+                                    <option value="grayscale">Grayscale B&W</option>
+                                    <option value="dramatic">Dramatic Film</option>
+                                    <option value="faded">Faded Matte</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-grid">
+                            <div class="form-group">
+                                <label for="caption_lang">💬 Burn Subtitles / Captions (YouTube Only)</label>
+                                <select id="caption_lang" name="caption_lang">
+                                    <option value="none" selected>No Captions</option>
+                                    <option value="en">English Captions</option>
+                                    <option value="hi">Hinglish / Hindi Captions</option>
+                                    <option value="ur">Urdu Captions</option>
+                                </select>
+                            </div>
+                        </div>
+
                         <div class="form-grid">
                             <div class="form-group">
                                 <label for="text_overlay">Text Overlay Watermark</label>
@@ -370,6 +409,11 @@
                                     <path d="M21.5 2v6h-6M21.34 15.57a10 10 0 11-.57-8.38l.56-.56" stroke-linecap="round" stroke-linejoin="round"/>
                                 </svg>
                             </button>
+                            <button class="library-action-btn zip-btn" id="download-all-btn" type="button" title="Download all clips as ZIP">
+                                <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2">
+                                    <path d="M21 15v4a2 2 0 01-2 2H5a2 2 0 01-2-2v-4m-7-5v9m-4-4l4 4 4-4m-4-10v5a2 2 0 002 2h2" stroke-linecap="round" stroke-linejoin="round"/>
+                                </svg>
+                            </button>
                             <button class="library-action-btn clear-btn" id="clear-library-btn" type="button" title="Clear all files">
                                 <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2">
                                     <polyline points="3 6 5 6 21 6"/>

static/js/app.js

@@ -370,6 +370,9 @@ document.addEventListener('DOMContentLoaded', () => {
     });
 
     $('refresh-gallery')?.addEventListener('click', loadGallery);
+    $('download-all-btn')?.addEventListener('click', () => {
+        window.location.href = '/api/download-all';
+    });
     $('clear-library-btn')?.addEventListener('click', clearLibrary);
     $('library-search')?.addEventListener('input', loadGallery);
 

utils/video_effects.py

@@ -2,6 +2,15 @@ import os
 import subprocess
 import tempfile
 
+def _parse_bool(val, default=False):
+    if val is None:
+        return default
+    if isinstance(val, bool):
+        return val
+    if isinstance(val, str):
+        return val.lower() in ("true", "1", "yes", "on")
+    return bool(val)
+
 def crop_to_aspect_ratio(clip, target_w, target_h):
     """
     Crops a video clip from its center to match the target aspect ratio,
@@ -137,29 +146,24 @@ def apply_copyright_filters(input_path, output_path, options):
     """
     Applies visual and audio transformations to bypass copyright filters.
     Uses pure FFmpeg subprocess for reliability — no moviepy silent failures.
-
-    Filters applied:
-    - Aspect Ratio (vertical 9:16, horizontal 16:9, or original)
-    - Horizontal mirror (hflip)
-    - 5% center zoom-in (crop + scale)
-    - Speed adjustment (setpts + atempo)
-    - Audio pitch shift (asetrate + atempo correction)
     """
-    aspect       = options.get("aspect_ratio", "original")
-    do_mirror    = options.get("mirror", True)
-    do_zoom      = options.get("zoom", True)
-    speed_factor = float(options.get("speed", 1.04))
-    pitch_semi   = float(options.get("pitch_shift", 0.8))
-
-    border_color = options.get("border_color", "none")
+    aspect        = options.get("aspect_ratio", "original")
+    mirror_mode   = options.get("mirror_mode", "horizontal")
+    color_filter  = options.get("color_filter", "cinematic")
+    do_zoom       = _parse_bool(options.get("zoom"), True)
+    vignette      = _parse_bool(options.get("vignette"), False)
+    noise_grain   = _parse_bool(options.get("noise_grain"), False)
+    text_overlay  = options.get("text_overlay", "")
+    subtitle_path = options.get("subtitle_file_path")
+
+    speed_factor  = float(options.get("speed", 1.04))
+    pitch_semi    = float(options.get("pitch_shift", 0.8))
+
+    border_color  = options.get("border_color", "none")
     try:
         border_width = int(options.get("border_width", 0))
     except ValueError:
         border_width = 0
-    text_overlay = options.get("text_overlay", "")
-    color_shift  = options.get("color_shift", False)
-    if isinstance(color_shift, str):
-        color_shift = color_shift.lower() == "true"
 
     # ── Check if the source has an audio stream ──────────────────────
     probe = subprocess.run(
@@ -185,17 +189,52 @@ def apply_copyright_filters(input_path, output_path, options):
         # Pad with border color
         vf.append(f"pad=iw+2*{border_width}:ih+2*{border_width}:{border_width}:{border_width}:color={border_color}")
 
-    if do_mirror:
+    # Flip Mode
+    if mirror_mode == "horizontal":
         vf.append("hflip")
+    elif mirror_mode == "vertical":
+        vf.append("vflip")
+    elif mirror_mode == "both":
+        vf.append("hflip,vflip")
 
     if do_zoom:
         # Scale up 5%, then crop center back to original size
         vf.append("scale=iw*1.05:ih*1.05,crop=iw/1.05:ih/1.05")
 
-    if color_shift:
-        # Slightly shift color metrics
-        vf.append("eq=contrast=1.03:brightness=0.02:saturation=1.08")
-
+    # Color Grading Filters
+    if color_filter == "cinematic":
+        vf.append("eq=contrast=1.15:brightness=0.03:saturation=1.2")
+    elif color_filter == "vibrant":
+        vf.append("eq=saturation=1.35:contrast=1.05")
+    elif color_filter == "beautify":
+        vf.append("eq=brightness=0.05:contrast=1.05:saturation=1.15,unsharp=3:3:0.5:3:3:0.5")
+    elif color_filter == "warm":
+        vf.append("colorchannelmixer=.393:.769:.189:0:.349:.686:.168:0:.272:.534:.131:0")
+    elif color_filter == "cool":
+        vf.append("colorchannelmixer=.3:.3:.3:0:.3:.3:.3:0:.8:.8:.8:0")
+    elif color_filter == "vintage":
+        vf.append("colorchannelmixer=.393:.769:.189:0:.349:.686:.168:0:.272:.534:.131:0")
+    elif color_filter == "grayscale":
+        vf.append("colorchannelmixer=.3:.59:.11:0:.3:.59:.11:0:.3:.59:.11:0")
+    elif color_filter == "dramatic":
+        vf.append("eq=contrast=1.3:brightness=-0.02:saturation=0.6")
+    elif color_filter == "faded":
+        vf.append("eq=contrast=0.85:brightness=0.08:saturation=0.9")
+
+    # Vignette
+    if vignette:
+        vf.append("vignette=pi/5")
+
+    # Noise/Grain
+    if noise_grain:
+        vf.append("noise=alls=3:allf=t")
+
+    # Burn subtitles if present
+    if subtitle_path and os.path.exists(subtitle_path):
+        escaped_sub_path = subtitle_path.replace("'", "'\\''").replace(":", "\\:")
+        vf.append(f"subtitles='{escaped_sub_path}':force_style='FontSize=20,PrimaryColour=&H00FFFFFF,OutlineColour=&H00000000,BorderStyle=1'")
+
+    # Text Overlay
     if text_overlay:
         # Check if drawtext filter is available in the host FFmpeg build
         drawtext_available = False
@@ -213,18 +252,27 @@ def apply_copyright_filters(input_path, output_path, options):
             clean_text = clean_text.replace("'", "'\\''").replace(":", "\\:")
             
             # Resolve standard font paths for macOS/Linux compatibility
-            font_paths = [
-                "/System/Library/Fonts/Helvetica.ttc",
-                "/Library/Fonts/Arial.ttf",
-                "/System/Library/Fonts/Supplemental/Arial.ttf",
-                "/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf",
-                "/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf"
-            ]
+            import glob
             fontfile_param = ""
-            for p in font_paths:
-                if os.path.exists(p):
-                    fontfile_param = f":fontfile='{p}'"
-                    break
+            # Search recursively in Linux standard font directory
+            linux_fonts = glob.glob("/usr/share/fonts/**/*.ttf", recursive=True) + \
+                          glob.glob("/usr/share/fonts/**/*.ttc", recursive=True)
+            if linux_fonts:
+                escaped_p = linux_fonts[0].replace("'", "'\\''").replace(":", "\\:")
+                fontfile_param = f":fontfile='{escaped_p}'"
+            else:
+                font_paths = [
+                    "/System/Library/Fonts/Helvetica.ttc",
+                    "/Library/Fonts/Arial.ttf",
+                    "/System/Library/Fonts/Supplemental/Arial.ttf",
+                    "/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf",
+                    "/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf"
+                ]
+                for p in font_paths:
+                    if os.path.exists(p):
+                        escaped_p = p.replace("'", "'\\''").replace(":", "\\:")
+                        fontfile_param = f":fontfile='{escaped_p}'"
+                        break
             vf.append(f"drawtext=text='{clean_text}'{fontfile_param}:x=(w-text_w)/2:y=100:fontsize=36:fontcolor=white:box=1:boxcolor=black@0.4:boxborderw=6")
         else:
             print("[video_effects] Warning: 'drawtext' filter is not supported by this FFmpeg build. Skipping text overlay.")