Update app.py

app.py

@@ -14,7 +14,7 @@ from datetime import datetime
 from queue import Queue
 
 # ========== Global Job Storage ==========
-jobs = {}  # job_id -> {status, input_file, output_file, timestamp, progress, error, log_queue}
+jobs = {}
 
 class UltimateVideoEvader:
     def __init__(self):
@@ -56,7 +56,6 @@ class UltimateVideoEvader:
     
     def build_brutal_command(self, input_file, output_file):
         cmd = [self.ffmpeg_path, "-i", input_file]
-        
         cmd.extend(["-map_metadata", "-1"])
         
         scale = self._random_float(0.6, 1.4)
@@ -118,20 +117,15 @@ class UltimateVideoEvader:
         
         codec = random.choice(["libx264", "libx265", "libvpx-vp9"])
         cmd.extend(["-c:v", codec])
-        
         preset = random.choice(["ultrafast", "superfast", "veryfast", "faster", "fast", "medium", "slow"])
         cmd.extend(["-preset", preset])
-        
         crf = random.randint(18, 28)
         cmd.extend(["-crf", str(crf)])
-        
         audio_codec = random.choice(["aac", "libmp3lame"])
         cmd.extend(["-c:a", audio_codec, "-b:a", "128k"])
-        
         container = random.choice(["mp4", "mkv", "mov"])
         base = os.path.splitext(output_file)[0]
         output_file = f"{base}.{container}"
-        
         cmd.extend(["-y", output_file])
         return cmd, output_file
     
@@ -177,7 +171,6 @@ class UltimateVideoEvader:
             speed_pattern = re.compile(r'speed=\s*([\d.]+)x')
             fps_pattern = re.compile(r'fps=\s*([\d.]+)')
             time_pattern = re.compile(r'time=(\d{2}):(\d{2}):(\d{2})\.(\d{2})')
-            frame_pattern = re.compile(r'frame=\s*(\d+)')
             
             start_time = time.time()
             last_log_time = 0
@@ -186,14 +179,9 @@ class UltimateVideoEvader:
                 line = process.stderr.readline()
                 if not line:
                     break
-                
                 line = line.strip()
                 
                 if 'frame=' in line or 'time=' in line:
-                    frame_match = frame_pattern.search(line)
-                    if frame_match:
-                        processed_frames = int(frame_match.group(1))
-                    
                     time_match = time_pattern.search(line)
                     if time_match:
                         h, m, s, cs = time_match.groups()
@@ -201,12 +189,10 @@ class UltimateVideoEvader:
                     
                     speed_match = speed_pattern.search(line)
                     speed_val = speed_match.group(1) if speed_match else "?"
-                    
                     fps_match = fps_pattern.search(line)
                     fps_val = fps_match.group(1) if fps_match else "?"
                     
                     if duration > 0 and time_match and speed_match:
-                        elapsed = time.time() - start_time
                         if float(speed_val) > 0:
                             eta = (duration - current_time) / float(speed_val)
                             eta_min = int(eta // 60)
@@ -325,15 +311,18 @@ class UltimateVideoEvader:
         job_list.sort(key=lambda x: x["timestamp"], reverse=True)
         return job_list
     
-    def download_job_by_id(self, job_id):
+    def get_download_link(self, job_id):
         if job_id not in jobs:
-            return None, "❌ Job ID not found"
+            return None, "❌ Job not found"
         job = jobs[job_id]
         if job.get("status") != "completed":
-            return None, f"⏳ Job is {job.get('status')} – not ready yet"
+            return None, f"⏳ Job is {job.get('status')}"
         if not job.get("output_file") or not os.path.exists(job.get("output_file")):
-            return None, "❌ Output file missing"
-        return job["output_file"], f"✅ Download ready: {os.path.basename(job['output_file'])}"
+            return None, "❌ File missing"
+        file_path = job["output_file"]
+        file_name = os.path.basename(file_path)
+        # Return file and HTML link
+        return file_path, f"✅ Ready: {file_name}"
 
 
 # ========== Gradio Interface ==========
@@ -343,7 +332,6 @@ def create_interface():
     with gr.Blocks(title="Video Fingerprint Evader") as demo:
         gr.Markdown("""
         # 🚀 Video Fingerprint Evader – Live Logs + Background Processing
-        **Live Logs में ETA, Speed, FPS और Progress की पूरी जानकारी देखें।**
         """)
         
         job_id_state = gr.State("")
@@ -358,8 +346,13 @@ def create_interface():
                     )
                     process_btn = gr.Button("🔥 Process in Background", variant="primary")
                     job_status = gr.Textbox(label="📊 Job Status", lines=3, interactive=False)
-                    download_btn = gr.Button("📥 Download Completed Video", variant="secondary")
-                    download_output = gr.File(label="📥 Download", visible=False)
+                    
+                    gr.Markdown("---")
+                    gr.Markdown("### 📥 Download Current Job")
+                    download_btn = gr.Button("📥 Download Video", variant="secondary")
+                    download_file = gr.File(label="📥 Download", visible=False)
+                    download_link_html = gr.HTML(label="", visible=False)
+                    download_status = gr.Textbox(label="Status", lines=2, interactive=False)
                 
                 with gr.Column(scale=2):
                     log_display = gr.Textbox(
@@ -387,7 +380,8 @@ def create_interface():
                     gr.Markdown("### 📥 Download by Job ID")
                     download_job_id = gr.Textbox(label="Enter Job ID", placeholder="e.g., 5b7c3970")
                     download_by_id_btn = gr.Button("📥 Download Video", variant="primary")
-                    download_by_id_output = gr.File(label="Download", visible=False)
+                    download_by_id_file = gr.File(label="Download", visible=False)
+                    download_by_id_link = gr.HTML(label="", visible=False)
                     download_by_id_status = gr.Textbox(label="Status", lines=2, interactive=False)
         
         # ===== Processing Functions =====
@@ -406,13 +400,26 @@ def create_interface():
             progress = jobs.get(job_id, {}).get("progress", 0)
             return logs, f"Status: {status} | Progress: {progress}%"
         
-        def download_completed(job_id):
+        def download_current(job_id):
             if not job_id or job_id not in jobs:
-                return None
-            job = jobs.get(job_id)
-            if job and job.get("status") == "completed" and job.get("output_file"):
-                return job["output_file"]
-            return None
+                return None, "", False, "❌ No job"
+            file_path, status = evader.get_download_link(job_id)
+            if file_path and os.path.exists(file_path):
+                file_name = os.path.basename(file_path)
+                # Create HTML download link
+                html_link = f'<a href="/file={file_path}" download="{file_name}" target="_blank">📥 Click here to download: {file_name}</a>'
+                return file_path, html_link, True, status
+            return None, "", False, status
+        
+        def download_by_id(job_id):
+            if not job_id:
+                return None, "", False, "❌ Please enter Job ID"
+            file_path, status = evader.get_download_link(job_id)
+            if file_path and os.path.exists(file_path):
+                file_name = os.path.basename(file_path)
+                html_link = f'<a href="/file={file_path}" download="{file_name}" target="_blank">📥 Click here to download: {file_name}</a>'
+                return file_path, html_link, True, status
+            return None, "", False, status
         
         def refresh_history():
             job_list = evader.get_all_jobs()
@@ -437,12 +444,6 @@ def create_interface():
                 ])
             return gr.update(value=rows, visible=True)
         
-        def download_by_job_id(job_id):
-            if not job_id:
-                return None, "❌ Please enter a Job ID"
-            file_path, status = evader.download_job_by_id(job_id)
-            return file_path, status
-        
         # ===== Event Handlers =====
         
         process_btn.click(
@@ -462,9 +463,9 @@ def create_interface():
         )
         
         download_btn.click(
-            download_completed,
+            download_current,
             inputs=[job_id_state],
-            outputs=[download_output]
+            outputs=[download_file, download_link_html, download_file, download_status]
         )
         
         history_refresh_btn.click(
@@ -474,12 +475,12 @@ def create_interface():
         )
         
         download_by_id_btn.click(
-            download_by_job_id,
+            download_by_id,
             inputs=[download_job_id],
-            outputs=[download_by_id_output, download_by_id_status]
+            outputs=[download_by_id_file, download_by_id_link, download_by_id_file, download_by_id_status]
         )
         
-        # ===== Auto-refresh using gr.Timer =====
+        # ===== Auto-refresh =====
         timer = gr.Timer(value=5, active=False)
         
         def toggle_timer(job_id):