Update app.py

app.py

@@ -62,57 +62,102 @@ def render_translated_overlay(original_image: Image.Image, text_to_overlay: str,
                    min(original_image.width, bbox[2] + padding), min(original_image.height, bbox[3] + padding))
     overlay_width = overlay_box[2] - overlay_box[0]
     overlay_height = overlay_box[3] - overlay_box[1]
-
+    
     try:
-        sample_x = max(0, int(overlay_box[0]) - 5); sample_y = int((overlay_box[1] + overlay_box[3]) / 2)
+        sample_x = max(0, int(overlay_box[0]) - 5)
+        sample_y = int((overlay_box[1] + overlay_box[3]) / 2)
         bg_color = original_image.getpixel((sample_x, sample_y))
-    except (ValueError, IndexError): bg_color = (25, 25, 25, 255)
+    except (ValueError, IndexError): 
+        bg_color = (25, 25, 25, 255)
 
     overlay_layer = Image.new("RGBA", (overlay_width, overlay_height), bg_color)
     draw = ImageDraw.Draw(overlay_layer)
     target_width = overlay_width * 0.90
     font_size = 100
     final_wrapped_lines = []
-
+    
+    # ### --- FIX --- ###: Process RTL text BEFORE line wrapping
+    # First, reshape and process the entire text for proper RTL handling
+    try:
+        reshaped_text = arabic_reshaper.reshape(text_to_overlay)
+        processed_text = get_display(reshaped_text)
+    except Exception as e:
+        print(f"RTL processing error: {e}")
+        processed_text = text_to_overlay  # Fallback to original text
+    
     while font_size > 10:
         font = ImageFont.truetype(PERSIAN_FONT_PATH, font_size)
-        words = text_to_overlay.split();
-        if not words: break
-        raw_lines = []; current_line = ""
+        
+        # ### --- FIX --- ###: Split by spaces but work with processed RTL text
+        words = processed_text.split()
+        if not words: 
+            break
+            
+        raw_lines = []
+        current_line = ""
+        
         for word in words:
             test_line = (current_line + " " + word).strip()
-            line_width = draw.textbbox((0, 0), get_display(arabic_reshaper.reshape(test_line)), font=font)[2]
-            if line_width <= target_width: current_line = test_line
-            else: raw_lines.append(current_line); current_line = word
-        raw_lines.append(current_line)
-        total_height = sum(draw.textbbox((0,0), get_display(arabic_reshaper.reshape(l)), font=font)[3] for l in raw_lines)
-        if total_height <= overlay_height * 0.9: final_wrapped_lines = raw_lines; break
-        else: font_size -= 2
-
-    if not final_wrapped_lines: final_wrapped_lines = raw_lines
-
+            # Test the width with the actual text that will be rendered
+            line_width = draw.textbbox((0, 0), test_line, font=font)[2]
+            
+            if line_width <= target_width:
+                current_line = test_line
+            else:
+                if current_line:  # Only append if current_line is not empty
+                    raw_lines.append(current_line)
+                current_line = word
+        
+        if current_line:  # Don't forget the last line
+            raw_lines.append(current_line)
+        
+        # Calculate total height
+        total_height = 0
+        for line in raw_lines:
+            line_bbox = draw.textbbox((0, 0), line, font=font)
+            line_height = line_bbox[3] - line_bbox[1]
+            total_height += line_height
+        
+        if total_height <= overlay_height * 0.9:
+            final_wrapped_lines = raw_lines
+            break
+        else:
+            font_size -= 2
+    
+    if not final_wrapped_lines and raw_lines:  # Fallback
+        final_wrapped_lines = raw_lines
+
+    # ### --- FIX --- ###: Render with proper spacing
     final_font = ImageFont.truetype(PERSIAN_FONT_PATH, font_size)
     line_spacing = font_size * 0.3
-    line_heights = [draw.textbbox((0,0), get_display(arabic_reshaper.reshape(l)), font=final_font)[3] - draw.textbbox((0,0), get_display(arabic_reshaper.reshape(l)), font=final_font)[1] for l in final_wrapped_lines]
+    
+    # Calculate line heights properly
+    line_heights = []
+    for line in final_wrapped_lines:
+        line_bbox = draw.textbbox((0, 0), line, font=final_font)
+        line_height = line_bbox[3] - line_bbox[1]
+        line_heights.append(line_height)
+    
     total_text_height = sum(line_heights) + (len(final_wrapped_lines) - 1) * line_spacing
     y_start = (overlay_height - total_text_height) / 2
-
+    
     current_y = y_start
     for i, line in enumerate(final_wrapped_lines):
-        reshaped_line = arabic_reshaper.reshape(line)
-        bidi_line = get_display(reshaped_line)
-
-        line_bbox = draw.textbbox((0, 0), bidi_line, font=final_font)
+        # Calculate line width and center position
+        line_bbox = draw.textbbox((0, 0), line, font=final_font)
         line_width = line_bbox[2] - line_bbox[0]
         x_position = (overlay_width - line_width) / 2
-
-        draw.text((x_position + 1, current_y + 1), bidi_line, font=final_font, fill=(0, 0, 0, 180))
-        draw.text((x_position, current_y), bidi_line, font=final_font, fill=(255, 255, 255, 255))
-
+        
+        # Draw shadow for better readability
+        draw.text((x_position + 1, current_y + 1), line, font=final_font, fill=(0, 0, 0, 180))
+        # Draw main text
+        draw.text((x_position, current_y), line, font=final_font, fill=(255, 255, 255, 255))
+        
         current_y += line_heights[i] + line_spacing
 
     return overlay_layer, overlay_box
 
+
 # --- MAIN VIDEO PROCESSING PIPELINE (WITH FFMPEG CORRECTION) ---
 def process_video(video_path, progress=gr.Progress()):
     if video_path is None: raise gr.Error("Please upload a video file first.")