Update app.py

app.py

@@ -189,22 +189,26 @@ def upload_to_dataset(file_path, project_id, filename, subfolder="videos"):
         return None
 
 def get_font_path(font_family):
-    """Get font path from font family name - FIXED for subfolders"""
+    """Get font path from font family name - IMPROVED"""
     font_family_lower = font_family.lower().replace(' ', '_')
     print(f"🔍 Looking for font: {font_family}")
     print(f"📋 Available fonts: {list(FONTS.keys())}")
     
-    # Try exact match
+    # Try exact match with our font keys
     if font_family_lower in FONTS:
         path = FONTS[font_family_lower]["path"]
         print(f"✅ Found exact match: {path}")
-        # Verify file exists
         if os.path.exists(path):
             return path
-        else:
-            print(f"⚠️ File exists in FONTS but not on disk: {path}")
     
-    # If not found, try to find by scanning directories
+    # Try partial matches with font keys
+    for key, font_info in FONTS.items():
+        if font_family_lower in key or font_family_lower in font_info["name"].lower():
+            path = font_info["path"]
+            print(f"✅ Found partial match: {key} -> {path}")
+            return path
+    
+    # Scan directories for font files
     print("🔍 Scanning directories for font files...")
     for root, dirs, files in os.walk(FONTS_DIR):
         for file in files:
@@ -215,13 +219,37 @@ def get_font_path(font_family):
     
     print(f"❌ Font not found: {font_family}")
     return None
-
+    
 # =============================================
 # ASS SUBTITLE METHOD - WORKS FOR CHINESE
 # =============================================
 
+def get_font_family_name(font_path):
+    """Extract font family name from font file using fontTools"""
+    try:
+        from fontTools import ttLib
+        font = ttLib.TTFont(font_path)
+        
+        # Look for family name (nameID 1)
+        for record in font['name'].names:
+            if record.nameID == 1:  # Font Family name
+                try:
+                    if record.platformID == 3 and record.platEncID == 1:  # Windows Unicode
+                        return record.string.decode('utf-16-be')
+                    else:
+                        return record.string.decode('utf-8', errors='ignore')
+                except:
+                    continue
+        
+        # Fallback: use filename without extension
+        return os.path.splitext(os.path.basename(font_path))[0]
+    except Exception as e:
+        print(f"⚠️ Could not extract font family name: {e}")
+        # Fallback to filename
+        return os.path.splitext(os.path.basename(font_path))[0]
+
 def create_text_overlay(input_video, output_video, text_style):
-    """Add text overlay using ASS subtitles - FIXED with full font path"""
+    """Add text overlay using ASS subtitles - FIXED with proper font family name"""
     font_path = get_font_path(text_style.font_family)
     if not font_path:
         print(f"⚠️ Font not found: {text_style.font_family}")
@@ -229,11 +257,15 @@ def create_text_overlay(input_video, output_video, text_style):
     
     print(f"✅ Using font: {font_path}")
     
+    # Get the actual font family name from the font file
+    font_family_name = get_font_family_name(font_path)
+    print(f"📝 Font family name: {font_family_name}")
+    
     # Create working directory for ASS file
     work_dir = os.path.dirname(output_video)
     ass_file = os.path.join(work_dir, "subtitle.ass")
     
-    # Color mapping
+    # Color mapping (same as before)
     color_map = {
         "white": "FFFFFF", "black": "000000", "red": "FF0000",
         "green": "00FF00", "blue": "0000FF", "yellow": "FFFF00",
@@ -263,27 +295,12 @@ def create_text_overlay(input_video, output_video, text_style):
     margin_r = text_style.margin if alignment in [3,6,9] else 0
     margin_v = text_style.margin
     
-    # IMPORTANT: For ASS, we need to use the actual font filename
-    # But FFmpeg needs the font to be accessible via fontconfig
-    # Let's create a fontconfig configuration file
-    
+    # Create fontconfig configuration (optional, but helpful)
     font_dir = os.path.dirname(font_path)
-    font_file = os.path.basename(font_path)
-    font_name = os.path.splitext(font_file)[0]
-    
-    # Create a fontconfig configuration file
     fc_config = f"""<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
     <dir>{font_dir}</dir>
-    <match target="pattern">
-        <test qual="any" name="family">
-            <string>{font_name}</string>
-        </test>
-        <edit name="family" mode="assign" binding="same">
-            <string>{font_name}</string>
-        </edit>
-    </match>
 </fontconfig>"""
     
     fc_file = os.path.join(work_dir, "fonts.conf")
@@ -293,7 +310,7 @@ def create_text_overlay(input_video, output_video, text_style):
     # Set environment variable for fontconfig
     os.environ['FONTCONFIG_FILE'] = fc_file
     
-    # Create ASS file content
+    # Create ASS file content - USE THE ACTUAL FONT FAMILY NAME
     ass_content = f"""[Script Info]
 ; Script generated by Video Styling Space
 ScriptType: v4.00+
@@ -303,7 +320,7 @@ ScaledBorderAndShadow: yes
 
 [V4+ Styles]
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding
-Style: Default,{font_name},{text_style.font_size},&H00{font_color_hex},&H000000FF,&H00000000,&H{bg_alpha:02X}{bg_color_hex},0,0,0,0,100,100,0,0,1,1,0,{alignment},{margin_l},{margin_r},{margin_v},1
+Style: Default,{font_family_name},{text_style.font_size},&H00{font_color_hex},&H000000FF,&H00000000,&H{bg_alpha:02X}{bg_color_hex},0,0,0,0,100,100,0,0,1,1,0,{alignment},{margin_l},{margin_r},{margin_v},1
 
 [Events]
 Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
@@ -313,14 +330,9 @@ Dialogue: 0,0:00:00.00,0:00:10.00,Default,,0,0,0,,{text_style.text}"""
     with open(ass_file, 'w', encoding='utf-8') as f:
         f.write(ass_content)
     
-    print(f"📝 Created ASS subtitle file")
-    print(f"📝 Fontconfig file created at: {fc_file}")
-    
-    # First, test if the font is recognized by fontconfig
-    fc_list = subprocess.run(['fc-list', ':' + font_name], capture_output=True, text=True)
-    print(f"📋 Fontconfig lookup: {fc_list.stdout}")
+    print(f"📝 Created ASS subtitle file with font family: {font_family_name}")
     
-    # Use FFmpeg with the ASS file
+    # Run FFmpeg
     cmd = [
         'ffmpeg', '-y',
         '-i', input_video,
@@ -335,10 +347,8 @@ Dialogue: 0,0:00:00.00,0:00:10.00,Default,,0,0,0,,{text_style.text}"""
     if result.returncode != 0:
         print(f"❌ FFmpeg error: {result.stderr}")
         
-        # Try alternative: use drawtext with direct font path
+        # Try alternative drawtext method as fallback
         print("🔄 Trying alternative drawtext method...")
-        
-        # Position mapping for drawtext
         drawtext_pos = {
             "bottom-left": "x=20:y=h-th-20",
             "bottom-center": "x=(w-tw)/2:y=h-th-20",