Update app_enhanced.py

app_enhanced.py

@@ -1,4 +1,4 @@
-import spaces  # <--- CRITICAL: MUST BE THE FIRST IMPORT
+import spaces
 import os
 import time
 import threading
@@ -24,14 +24,12 @@ def gpu_warmup():
     return True
 
 # ======================================================
-# 💾 PERSISTENT STORAGE
+# 💾 STORAGE SETUP
 # ======================================================
 if os.path.exists('/data'):
     BASE_STORAGE_PATH = '/data'
-    print("✅ Using Persistent Storage at /data")
 else:
     BASE_STORAGE_PATH = '.'
-    print("⚠️ Using Ephemeral Storage")
 
 BASE_USER_DIR = os.path.join(BASE_STORAGE_PATH, "userdata")
 SAVED_COMICS_DIR = os.path.join(BASE_STORAGE_PATH, "saved_comics")
@@ -39,11 +37,8 @@ SAVED_COMICS_DIR = os.path.join(BASE_STORAGE_PATH, "saved_comics")
 os.makedirs(BASE_USER_DIR, exist_ok=True)
 os.makedirs(SAVED_COMICS_DIR, exist_ok=True)
 
-# ======================================================
-# 🔧 APP CONFIG
-# ======================================================
 app = Flask(__name__)
-app.config['MAX_CONTENT_LENGTH'] = 500 * 1024 * 1024  # 500MB Upload Limit
+app.config['MAX_CONTENT_LENGTH'] = 500 * 1024 * 1024
 
 def generate_save_code(length=8):
     chars = string.ascii_uppercase + string.digits
@@ -53,39 +48,27 @@ def generate_save_code(length=8):
             return code
 
 # ======================================================
-# 🧱 DATA CLASSES
+# 🧠 DATA & GPU LOGIC
 # ======================================================
-def bubble(dialog="", x=50, y=50, type='speech'):
+def bubble(dialog="", x=50, y=20, type='speech'):
     return {
         'dialog': dialog,
         'bubble_offset_x': int(x),
         'bubble_offset_y': int(y),
         'type': type,
         'tail_pos': '50%',
-        'classes': f'speech-bubble {type} tail-bottom'
+        'colors': {'fill': '#ffffff', 'text': '#000000'},
+        'font': "'Comic Neue', cursive"
     }
 
-def panel(image=""):
-    return {'image': image}
-
-class Page:
-    def __init__(self, panels, bubbles):
-        self.panels = panels
-        self.bubbles = bubbles
-
-# ======================================================
-# 🧠 GPU GENERATION (SQUARE PADDING + TEXT)
-# ======================================================
 @spaces.GPU(duration=300)
 def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_pages):
-    print(f"🚀 Generating Square Comic: {video_path}")
-    
+    print(f"🚀 Generating HD Comic: {video_path}")
     import cv2
     import srt
     import numpy as np
     from backend.subtitles.subs_real import get_real_subtitles
     
-    # 1. Video Setup
     cap = cv2.VideoCapture(video_path)
     if not cap.isOpened(): raise Exception("Cannot open video")
     fps = cap.get(cv2.CAP_PROP_FPS) or 25
@@ -93,30 +76,26 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
     duration = total_frames / fps
     cap.release()
 
-    # 2. SUBTITLES
+    # Subtitles
     user_srt = os.path.join(user_dir, 'subs.srt')
     try:
-        print("🎙️ Extracting subtitles...")
         get_real_subtitles(video_path)
-        if os.path.exists('test1.srt'):
-            shutil.move('test1.srt', user_srt)
-        elif not os.path.exists(user_srt):
-            with open(user_srt, 'w') as f: f.write("1\n00:00:01,000 --> 00:00:04,000\n...\n")
-    except Exception as e:
-        print(f"⚠️ Subtitle error: {e}")
+        if os.path.exists('test1.srt'): shutil.move('test1.srt', user_srt)
+        elif not os.path.exists(user_srt): with open(user_srt, 'w') as f: f.write("1\n00:00:01,000 --> 00:00:04,000\n...\n")
+    except:
         with open(user_srt, 'w') as f: f.write("1\n00:00:01,000 --> 00:00:04,000\n...\n")
             
     with open(user_srt, 'r', encoding='utf-8') as f:
         try: all_subs = list(srt.parse(f.read()))
         except: all_subs = []
 
-    valid_subs = [s for s in all_subs if s.content and s.content.strip()]
+    valid_subs = [s for s in all_subs if s.content.strip()]
     if valid_subs:
         raw_moments = [{'text': s.content.strip(), 'start': s.start.total_seconds(), 'end': s.end.total_seconds()} for s in valid_subs]
     else:
         raw_moments = []
 
-    # 3. Frame Selection (4 per page)
+    # 4 Panels Per Page
     panels_per_page = 4
     total_panels_needed = int(target_pages) * panels_per_page
 
@@ -130,7 +109,6 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
         indices = np.linspace(0, len(raw_moments) - 1, total_panels_needed, dtype=int)
         selected_moments = [raw_moments[i] for i in indices]
         
-    # 4. Extract & PAD TO SQUARE
     frame_metadata = {}
     cap = cv2.VideoCapture(video_path)
     count = 0
@@ -138,53 +116,30 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
 
     for i, moment in enumerate(selected_moments):
         mid = (moment['start'] + moment['end']) / 2
-        if mid > duration: mid = duration - 0.5
         cap.set(cv2.CAP_PROP_POS_MSEC, mid * 1000)
         ret, frame = cap.read()
-        
         if ret:
-            # ----------------------------------------------------
-            # 🎯 SQUARE PADDING LOGIC (0% Cut)
-            # ----------------------------------------------------
-            h, w = frame.shape[:2]
-            # Determine square size based on max dimension
-            sq_dim = max(h, w)
-            
-            # Create black square canvas
-            square_img = np.zeros((sq_dim, sq_dim, 3), dtype=np.uint8)
-            
-            # Calculate centering offsets
-            x_off = (sq_dim - w) // 2
-            y_off = (sq_dim - h) // 2
-            
-            # Place original frame in center
-            square_img[y_off:y_off+h, x_off:x_off+w] = frame
-            
-            # Optionally resize to standard high res (e.g. 1024x1024) to normalize
-            square_img = cv2.resize(square_img, (1024, 1024))
-            
+            # 🎯 EXTRACT FULL HD (1280x720) - NO CROP
+            # Frontend handles Zoom/Fit
+            frame = cv2.resize(frame, (1280, 720))
             fname = f"frame_{count:04d}.png"
             p = os.path.join(frames_dir, fname)
-            cv2.imwrite(p, square_img)
-            
+            cv2.imwrite(p, frame)
             frame_metadata[fname] = {'dialogue': moment['text'], 'time': mid}
             frame_files_ordered.append(fname)
             count += 1
-            
     cap.release()
+    
     with open(metadata_path, 'w') as f: json.dump(frame_metadata, f, indent=2)
         
-    # 5. Bubbles
     bubbles_list = []
     for f in frame_files_ordered:
         dialogue = frame_metadata.get(f, {}).get('dialogue', '')
         b_type = 'speech'
         if '(' in dialogue: b_type = 'narration'
         elif '!' in dialogue: b_type = 'reaction'
-        # Position bubbles somewhat centrally to avoid black bars
-        bubbles_list.append(bubble(dialog=dialogue, x=50, y=20, type=b_type))
+        bubbles_list.append(bubble(dialog=dialogue, x=50, y=30, type=b_type))
             
-    # 6. Pages
     pages = []
     for i in range(int(target_pages)):
         start_idx = i * 4
@@ -194,22 +149,17 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
         
         while len(p_frames) < 4:
              fname = f"empty_{i}_{len(p_frames)}.png"
-             img = np.zeros((1024, 1024, 3), dtype=np.uint8); img[:] = (30,30,30)
+             img = np.zeros((720, 1280, 3), dtype=np.uint8); img[:] = (30,30,30)
              cv2.imwrite(os.path.join(frames_dir, fname), img)
              p_frames.append(fname)
              p_bubbles.append(bubble(dialog="", type='speech'))
 
         if p_frames:
-            pg_panels = [panel(image=f) for f in p_frames]
-            pages.append(Page(panels=pg_panels, bubbles=p_bubbles))
-
-    result = []
-    for pg in pages:
-        p_data = [p if isinstance(p, dict) else p.__dict__ for p in pg.panels]
-        b_data = [b if isinstance(b, dict) else b.__dict__ for b in pg.bubbles]
-        result.append({'panels': p_data, 'bubbles': b_data})
-        
-    return result
+            # Create Page Object
+            pg_panels = [{'image': f} for f in p_frames]
+            pages.append({'panels': pg_panels, 'bubbles': p_bubbles})
+
+    return pages
 
 @spaces.GPU
 def regen_frame_gpu(video_path, frames_dir, metadata_path, fname, direction):
@@ -217,8 +167,7 @@ def regen_frame_gpu(video_path, frames_dir, metadata_path, fname, direction):
     import json
     if not os.path.exists(metadata_path): return {"success": False, "message": "No metadata"}
     with open(metadata_path, 'r') as f: meta = json.load(f)
-    if fname not in meta: return {"success": False, "message": "Frame not found"}
-
+    
     t = meta[fname]['time'] if isinstance(meta[fname], dict) else meta[fname]
     cap = cv2.VideoCapture(video_path)
     fps = cap.get(cv2.CAP_PROP_FPS) or 25
@@ -230,52 +179,13 @@ def regen_frame_gpu(video_path, frames_dir, metadata_path, fname, direction):
     cap.release()
 
     if ret:
-        # Re-apply Square Padding logic
-        h, w = frame.shape[:2]
-        sq_dim = max(h, w)
-        square_img = np.zeros((sq_dim, sq_dim, 3), dtype=np.uint8)
-        x_off = (sq_dim - w) // 2
-        y_off = (sq_dim - h) // 2
-        square_img[y_off:y_off+h, x_off:x_off+w] = frame
-        square_img = cv2.resize(square_img, (1024, 1024))
-        
-        p = os.path.join(frames_dir, fname)
-        cv2.imwrite(p, square_img)
-        
+        frame = cv2.resize(frame, (1280, 720))
+        cv2.imwrite(os.path.join(frames_dir, fname), frame)
         if isinstance(meta[fname], dict): meta[fname]['time'] = new_t
         else: meta[fname] = new_t
         with open(metadata_path, 'w') as f: json.dump(meta, f, indent=2)
         return {"success": True, "message": f"Time: {new_t:.2f}s"}
-    return {"success": False, "message": "End of video"}
-
-@spaces.GPU
-def get_frame_at_ts_gpu(video_path, frames_dir, metadata_path, fname, ts):
-    import cv2
-    import json
-    cap = cv2.VideoCapture(video_path)
-    cap.set(cv2.CAP_PROP_POS_MSEC, float(ts) * 1000)
-    ret, frame = cap.read()
-    cap.release()
-
-    if ret:
-        h, w = frame.shape[:2]
-        sq_dim = max(h, w)
-        square_img = np.zeros((sq_dim, sq_dim, 3), dtype=np.uint8)
-        x_off = (sq_dim - w) // 2
-        y_off = (sq_dim - h) // 2
-        square_img[y_off:y_off+h, x_off:x_off+w] = frame
-        square_img = cv2.resize(square_img, (1024, 1024))
-        
-        p = os.path.join(frames_dir, fname)
-        cv2.imwrite(p, square_img)
-        if os.path.exists(metadata_path):
-            with open(metadata_path, 'r') as f: meta = json.load(f)
-            if fname in meta:
-                if isinstance(meta[fname], dict): meta[fname]['time'] = float(ts)
-                else: meta[fname] = float(ts)
-                with open(metadata_path, 'w') as f: json.dump(meta, f, indent=2)
-        return {"success": True, "message": f"Jumped to {ts}s"}
-    return {"success": False, "message": "Invalid timestamp"}
+    return {"success": False}
 
 # ======================================================
 # 💻 BACKEND CLASS
@@ -299,7 +209,7 @@ class EnhancedComicGenerator:
 
     def run(self, target_pages):
         try:
-            self.write_status("Generating...", 5)
+            self.write_status("Generating...", 10)
             data = generate_comic_gpu(self.video_path, self.user_dir, self.frames_dir, self.metadata_path, int(target_pages))
             with open(os.path.join(self.output_dir, 'pages.json'), 'w') as f:
                 json.dump(data, f, indent=2)
@@ -313,81 +223,60 @@ class EnhancedComicGenerator:
             json.dump({'message': msg, 'progress': prog}, f)
 
 # ======================================================
-# 🌐 ROUTES & FRONTEND
+# 🌐 FRONTEND
 # ======================================================
 INDEX_HTML = '''
-<!DOCTYPE html><html lang="en"> <head> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <title>Square HD Comic</title> <script src="https://cdnjs.cloudflare.com/ajax/libs/html-to-image/1.11.11/html-to-image.min.js"></script> <link href="https://fonts.googleapis.com/css2?family=Bangers&family=Comic+Neue:wght@700&display=swap" rel="stylesheet"> <style> * { box-sizing: border-box; } body { background-color: #222; font-family: 'Comic Neue', sans-serif; color: #eee; margin: 0; min-height: 100vh; }
+<!DOCTYPE html><html lang="en"> <head> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <title>Ultimate Square Comic</title> <script src="https://cdnjs.cloudflare.com/ajax/libs/html-to-image/1.11.11/html-to-image.min.js"></script> <link href="https://fonts.googleapis.com/css2?family=Bangers&family=Comic+Neue:wght@700&family=Gloria+Hallelujah&family=Lato&display=swap" rel="stylesheet"> <style> * { box-sizing: border-box; } body { background-color: #2c3e50; font-family: 'Lato', sans-serif; color: #eee; margin: 0; min-height: 100vh; }
     
     #upload-container { display: flex; flex-direction:column; justify-content: center; align-items: center; min-height: 100vh; width: 100%; padding: 20px; }
-    .upload-box { max-width: 500px; width: 100%; padding: 40px; background: #333; border-radius: 12px; box-shadow: 0 8px 30px rgba(0,0,0,0.5); text-align: center; }
+    .upload-box { max-width: 500px; width: 100%; padding: 40px; background: #34495e; border-radius: 12px; box-shadow: 0 10px 30px rgba(0,0,0,0.5); text-align: center; }
     
     #editor-container { display: none; padding: 20px; width: 100%; box-sizing: border-box; padding-bottom: 150px; }
     
-    h1 { color: #fff; margin-bottom: 20px; font-weight: 600; }
+    h1 { color: #fff; margin-bottom: 20px; }
     .file-input { display: none; }
-    .file-label { display: block; padding: 15px; background: #e74c3c; color: white; border-radius: 8px; cursor: pointer; font-weight: bold; margin-bottom: 10px; transition:0.2s; }
-    .file-label:hover { background: #c0392b; }
+    .file-label { display: block; padding: 15px; background: #e67e22; color: white; border-radius: 8px; cursor: pointer; font-weight: bold; margin-bottom: 10px; transition:0.2s; }
+    .file-label:hover { background: #d35400; }
     
     .page-input-group { margin: 20px 0; text-align: left; }
     .page-input-group label { font-weight: bold; font-size: 14px; display: block; margin-bottom: 5px; color: #ccc; }
-    .page-input-group input { width: 100%; padding: 12px; border: 2px solid #555; background: #222; color: white; border-radius: 8px; font-size: 16px; box-sizing: border-box; }
+    .page-input-group input { width: 100%; padding: 12px; border: 2px solid #555; background: #2c3e50; color: white; border-radius: 8px; }
     
-    .submit-btn { width: 100%; padding: 15px; background: #3498db; color: white; border: none; border-radius: 8px; font-size: 18px; font-weight: bold; cursor: pointer; transition: 0.2s; }
-    .submit-btn:hover { background: #2980b9; }
+    .submit-btn { width: 100%; padding: 15px; background: #2980b9; color: white; border: none; border-radius: 8px; font-size: 18px; font-weight: bold; cursor: pointer; }
+    .loader { width: 100px; height: 10px; background: #e67e22; margin: 20px auto; animation: load 1s infinite alternate; }
+    @keyframes load { from { width: 20px; } to { width: 100px; } }
     
-    .loader { width: 120px; height: 20px; background: radial-gradient(circle 10px, #e67e22 100%, transparent 0); background-size: 20px 20px; animation: ball 1s infinite linear; margin: 20px auto; }
-    @keyframes ball { 0%{background-position:0 50%} 100%{background-position:100px 50%} }
-    
-    /* === SQUARE COMIC LAYOUT (800x800) === */
+    /* === SQUARE LAYOUT === */
     .comic-wrapper { max-width: 1000px; margin: 0 auto; display: flex; flex-direction: column; align-items: center; gap: 40px; }
     .page-wrapper { display: flex; flex-direction: column; align-items: center; }
     .page-title { text-align: center; color: #eee; margin-bottom: 10px; font-size: 20px; font-weight: bold; }
     
     .comic-page { 
-        width: 800px; 
-        height: 800px; 
+        width: 800px; height: 800px; 
         background: white; 
-        box-shadow: 0 4px 30px rgba(0,0,0,0.5); 
-        position: relative; 
-        overflow: hidden; 
+        box-shadow: 0 5px 30px rgba(0,0,0,0.6); 
+        position: relative; overflow: hidden; 
         border: 6px solid #000; 
     }
     
-    /* === GRID CSS === */
     .comic-grid {
-        width: 100%; height: 100%;
-        position: relative;
-        background: #000;
-        
-        /* Grid Variables */
-        --y: 50%;      
-        --t1: 100%; --t2: 100%; /* Hidden Right by default */
-        --b1: 100%; --b2: 100%; /* Hidden Right by default */
-        --gap: 3px; 
+        width: 100%; height: 100%; position: relative; background: #000;
+        --y: 50%; --t1: 100%; --t2: 100%; --b1: 100%; --b2: 100%; --gap: 3px; 
     }
 
     .panel { position: absolute; top: 0; left: 0; width: 100%; height: 100%; overflow: hidden; background: #1a1a1a; cursor: grab; }
-    
-    /* IMAGE: Cover ensures it fills. Zoom allows control. */
-    .panel img { 
-        width: 100%; height: 100%; 
-        object-fit: cover; 
-        transform-origin: center; 
-        transition: transform 0.05s ease-out; 
-        display: block; 
-    }
+    .panel img { width: 100%; height: 100%; object-fit: cover; transform-origin: center; transition: transform 0.05s ease-out; display: block; }
     .panel img.panning { cursor: grabbing; transition: none; }
-    .panel.selected { outline: 4px solid #2196F3; z-index: 5; }
+    .panel.selected { outline: 4px solid #3498db; z-index: 5; }
 
-    /* === CLIP PATHS === */
+    /* Clip Paths */
     .panel:nth-child(1) { clip-path: polygon(0 0, calc(var(--t1) - var(--gap)) 0, calc(var(--t2) - var(--gap)) calc(var(--y) - var(--gap)), 0 calc(var(--y) - var(--gap))); z-index: 1; }
     .panel:nth-child(2) { clip-path: polygon(calc(var(--t1) + var(--gap)) 0, 100% 0, 100% calc(var(--y) - var(--gap)), calc(var(--t2) + var(--gap)) calc(var(--y) - var(--gap))); z-index: 1; }
     .panel:nth-child(3) { clip-path: polygon(0 calc(var(--y) + var(--gap)), calc(var(--b1) - var(--gap)) calc(var(--y) + var(--gap)), calc(var(--b2) - var(--gap)) 100%, 0 100%); z-index: 1; }
     .panel:nth-child(4) { clip-path: polygon(calc(var(--b1) + var(--gap)) calc(var(--y) + var(--gap)), 100% calc(var(--y) + var(--gap)), 100% 100%, calc(var(--b2) + var(--gap)) 100%); z-index: 1; }
 
-    /* === HANDLES === */
+    /* Handles */
     .handle { position: absolute; width: 26px; height: 26px; border: 3px solid white; border-radius: 50%; transform: translate(-50%, -50%); z-index: 101; cursor: ew-resize; box-shadow: 0 2px 5px rgba(0,0,0,0.8); }
-    .handle:hover { transform: translate(-50%, -50%) scale(1.3); }
     .h-t1 { background: #3498db; left: var(--t1); top: 0%; margin-top: 15px; }
     .h-t2 { background: #3498db; left: var(--t2); top: 50%; margin-top: -15px; }
     .h-b1 { background: #2ecc71; left: var(--b1); top: 50%; margin-top: 15px; }
@@ -396,15 +285,24 @@ INDEX_HTML = '''
     /* SPEECH BUBBLES */
     .speech-bubble { 
         position: absolute; display: flex; justify-content: center; align-items: center; 
-        width: 200px; height: 100px; min-width: 50px; min-height: 30px; box-sizing: border-box; 
-        z-index: 10; cursor: move; font-family: 'Comic Neue', cursive; font-weight: bold; 
-        font-size: 16px; text-align: center; 
+        min-width: 60px; min-height: 40px; box-sizing: border-box; 
+        z-index: 10; cursor: move; font-weight: bold; text-align: center; 
         overflow: visible; line-height: 1.2; --tail-pos: 50%;
     }
     .bubble-text { padding: 0.8em; width: 100%; height: 100%; display: flex; align-items: center; justify-content: center; overflow: hidden; white-space: pre-wrap; pointer-events: none; border-radius: inherit; }
     .speech-bubble.selected { outline: 2px dashed #4CAF50; z-index: 100; }
-    .speech-bubble.speech { background: var(--bubble-fill, #fff); color: var(--bubble-text, #000); border: 3px solid #000; border-radius: 50%; }
+    
+    /* Bubble Styles */
+    .speech-bubble.speech { background: var(--bubble-fill, #fff); color: var(--bubble-text, #000); border: 2px solid #000; border-radius: 50%; width: 180px; height: 100px; }
     .speech-bubble.speech::after { content: ''; position: absolute; bottom: -12px; left: var(--tail-pos); border: 12px solid transparent; border-top-color: #000; border-bottom: 0; margin-left: -12px; }
+    
+    .speech-bubble.thought { background: var(--bubble-fill, #fff); color: var(--bubble-text, #000); border: 2px dashed #555; border-radius: 50%; width: 180px; height: 100px; }
+    .speech-bubble.thought .dots { position: absolute; bottom:-20px; left:20px; width:15px; height:15px; background:#fff; border:2px solid #555; border-radius:50%; }
+    
+    .speech-bubble.reaction { background: #ff0; border: 3px solid red; color: red; font-family: 'Bangers'; text-transform: uppercase; width: 200px; height: 120px; clip-path: polygon(0% 25%, 17% 21%, 17% 0%, 31% 16%, 50% 4%, 69% 16%, 83% 0%, 83% 21%, 100% 25%, 85% 45%, 95% 62%, 82% 79%, 100% 97%, 79% 89%, 60% 98%, 46% 82%, 27% 95%, 15% 78%, 5% 62%, 15% 45%); }
+    
+    .speech-bubble.narration { background: #eee; border: 2px solid #000; color: #000; border-radius: 0; width: 300px; height: 60px; font-family: 'Lato'; bottom: 10px; left: 50%; transform: translateX(-50%); }
+    
     .resize-handle { position: absolute; bottom:-5px; right:-5px; width:15px; height:15px; background:#3498db; border:1px solid white; cursor:se-resize; display:none; }
     .speech-bubble.selected .resize-handle { display:block; }
 
@@ -416,10 +314,9 @@ INDEX_HTML = '''
     button, input, select { width: 100%; margin-top: 5px; padding: 8px; border-radius: 4px; border: 1px solid #ddd; cursor: pointer; font-weight: bold; font-size: 13px; }
     .button-grid { display: grid; grid-template-columns: 1fr 1fr; gap: 5px; }
     .color-grid { display: grid; grid-template-columns: 1fr 1fr; gap: 5px; }
-    .action-btn { background: #4CAF50; color: white; }
-    .reset-btn { background: #e74c3c; color: white; }
-    .secondary-btn { background: #f39c12; color: white; }
-    .save-btn { background: #9b59b6; color: white; }
+    .action-btn { background: #27ae60; color: white; }
+    .reset-btn { background: #c0392b; color: white; }
+    .save-btn { background: #8e44ad; color: white; }
     
     .tip { text-align:center; padding:10px; background:#e74c3c; color:white; font-weight:bold; margin-bottom:20px; border-radius:5px; }
     .modal-overlay { position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(0,0,0,0.8); display: none; justify-content: center; align-items: center; z-index: 2000; }
@@ -430,7 +327,7 @@ INDEX_HTML = '''
 
 <div id="upload-container"> 
     <div class="upload-box"> 
-        <h1>⚡ Square HD Comic Gen</h1> 
+        <h1>⚡ Ultimate Square Comic</h1> 
         <input type="file" id="file-upload" class="file-input" onchange="document.getElementById('fn').innerText=this.files[0].name"> 
         <label for="file-upload" class="file-label">📁 Choose Video</label> 
         <span id="fn" style="margin-bottom:10px; display:block; color:#aaa;">No file selected</span>
@@ -441,21 +338,23 @@ INDEX_HTML = '''
         </div>
         
         <button class="submit-btn" onclick="upload()">🚀 Generate</button>
-        <button id="restore-draft-btn" class="reset-btn" style="display:none; margin-top:10px; background:#27ae60;" onclick="restoreDraft()">📂 Restore Draft</button>
+        <button id="restore-draft-btn" class="reset-btn" style="display:none; margin-top:10px;" onclick="restoreDraft()">📂 Restore Draft</button>
         
         <div style="margin-top:20px; border-top:1px solid #555; padding-top:10px;">
             <input type="text" id="load-code" placeholder="ENTER SAVE CODE" style="width:70%; display:inline-block;">
             <button onclick="loadComic()" style="width:25%; display:inline-block; background:#9b59b6; color:white;">Load</button>
         </div>
         <div class="loading-view" id="loading-view" style="display:none; margin-top:20px;">
-            <div class="loader" style="margin:0 auto;"></div>
-            <p id="status-text" style="margin-top:10px;">Starting...</p>
+            <div class="loader"></div>
+            <p id="status-text" style="margin-top:10px;">Analyzing Video...</p>
         </div>
     </div>
 </div>
+
 <div id="editor-container">
-    <div class="tip">👉 Drag Blue/Green dots from the RIGHT edge to reveal hidden square panels!</div>
+    <div class="tip">👉 Drag Right-Side Dots to reveal 4 panels! | 📜 Scroll to Zoom/Pan</div>
     <div class="comic-wrapper" id="comic-container"></div>
+    <input type="file" id="image-uploader" style="display: none;" accept="image/*">
     
     <div class="edit-controls">
         <h4>✏️ Editor</h4>
@@ -464,19 +363,35 @@ INDEX_HTML = '''
             <button onclick="undo()" style="background:#7f8c8d; color:white;">↩️ Undo</button>
             <button onclick="saveComic()" class="save-btn">💾 Save Comic</button>
         </div>
+
         <div class="control-group">
-            <label>💬 Bubbles:</label>
+            <label>💬 Bubble Styling:</label>
+            <select id="bubble-type" onchange="updateBubbleType()">
+                <option value="speech">Speech 💬</option>
+                <option value="thought">Thought 💭</option>
+                <option value="reaction">Reaction 💥</option>
+                <option value="narration">Narration ⬜</option>
+            </select>
+            <select id="font-select" onchange="updateFont()">
+                <option value="'Comic Neue', cursive">Comic Neue</option>
+                <option value="'Bangers', cursive">Bangers</option>
+                <option value="'Gloria Hallelujah', cursive">Handwritten</option>
+                <option value="'Lato', sans-serif">Modern</option>
+            </select>
+            <div class="color-grid">
+                <input type="color" id="bub-fill" value="#ffffff" onchange="updateColors()" title="Fill">
+                <input type="color" id="bub-text" value="#000000" onchange="updateColors()" title="Text">
+            </div>
             <div class="button-grid">
-                <button onclick="addBubble()" class="action-btn">Add Text</button>
+                <button onclick="addBubble()" class="action-btn">Add</button>
                 <button onclick="deleteBubble()" class="reset-btn">Delete</button>
             </div>
-            <div class="color-grid">
-                <input type="color" id="bub-fill" value="#ffffff" onchange="updateBubbleColor()">
-                <input type="color" id="bub-text" value="#000000" onchange="updateBubbleColor()">
-            </div>
+            <input type="range" min="10" max="90" value="50" oninput="slideTail(this.value)" title="Tail Pos">
         </div>
+
         <div class="control-group">
             <label>🖼️ Image Control:</label>
+            <button onclick="replaceImage()" class="action-btn">Replace Image</button>
             <div class="button-grid">
                 <button onclick="adjustFrame('backward')" class="secondary-btn">⬅️ Frame</button>
                 <button onclick="adjustFrame('forward')" class="action-btn">Frame ➡️</button>
@@ -484,8 +399,7 @@ INDEX_HTML = '''
         </div>
         
         <div class="control-group">
-            <label>🔍 Zoom (Mouse Wheel):</label>
-            <!-- Min zoom 20 allowed to zoom OUT to see whole square image -->
+            <label>🔍 Zoom (Scroll Wheel):</label>
             <input type="range" id="zoom-slider" min="20" max="300" value="100" step="5" oninput="handleZoom(this.value)" disabled>
             <button onclick="resetPanelTransform()" class="secondary-btn">Reset View</button>
         </div>
@@ -496,6 +410,7 @@ INDEX_HTML = '''
         </div>
     </div>
 </div>
+
 <div class="modal-overlay" id="save-modal">
     <div class="modal-content">
         <h2>✅ Comic Saved!</h2>
@@ -503,6 +418,7 @@ INDEX_HTML = '''
         <button onclick="closeModal()">Close</button>
     </div>
 </div>
+
 <script>
     function genUUID(){ return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g,c=>{var r=Math.random()*16|0,v=c=='x'?r:(r&0x3|0x8);return v.toString(16);}); }
     let sid = localStorage.getItem('comic_sid') || genUUID();
@@ -521,13 +437,17 @@ INDEX_HTML = '''
                 bubbles.push({
                     text: b.querySelector('.bubble-text').textContent,
                     left: b.style.left, top: b.style.top, width: b.style.width, height: b.style.height,
-                    colors: { fill: b.style.getPropertyValue('--bubble-fill'), text: b.style.getPropertyValue('--bubble-text') }
+                    type: b.dataset.type, font: b.style.fontFamily,
+                    colors: { fill: b.style.getPropertyValue('--bubble-fill'), text: b.style.getPropertyValue('--bubble-text') },
+                    tailPos: b.style.getPropertyValue('--tail-pos')
                 });
             });
             const panels = [];
             grid.querySelectorAll('.panel').forEach(pan => {
                 const img = pan.querySelector('img');
-                panels.push({ zoom: img.dataset.zoom, tx: img.dataset.translateX, ty: img.dataset.translateY });
+                const srcParts = img.src.split('frames/');
+                const fname = srcParts.length > 1 ? srcParts[1].split('?')[0] : '';
+                panels.push({ image: fname, zoom: img.dataset.zoom, tx: img.dataset.translateX, ty: img.dataset.translateY });
             });
             state.push({ layout, bubbles, panels });
         });
@@ -561,6 +481,7 @@ INDEX_HTML = '''
                 if(pi < panels.length) {
                     const img = panels[pi].querySelector('img');
                     img.dataset.zoom = pData.zoom; img.dataset.translateX = pData.tx; img.dataset.translateY = pData.ty;
+                    if(pData.image) img.src = `/frames/${pData.image}?sid=${sid}`;
                     updateImageTransform(img);
                 }
             });
@@ -575,6 +496,7 @@ INDEX_HTML = '''
             setTimeout(() => restoreFromState(JSON.parse(localStorage.getItem('comic_draft_'+sid))), 500);
         });
     }
+
     async function upload() {
         const f = document.getElementById('file-upload').files[0];
         const pCount = document.getElementById('page-count').value;
@@ -601,11 +523,15 @@ INDEX_HTML = '''
         const data = await r.json();
         const cleanData = data.map(p => ({
             panels: p.panels.map(pan => ({ src: `/frames/${pan.image}?sid=${sid}` })),
-            bubbles: p.bubbles.map(b => ({ text: b.dialog, left: (b.bubble_offset_x||50)+'px', top: (b.bubble_offset_y||20)+'px' }))
+            bubbles: p.bubbles.map(b => ({
+                text: b.dialog, left: (b.bubble_offset_x||50)+'px', top: (b.bubble_offset_y||20)+'px', type: b.type,
+                colors: b.colors, font: b.font
+            }))
         }));
         renderFromState(cleanData);
         saveState();
     }
+
     function renderFromState(pagesData) {
         const con = document.getElementById('comic-container'); con.innerHTML = '';
         pagesData.forEach((page, pageIdx) => {
@@ -621,12 +547,12 @@ INDEX_HTML = '''
                 img.dataset.zoom = 100; img.dataset.translateX = 0; img.dataset.translateY = 0;
                 img.onmousedown = (e) => { e.preventDefault(); e.stopPropagation(); selectPanel(pDiv); dragType = 'pan'; activeObj = img; dragStart = {x:e.clientX, y:e.clientY}; img.classList.add('panning'); };
                 
-                // 🚀 ZOOM WHEEL LOGIC (Min zoom 20%)
+                // 🚀 ZOOM: Allows zooming out to 20% to fit 16:9 images in squares
                 img.onwheel = (e) => { 
                     e.preventDefault(); 
                     let zoom = parseFloat(img.dataset.zoom); 
                     zoom += e.deltaY * -0.1; 
-                    zoom = Math.min(Math.max(20, zoom), 300); // Allow zoom out to 20%
+                    zoom = Math.min(Math.max(20, zoom), 300); 
                     img.dataset.zoom = zoom; 
                     updateImageTransform(img); 
                     if(selectedPanel === pDiv) document.getElementById('zoom-slider').value = zoom; 
@@ -650,11 +576,16 @@ INDEX_HTML = '''
     
     function createBubbleHTML(data) {
         const b = document.createElement('div');
-        b.className = `speech-bubble speech`;
+        const type = data.type || 'speech';
+        b.className = `speech-bubble ${type}`;
+        b.dataset.type = type;
         b.style.left = data.left; b.style.top = data.top;
         if(data.width) b.style.width = data.width;
         if(data.height) b.style.height = data.height;
+        if(data.font) b.style.fontFamily = data.font;
         if(data.colors) { b.style.setProperty('--bubble-fill', data.colors.fill); b.style.setProperty('--bubble-text', data.colors.text); }
+        if(data.tailPos) b.style.setProperty('--tail-pos', data.tailPos);
+        if(type === 'thought') { const dots=document.createElement('div'); dots.className='dots'; b.appendChild(dots); }
         
         const textSpan = document.createElement('span'); textSpan.className = 'bubble-text'; textSpan.textContent = data.text || 'Text'; b.appendChild(textSpan);
         const resizer = document.createElement('div'); resizer.className = 'resize-handle'; 
@@ -672,6 +603,7 @@ INDEX_HTML = '''
         if(newText !== null) { textSpan.textContent = newText; saveState(); }
     }
     
+    // --- GLOBAL MOUSE EVENTS ---
     document.addEventListener('mousemove', (e) => {
         if(!dragType) return;
         if(dragType === 'handle') {
@@ -701,25 +633,65 @@ INDEX_HTML = '''
         dragType = null; activeObj = null; 
     });
     
-    function selectBubble(el) { if(selectedBubble) selectedBubble.classList.remove('selected'); selectedBubble = el; el.classList.add('selected'); }
+    // --- UI ACTIONS ---
+    function selectBubble(el) { 
+        if(selectedBubble) selectedBubble.classList.remove('selected'); 
+        selectedBubble = el; el.classList.add('selected'); 
+        document.getElementById('bubble-type').value = el.dataset.type;
+        document.getElementById('font-select').value = el.style.fontFamily || "'Comic Neue', cursive";
+    }
     function selectPanel(el) { 
         if(selectedPanel) selectedPanel.classList.remove('selected'); 
         selectedPanel = el; el.classList.add('selected');
         document.getElementById('zoom-slider').disabled = false;
         document.getElementById('zoom-slider').value = el.querySelector('img').dataset.zoom;
     }
+    function addBubble() { const grid = document.querySelector('.comic-grid'); if(grid) { const b = createBubbleHTML({ text: "Text", left: "50%", top: "50%" }); grid.appendChild(b); selectBubble(b); saveState(); } }
+    function deleteBubble() { if(selectedBubble) { selectedBubble.remove(); selectedBubble=null; saveState(); } }
     
-    function addBubble() { 
-        const grid = document.querySelector('.comic-grid'); 
-        if(grid) { const b = createBubbleHTML({ text: "Text", left: "50%", top: "50%" }); grid.appendChild(b); selectBubble(b); saveState(); }
+    function updateBubbleType() {
+        if(!selectedBubble) return;
+        const type = document.getElementById('bubble-type').value;
+        const oldB = selectedBubble;
+        const data = {
+            text: oldB.querySelector('.bubble-text').textContent,
+            left: oldB.style.left, top: oldB.style.top, width: oldB.style.width, height: oldB.style.height,
+            type: type, font: oldB.style.fontFamily,
+            colors: { fill: oldB.style.getPropertyValue('--bubble-fill'), text: oldB.style.getPropertyValue('--bubble-text') },
+            tailPos: oldB.style.getPropertyValue('--tail-pos')
+        };
+        const newB = createBubbleHTML(data);
+        oldB.parentElement.replaceChild(newB, oldB);
+        selectBubble(newB); saveState();
     }
-    function deleteBubble() { if(selectedBubble) { selectedBubble.remove(); selectedBubble=null; saveState(); } }
-    function updateBubbleColor() { if(selectedBubble) { selectedBubble.style.setProperty('--bubble-fill', document.getElementById('bub-fill').value); selectedBubble.style.setProperty('--bubble-text', document.getElementById('bub-text').value); saveState(); } }
+    
+    function updateColors() {
+        if(!selectedBubble) return;
+        selectedBubble.style.setProperty('--bubble-fill', document.getElementById('bub-fill').value);
+        selectedBubble.style.setProperty('--bubble-text', document.getElementById('bub-text').value);
+        saveState();
+    }
+    
+    function updateFont() { if(selectedBubble) { selectedBubble.style.fontFamily = document.getElementById('font-select').value; saveState(); } }
+    function slideTail(val) { if(selectedBubble) { selectedBubble.style.setProperty('--tail-pos', val+'%'); saveState(); } }
     
     function handleZoom(val) { if(selectedPanel) { const img = selectedPanel.querySelector('img'); img.dataset.zoom = val; updateImageTransform(img); saveState(); } }
     function updateImageTransform(img) { const z = (img.dataset.zoom||100)/100, x = img.dataset.translateX||0, y = img.dataset.translateY||0; img.style.transform = `translateX(${x}px) translateY(${y}px) scale(${z})`; }
     function resetPanelTransform() { if(selectedPanel) { const img = selectedPanel.querySelector('img'); img.dataset.zoom=100; img.dataset.translateX=0; img.dataset.translateY=0; updateImageTransform(img); document.getElementById('zoom-slider').value=100; saveState(); } }
     
+    function replaceImage() {
+        if(!selectedPanel) return alert("Select a panel");
+        const inp = document.getElementById('image-uploader');
+        inp.onchange = async (e) => {
+            const fd = new FormData(); fd.append('image', e.target.files[0]);
+            const r = await fetch(`/replace_panel?sid=${sid}`, {method:'POST', body:fd});
+            const d = await r.json();
+            if(d.success) { selectedPanel.querySelector('img').src = `/frames/${d.new_filename}?sid=${sid}`; saveState(); }
+            inp.value = '';
+        };
+        inp.click();
+    }
+    
     async function adjustFrame(dir) {
         if(!selectedPanel) return alert("Click a panel first");
         const img = selectedPanel.querySelector('img'); let fname = img.src.split('/').pop().split('?')[0]; 
@@ -759,7 +731,7 @@ INDEX_HTML = '''
             const layout = { t1: grid.style.getPropertyValue('--t1')||'100%', t2: grid.style.getPropertyValue('--t2')||'100%', b1: grid.style.getPropertyValue('--b1')||'100%', b2: grid.style.getPropertyValue('--b2')||'100%' };
             const bubbles = [];
             grid.querySelectorAll('.speech-bubble').forEach(b => {
-                bubbles.push({ text: b.querySelector('.bubble-text').textContent, left: b.style.left, top: b.style.top, width: b.style.width, height: b.style.height, colors: { fill: b.style.getPropertyValue('--bubble-fill'), text: b.style.getPropertyValue('--bubble-text') } });
+                bubbles.push({ text: b.querySelector('.bubble-text').textContent, left: b.style.left, top: b.style.top, width: b.style.width, height: b.style.height, type: b.dataset.type, colors: { fill: b.style.getPropertyValue('--bubble-fill'), text: b.style.getPropertyValue('--bubble-text') }, tailPos: b.style.getPropertyValue('--tail-pos') });
             });
             const panels = [];
             grid.querySelectorAll('.panel').forEach(pan => {
@@ -785,8 +757,7 @@ def upload():
     if not sid: return jsonify({'success': False, 'message': 'Missing session ID'}), 400
     
     file = request.files.get('file')
-    if not file or file.filename == '':
-         return jsonify({'success': False, 'message': 'No file uploaded'}), 400
+    if not file or file.filename == '': return jsonify({'success': False, 'message': 'No file uploaded'}), 400
     
     target_pages = request.form.get('target_pages', 4)
     gen = EnhancedComicGenerator(sid)
@@ -821,6 +792,23 @@ def regen():
     gen = EnhancedComicGenerator(sid)
     return jsonify(regen_frame_gpu(gen.video_path, gen.frames_dir, gen.metadata_path, d['filename'], d['direction']))
 
+@app.route('/goto_timestamp', methods=['POST'])
+def go_time():
+    sid = request.args.get('sid')
+    d = request.get_json()
+    gen = EnhancedComicGenerator(sid)
+    return jsonify(get_frame_at_ts_gpu(gen.video_path, gen.frames_dir, gen.metadata_path, d['filename'], float(d['timestamp'])))
+
+@app.route('/replace_panel', methods=['POST'])
+def rep_panel():
+    sid = request.args.get('sid')
+    f = request.files['image']
+    frames_dir = os.path.join(BASE_USER_DIR, sid, 'frames')
+    os.makedirs(frames_dir, exist_ok=True)
+    fname = f"replaced_{int(time.time() * 1000)}.png"
+    f.save(os.path.join(frames_dir, fname))
+    return jsonify({'success': True, 'new_filename': fname})
+
 @app.route('/save_comic', methods=['POST'])
 def save_comic():
     sid = request.args.get('sid')
@@ -829,16 +817,13 @@ def save_comic():
         save_code = generate_save_code()
         save_dir = os.path.join(SAVED_COMICS_DIR, save_code)
         os.makedirs(save_dir, exist_ok=True)
-        
-        user_frames = os.path.join(BASE_USER_DIR, sid, 'frames')
-        saved_frames = os.path.join(save_dir, 'frames')
-        if os.path.exists(user_frames):
-            if os.path.exists(saved_frames): shutil.rmtree(saved_frames)
-            shutil.copytree(user_frames, saved_frames)
-            
+        user_frames_dir = os.path.join(BASE_USER_DIR, sid, 'frames')
+        saved_frames_dir = os.path.join(save_dir, 'frames')
+        if os.path.exists(user_frames_dir):
+            if os.path.exists(saved_frames_dir): shutil.rmtree(saved_frames_dir)
+            shutil.copytree(user_frames_dir, saved_frames_dir)
         with open(os.path.join(save_dir, 'comic_state.json'), 'w') as f:
             json.dump({'originalSid': sid, 'pages': data['pages'], 'savedAt': time.time()}, f)
-            
         return jsonify({'success': True, 'code': save_code})
     except Exception as e: return jsonify({'success': False, 'message': str(e)})
 
@@ -855,7 +840,6 @@ def load_comic(code):
         os.makedirs(user_frames, exist_ok=True)
         for fn in os.listdir(saved_frames):
             shutil.copy2(os.path.join(saved_frames, fn), os.path.join(user_frames, fn))
-        
         return jsonify({'success': True, 'originalSid': orig_sid, 'pages': data['pages']})
     except Exception as e: return jsonify({'success': False, 'message': str(e)})