Resolved merge conflicts

app.py

@@ -16,17 +16,27 @@ language_map = {
     "Japanese": "Helsinki-NLP/opus-mt-en-jap"
 }
 
+<<<<<<< HEAD
 # Custom CSS for dark mode and animations
 css = """
 body { 
     background-color: #1a1a1a;
     color: #e0e0e0;
     font-family: 'Arial', sans-serif;
+=======
+# Custom CSS for a Windows-like professional look
+css = """
+body {
+    background-color: #1a1a1a;
+    color: #e0e0e0;
+    font-family: 'Segoe UI', sans-serif;
+>>>>>>> e219dd283e6bfab4f30d250a687e17c1cc380d47
 }
 .gradio-container {
     max-width: 1200px;
     margin: 0 auto;
     padding: 20px;
+<<<<<<< HEAD
     border-radius: 10px;
     box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
 }
@@ -42,6 +52,21 @@ body {
 }
 @keyframes blink {
     50% { opacity: 0.5; }
+=======
+    border-radius: 8px;
+    background: #2d2d2d;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
+}
+.file-preview {
+    border: 2px dashed #007acc;
+    padding: 20px;
+    border-radius: 8px;
+}
+.progress-text {
+    color: #00ff00;
+    font-weight: bold;
+    margin-top: 10px;
+>>>>>>> e219dd283e6bfab4f30d250a687e17c1cc380d47
 }
 """
 
@@ -64,9 +89,15 @@ with gr.Blocks(theme=gr.themes.Monochrome(), css=css) as demo:
                 value="English"
             )
 
+<<<<<<< HEAD
     generate_button = gr.Button("Generate Subtitles 🚀")
     progress_text = gr.Textbox(
         label="Progress",
+=======
+    generate_button = gr.Button("Generate Subtitles 🚀", elem_classes=["btn-primary"])
+    progress_text = gr.Textbox(
+        label="Status",
+>>>>>>> e219dd283e6bfab4f30d250a687e17c1cc380d47
         interactive=False,
         elem_classes=["progress-text"]
     )
@@ -78,6 +109,7 @@ with gr.Blocks(theme=gr.themes.Monochrome(), css=css) as demo:
             if not video_file.name.lower().endswith(('.mp4', '.mkv', '.avi')):
                 return None, "❌ Invalid file type. Please upload an MP4, MKV, or AVI file."
 
+<<<<<<< HEAD
             # Update progress
             progress = "🔄 Processing video..."
             yield None, progress  # Initial progress update
@@ -90,6 +122,24 @@ with gr.Blocks(theme=gr.themes.Monochrome(), css=css) as demo:
                 yield None, "❌ Error during processing. Check logs."
         except Exception as e:
             yield None, f"❌ Error: {str(e)}"
+=======
+            # Initialize progress tracking
+            progress = gr.Progress(track_tqdm=True)
+
+            # Process video
+            progress(0, desc="Initializing...")
+            srt_path = process_video(video_file.name, language, progress=progress)
+            if srt_path:
+                progress(1, desc="✅ Subtitles generated successfully!")
+                return gr.File(srt_path), "✅ Subtitles ready for download!"
+            else:
+                progress(0, desc="❌ Error during processing.")
+                return None, "❌ Failed to generate subtitles. Check logs."
+
+        except Exception as e:
+            progress(0, desc="❌ Error encountered.")
+            return None, f"❌ Error: {str(e)}"
+>>>>>>> e219dd283e6bfab4f30d250a687e17c1cc380d47
 
     generate_button.click(
         generate_subtitles,

utils.py

@@ -7,6 +7,7 @@ import subprocess
 # Load Whisper model
 model = whisper.load_model("base")
 
+<<<<<<< HEAD
 def process_video(video_path, language):
     # Create a temporary directory
     temp_dir = tempfile.gettempdir()
@@ -16,18 +17,38 @@ def process_video(video_path, language):
     try:
         # Convert video to MP4 using ffmpeg
         print(f"Converting video: {video_path} to MP4...")
+=======
+def process_video(video_path, language, progress=None):
+    output_video_path = os.path.join(tempfile.gettempdir(), "converted_video.mp4")
+    srt_path = os.path.join(tempfile.gettempdir(), "subtitles.srt")
+
+    try:
+        # Convert video to MP4 using ffmpeg
+        if progress:
+            progress(0.2, desc="🔄 Converting video to MP4...")
+>>>>>>> e219dd283e6bfab4f30d250a687e17c1cc380d47
         subprocess.run(
             ["ffmpeg", "-i", video_path, "-c:v", "libx264", "-preset", "fast", output_video_path],
             check=True,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE
         )
+<<<<<<< HEAD
         print("Video converted successfully!")
 
         # Transcribe video
         print("Transcribing video...")
         result = model.transcribe(output_video_path, language="en")
         print("Transcription completed!")
+=======
+
+        # Transcribe video
+        if progress:
+            progress(0.4, desc="📝 Transcribing audio...")
+        result = model.transcribe(output_video_path, language="en")
+        if progress:
+            progress(0.6, desc="🌐 Translating subtitles...")
+>>>>>>> e219dd283e6bfab4f30d250a687e17c1cc380d47
 
         # Translation logic
         segments = []
@@ -48,10 +69,13 @@ def process_video(video_path, language):
             }
             model_name = model_map.get(language)
             if not model_name:
-                return f"Unsupported language: {language}"
+                return None
 
             # Load translation model
+<<<<<<< HEAD
             print(f"Loading translation model: {model_name}")
+=======
+>>>>>>> e219dd283e6bfab4f30d250a687e17c1cc380d47
             if language == "Telugu":
                 tokenizer = AutoTokenizer.from_pretrained(model_name)
                 translation_model = AutoModelForSeq2SeqLM.from_pretrained(model_name)
@@ -73,13 +97,23 @@ def process_video(video_path, language):
                     segments.append({"text": translated_text, "start": segment["start"], "end": segment["end"]})
 
         # Create SRT file
+<<<<<<< HEAD
+=======
+        if progress:
+            progress(0.8, desc="📝 Generating SRT file...")
+>>>>>>> e219dd283e6bfab4f30d250a687e17c1cc380d47
         with open(srt_path, "w", encoding="utf-8") as f:
             for i, segment in enumerate(segments, 1):
                 start = f"{segment['start']:.3f}".replace(".", ",")
                 end = f"{segment['end']:.3f}".replace(".", ",")
                 text = segment["text"].strip()
                 f.write(f"{i}\n00:00:{start} --> 00:00:{end}\n{text}\n\n")
+<<<<<<< HEAD
         print(f"SRT file saved to {srt_path}")
+=======
+        if progress:
+            progress(1.0, desc="✅ Done!")
+>>>>>>> e219dd283e6bfab4f30d250a687e17c1cc380d47
         return srt_path
 
     except subprocess.CalledProcessError as e: