Update app.py

app.py

@@ -20,14 +20,16 @@ def get_video_dimensions(url):
     except:
         return 0, 0
 
-def run_scraper(platform, query, orientation="Any"):
-    """Runs the Node.js scraper for a specific platform"""
+def run_scraper(mode, query, orientation="Any"):
+    """Helper to run the Node.js scraper in specific mode"""
     try:
-        cmd = ["node", "scraper.js", platform, query, orientation]
+        # Calls: node scraper.js [mode] [query] [orientation]
+        cmd = ["node", "scraper.js", mode, query, orientation]
         result = subprocess.run(cmd, capture_output=True, text=True, timeout=240)
-        return [line.strip() for line in result.stdout.split('\n') if line.strip().startswith("http")]
+        urls = [line.strip() for line in result.stdout.split('\n') if line.strip().startswith("http")]
+        return urls
     except Exception as e:
-        print(f"Error running {platform}: {e}")
+        print(f"Scraper Error ({mode}): {e}")
         return []
 
 def process_video(query, orientation, start_time, end_time, mute_audio, progress=gr.Progress()):
@@ -38,73 +40,65 @@ def process_video(query, orientation, start_time, end_time, mute_audio, progress
     
     # --- PHASE 1: PINTEREST SEARCH ---
     progress(0.1, desc="🔍 Searching Pinterest...")
-    
-    pinterest_urls = run_scraper("pinterest", search_query)
-    selected_url = None
+    all_urls = run_scraper("pinterest", search_query)
     
     # Filter Pinterest Results
-    if pinterest_urls:
-        for i, url in enumerate(pinterest_urls):
-            progress(0.3 + (i/len(pinterest_urls)*0.2), desc=f"Checking Pinterest Result {i+1}...")
-            
-            if orientation == "Any":
-                selected_url = url; break
-            
-            w, h = get_video_dimensions(url)
-            if orientation == "Portrait" and h > w:
-                selected_url = url; break
-            if orientation == "Landscape" and w > h:
-                selected_url = url; break
+    selected_url = None
+    for i, url in enumerate(all_urls):
+        progress(0.3 + (i/len(all_urls)*0.1), desc=f"Checking Pinterest {i+1}...")
+        if orientation == "Any": selected_url = url; break
+        w, h = get_video_dimensions(url)
+        if orientation == "Portrait" and h > w: selected_url = url; break
+        if orientation == "Landscape" and w > h: selected_url = url; break
     
-    # --- PHASE 2: FALLBACK TO PEXELS ---
+    # --- PHASE 2: PEXELS FALLBACK ---
     if not selected_url:
-        progress(0.6, desc=f"⚠️ No {orientation} video on Pinterest. Switching to Pexels Fallback...")
+        progress(0.5, desc=f"⚠️ No {orientation} videos on Pinterest. Switching to Pexels Fallback...")
         
-        # We search Pexels specifically for the orientation we need
+        # We pass the orientation to Pexels so it filters efficiently
         pexels_urls = run_scraper("pexels", query, orientation)
         
-        if pexels_urls:
-            # Pexels URLs are already filtered by the search query parameters, so we take the first valid one
-            selected_url = pexels_urls[0]
-            progress(0.7, desc="✅ Found match on Pexels!")
-        else:
-            return None, f"❌ Failed on Pinterest AND Pexels. Try a different keyword."
+        for i, url in enumerate(pexels_urls):
+            progress(0.6 + (i/len(pexels_urls)*0.1), desc=f"Checking Pexels {i+1}...")
+            # Double check dimensions just to be safe
+            if orientation == "Any": selected_url = url; break
+            w, h = get_video_dimensions(url)
+            if orientation == "Portrait" and h > w: selected_url = url; break
+            if orientation == "Landscape" and w > h: selected_url = url; break
+
+    if not selected_url:
+        return None, f"❌ Failed. Searched Pinterest & Pexels, but found no {orientation} videos."
 
     # --- PHASE 3: PROCESSING ---
-    progress(0.8, desc="⚙️ Trimming & Processing...")
+    progress(0.8, desc="⚙️ Processing Video...")
     output_filename = f"final_{uuid.uuid4().hex[:5]}.mp4"
     
-    try:
-        ffmpeg_cmd = [
-            "ffmpeg",
-            "-ss", str(start_time),
-            "-to", str(end_time) if end_time > 0 else "999",
-            "-i", selected_url,
-            "-vf", "unsharp=3:3:1.2:3:3:0.0,format=yuv420p",
-            "-c:v", "libx264",
-            "-crf", "18", 
-            "-preset", "veryfast",
-            "-y", output_filename
-        ]
-
-        if mute_audio:
-            ffmpeg_cmd.insert(-1, "-an")
-        else:
-            ffmpeg_cmd.insert(-1, "-c:a")
-            ffmpeg_cmd.insert(-1, "aac")
+    ffmpeg_cmd = [
+        "ffmpeg",
+        "-ss", str(start_time),
+        "-to", str(end_time) if end_time > 0 else "999",
+        "-i", selected_url,
+        "-vf", "unsharp=3:3:1.2:3:3:0.0,format=yuv420p",
+        "-c:v", "libx264",
+        "-crf", "18", 
+        "-preset", "veryfast",
+        "-y", output_filename
+    ]
 
-        subprocess.run(ffmpeg_cmd, check=True)
-        
-        source_name = "Pexels" if "pexels.com" in selected_url or "vimeo" in selected_url else "Pinterest"
-        return output_filename, f"✅ Success! Source: {source_name} ({orientation})"
+    if mute_audio:
+        ffmpeg_cmd.insert(-1, "-an")
+    else:
+        ffmpeg_cmd.insert(-1, "-c:a")
+        ffmpeg_cmd.insert(-1, "aac")
 
-    except Exception as e:
-        return None, f"❌ Processing Error: {str(e)}"
+    subprocess.run(ffmpeg_cmd, check=True)
+    
+    source_name = "Pinterest" if "pinimg" in selected_url else "Pexels"
+    return output_filename, f"✅ Success! Source: {source_name} ({orientation})"
 
 # --- UI ---
 with gr.Blocks(theme=gr.themes.Default()) as demo:
-    gr.Markdown("# 📌 Pinterest Video Master (with Auto-Fallback)")
-    gr.Markdown("Searches Pinterest first. If no matching orientation is found, it automatically searches Pexels.")
+    gr.Markdown("# 📌 Pinterest + Pexels (Auto-Fallback)")
     
     with gr.Row():
         with gr.Column():