fix defaults

init_defaults.py

@@ -22,8 +22,14 @@ defaults = {
         "pop_up_scale": 1.2,
         "highlight_mode": "karaoke",
         "back_box_enabled": True,
-        "display_mode": "word",
-        "max_words_per_line": 3
+        "display_mode": "sentence",
+        "max_words_per_line": 3,
+        "uppercase": False,
+        "letter_spacing": 0.0,
+        "background_opacity": 1.0,
+        "glow_intensity": 0,
+        "rotation_angle": 0.0,
+        "margin_h": 20
     },
     "gaming": {
         "name": "gaming",
@@ -40,8 +46,14 @@ defaults = {
         "pop_up_scale": 1.5,
         "highlight_mode": "karaoke",
         "back_box_enabled": False,
-        "display_mode": "word",
-        "max_words_per_line": 2
+        "display_mode": "sentence",
+        "max_words_per_line": 2,
+        "uppercase": True,
+        "letter_spacing": 1.0,
+        "background_opacity": 0.8,
+        "glow_intensity": 2,
+        "rotation_angle": -3.0,
+        "margin_h": 20
     },
     "professional": {
         "name": "professional",
@@ -59,7 +71,13 @@ defaults = {
         "highlight_mode": "instant",
         "back_box_enabled": True,
         "display_mode": "sentence",
-        "max_words_per_line": 5
+        "max_words_per_line": 5,
+        "uppercase": False,
+        "letter_spacing": 0.5,
+        "background_opacity": 0.9,
+        "glow_intensity": 0,
+        "rotation_angle": 0.0,
+        "margin_h": 40
     },
     "storyteller": {
         "name": "storyteller",
@@ -77,12 +95,25 @@ defaults = {
         "highlight_mode": "karaoke",
         "back_box_enabled": True,
         "display_mode": "sentence",
-        "max_words_per_line": 4
+        "max_words_per_line": 4,
+        "uppercase": True,
+        "letter_spacing": 0.0,
+        "background_opacity": 1.0,
+        "glow_intensity": 1,
+        "rotation_angle": 2.0,
+        "margin_h": 30
     }
 }
 
-for name, data in defaults.items():
-    file_path = os.path.join(PRESETS_DIR, f"{name}.json")
-    with open(file_path, "w", encoding="utf-8") as f:
-        json.dump(data, f, indent=4)
-    print(f"Created default preset: {name}")
+def init_all_defaults():
+    """الدالة التي سنستدعيها عند بدء تشغيل التطبيق"""
+    os.makedirs(PRESETS_DIR, exist_ok=True)
+    for name, data in defaults.items():
+        file_path = os.path.join(PRESETS_DIR, f"{name}.json")
+        # لا نعيد الكتابة إذا كان الملف موجوداً بالفعل إلا إذا أردت تحديثه
+        with open(file_path, "w", encoding="utf-8") as f:
+            json.dump(data, f, indent=4)
+        print(f"✅ Initialized preset: {name}")
+
+if __name__ == "__main__":
+    init_all_defaults()

main.py

@@ -3,8 +3,12 @@ from fastapi.middleware.cors import CORSMiddleware
 import uvicorn
 from datetime import datetime
 from routers import video, files, presets
+from init_defaults import init_all_defaults
 import os
 
+# تهيئة الإعدادات الافتراضية عند بدء التشغيل
+init_all_defaults()
+
 # إعداد المسارات لتكون دائماً داخل مجلد Clipping
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 UPLOAD_BASE_DIR = os.path.join(BASE_DIR, "temp_videos")

routers/presets.py

@@ -33,6 +33,13 @@ async def save_preset(
     back_box_enabled: bool = Form(True),
     display_mode: str = Form("word", description="word or sentence"),
     max_words_per_line: int = Form(3, description="Max words per line in sentence mode"),
+    uppercase: bool = Form(False, description="Convert English text to ALL CAPS"),
+    letter_spacing: float = Form(0.0, description="Spacing between characters"),
+    line_spacing: int = Form(0, description="Vertical spacing between lines"),
+    background_opacity: float = Form(1.0, description="Opacity of background box (0.0 to 1.0)"),
+    glow_intensity: int = Form(0, description="Intensity of glow effect (0 to 10)"),
+    rotation_angle: float = Form(0.0, description="Rotation angle in degrees"),
+    margin_h: int = Form(20, description="Horizontal margin"),
     custom_font_file: Optional[UploadFile] = File(None, description="Optional: Upload a .ttf or .otf font file")
 ):
     """
@@ -71,7 +78,14 @@ async def save_preset(
             "highlight_mode": highlight_mode,
             "back_box_enabled": back_box_enabled,
             "display_mode": display_mode,
-            "max_words_per_line": max_words_per_line
+            "max_words_per_line": max_words_per_line,
+            "uppercase": uppercase,
+            "letter_spacing": letter_spacing,
+            "line_spacing": line_spacing,
+            "background_opacity": background_opacity,
+            "glow_intensity": glow_intensity,
+            "rotation_angle": rotation_angle,
+            "margin_h": margin_h
         }
 
         # 3. حفظ ملف الـ JSON

routers/subtitle_generator.py

@@ -27,6 +27,15 @@ def generate_pro_ass(transcription, preset, output_path):
     secondary = rgb_to_ass(preset.secondary_color)
     outline = rgb_to_ass(preset.outline_color)
     
+    # تحويل الشفافية (0.0 - 1.0) إلى صيغة ASS (00 - FF)
+    # ملاحظة: في ASS، الـ 00 هو معتم تماماً و FF هو شفاف تماماً
+    back_alpha = int((1.0 - getattr(preset, 'background_opacity', 1.0)) * 255)
+    back_color = f"&H{back_alpha:02X}000000" # لون خلفية أسود مع شفافية متغيرة
+    
+    spacing = getattr(preset, 'letter_spacing', 0.0)
+    angle = getattr(preset, 'rotation_angle', 0.0)
+    margin_h = getattr(preset, 'margin_h', 20)
+    
     header = f"""[Script Info]
 ScriptType: v4.00+
 PlayResX: 1080
@@ -35,8 +44,8 @@ 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: Main,{preset.font_name},{preset.font_size},{primary},{secondary},{outline},&H00000000,-1,0,0,0,100,100,0,0,1,3,2,{preset.alignment},10,10,{preset.margin_v},1
-Style: BackBox,{preset.font_name},{preset.font_size},{secondary},{secondary},&H00000000,&H00000000,-1,0,0,0,100,100,0,0,3,10,0,{preset.alignment},10,10,{preset.margin_v},1
+Style: Main,{preset.font_name},{preset.font_size},{primary},{secondary},{outline},&H00000000,-1,0,0,0,100,100,{spacing},{angle},1,{preset.outline_width},{preset.shadow_depth},{preset.alignment},{margin_h},{margin_h},{preset.margin_v},1
+Style: BackBox,{preset.font_name},{preset.font_size},{secondary},{secondary},&H00000000,{back_color},-1,0,0,0,100,100,{spacing},{angle},3,10,0,{preset.alignment},{margin_h},{margin_h},{preset.margin_v},1
 """
     
     events = "\n[Events]\nFormat: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text\n"
@@ -74,52 +83,81 @@ Style: BackBox,{preset.font_name},{preset.font_size},{secondary},{secondary},&H0
         
         if preset.display_mode == "word":
             # الوضع التقليدي: كلمة بكلمة
-            for word_data in sentence.words:
+            for i, word_data in enumerate(sentence.words):
+                word_text = word_data.word.upper() if preset.uppercase else word_data.word
                 start_t = format_ass_time(word_data.start)
                 end_t = format_ass_time(word_data.end)
                 duration = word_data.end - word_data.start
                 
-                t1 = min(50, int(duration * 200))
-                t2 = t1 + 100
+                t1 = min(60, int(duration * 150))
+                t2 = t1 + 80
                 scale = int(preset.pop_up_scale * 100)
-                anim = f"{{\\fscx0\\fscy0\\t(0,{t1},0.3,\\fscx{scale}\\fscy{scale})\\t({t1},{t2},1.5,\\fscx100\\fscy100)}}"
+                
+                # إضافة تأثير التوهج (Blur) إذا كان مفعلاً
+                glow_val = getattr(preset, 'glow_intensity', 0)
+                blur_tag = f"\\be{glow_val}" if glow_val > 0 else ""
+                
+                # انيميشن احترافي مع دوران ديناميكي أو ثابت
+                if angle != 0:
+                    rotation = f"\\frz{angle}"
+                else:
+                    rotation = "\\frz-2" if i % 2 == 0 else "\\frz2"
+                
+                anim = f"{{\\fscx80\\fscy80{rotation}{blur_tag}\\t(0,{t1},0.3,\\fscx{scale}\\fscy{scale})\\t({t1},{t2},1.5,\\fscx100\\fscy100)}}"
                 
                 if preset.back_box_enabled:
-                    events += f"Dialogue: 0,{start_t},{end_t},BackBox,,0,0,0,,{{\\bord5\\1a&H40&}}{anim}{word_data.word}\n"
-                events += f"Dialogue: 1,{start_t},{end_t},Main,,0,0,0,,{anim}{word_data.word}\n"
+                    events += f"Dialogue: 0,{start_t},{end_t},BackBox,,0,0,0,,{{\\bord5\\1a&H40&}}{anim}{word_text}\n"
+                events += f"Dialogue: 1,{start_t},{end_t},Main,,0,0,0,,{anim}{word_text}\n"
         
         else:
             # وضع الجملة: تظهر الجملة كاملة والكلمة النشطة تبرز
-            # 1. طبقة الجملة الأساسية (تظهر طوال مدة الجملة بلون خافت)
-            full_text = sentence.text
-            # جعل النص الأساسي شفاف قليلاً (dimmed) ليبرز الـ Highlight
-            dim_alpha = "\\1a&H80&" 
-            
-            if preset.back_box_enabled:
-                events += f"Dialogue: 0,{s_start},{s_end},BackBox,,0,0,0,,{{{dim_alpha}}}{full_text}\n"
-            else:
-                events += f"Dialogue: 0,{s_start},{s_end},Main,,0,0,0,,{{{dim_alpha}}}{full_text}\n"
+            # قمنا بتعديل المنطق لإخفاء الكلمة الأصلية في الخلفية أثناء ظهور الـ Popup
             
-            # 2. طبقة الكلمات النشطة (Highlight)
             for i, target_word in enumerate(sentence.words):
                 w_start = format_ass_time(target_word.start)
                 w_end = format_ass_time(target_word.end)
                 duration = target_word.end - target_word.start
                 
-                # بناء النص: كلمات ما قبل (مخفية) + كلمة حالية (ملونة ومتحركة) + كلمات ما بعد (مخفية)
-                prefix = " ".join([w.word for w in sentence.words[:i]]) + (" " if i > 0 else "")
-                suffix = (" " if i < len(sentence.words)-1 else "") + " ".join([w.word for w in sentence.words[i+1:]])
+                # 1. طبقة الخلفية (الجملة كاملة مع إخفاء الكلمة النشطة حالياً)
+                words_list_base = [w.word.upper() if preset.uppercase else w.word for w in sentence.words]
+                prefix_base = " ".join(words_list_base[:i]) + (" " if i > 0 else "")
+                suffix_base = (" " if i < len(words_list_base)-1 else "") + " ".join(words_list_base[i+1:])
+                target_word_base = words_list_base[i]
+                
+                # جعل النص الأساسي شفاف قليلاً (dimmed) وإخفاء الكلمة النشطة بـ \alpha&HFF&
+                dim_alpha = "\\1a&H80&"
+                base_display_text = f"{{{dim_alpha}}}{prefix_base}{{\\alpha&HFF&}}{target_word_base}{{\\alpha&H00&}}{{{dim_alpha}}}{suffix_base}"
                 
-                t1 = min(50, int(duration * 200))
-                t2 = t1 + 100
+                if preset.back_box_enabled:
+                    events += f"Dialogue: 0,{w_start},{w_end},BackBox,,0,0,0,,{base_display_text}\n"
+                else:
+                    events += f"Dialogue: 0,{w_start},{w_end},Main,,0,0,0,,{base_display_text}\n"
+
+                # 2. طبقة الكلمات النشطة (Highlight / Popup)
+                prefix_hl = " ".join(words_list_base[:i]) + (" " if i > 0 else "")
+                suffix_hl = (" " if i < len(words_list_base)-1 else "") + " ".join(words_list_base[i+1:])
+                target_word_hl = words_list_base[i]
+                
+                t1 = min(60, int(duration * 150))
+                t2 = t1 + 80
                 scale = int(preset.pop_up_scale * 100)
-                # الـ Highlight يكون بلون الـ secondary وبدون شفافية
-                anim = f"{{\\1c{secondary}\\1a&H00&\\fscx0\\fscy0\\t(0,{t1},0.3,\\fscx{scale}\\fscy{scale})\\t({t1},{t2},1.5,\\fscx100\\fscy100)}}"
+                
+                # إضافة تأثير التوهج (Blur)
+                glow_val = getattr(preset, 'glow_intensity', 0)
+                blur_tag = f"\\be{glow_val}" if glow_val > 0 else ""
+                
+                # الـ Highlight يكون بلون الـ secondary وبدون شفافية مع تأثير Pop وميلان
+                if angle != 0:
+                    rotation = f"\\frz{angle}"
+                else:
+                    rotation = "\\frz-2" if i % 2 == 0 else "\\frz2"
+                
+                anim = f"{{\\1c{secondary}\\1a&H00&\\fscx80\\fscy80{rotation}{blur_tag}\\t(0,{t1},0.3,\\fscx{scale}\\fscy{scale})\\t({t1},{t2},1.5,\\fscx100\\fscy100)}}"
                 
                 # استخدام \alpha&HFF& لإخفاء الكلمات غير النشطة في هذه الطبقة فقط
-                display_text = f"{{\\alpha&HFF&}}{prefix}{anim}{target_word.word}{{\\alpha&HFF&}}{suffix}"
+                display_text_hl = f"{{\\alpha&HFF&}}{prefix_hl}{anim}{target_word_hl}{{\\alpha&HFF&}}{suffix_hl}"
                 
-                events += f"Dialogue: 1,{w_start},{w_end},Main,,0,0,0,,{display_text}\n"
+                events += f"Dialogue: 1,{w_start},{w_end},Main,,0,0,0,,{display_text_hl}\n"
 
     with open(output_path, "w", encoding="utf-8-sig") as f:
         f.write(header + events)

schemas.py

@@ -99,6 +99,13 @@ class SubtitlePreset(BaseModel):
     back_box_enabled: bool = True
     display_mode: str = "word"  # "word" or "sentence"
     max_words_per_line: int = 3
+    uppercase: bool = False
+    letter_spacing: float = 0.0
+    line_spacing: int = 0
+    background_opacity: float = 1.0
+    glow_intensity: int = 0
+    rotation_angle: float = 0.0
+    margin_h: int = 20
 
 class ClipRequest(BaseModel):
     video_url: Optional[str] = None