Update app_enhanced.py

app_enhanced.py

@@ -52,8 +52,8 @@ def generate_save_code(length=8):
 # ======================================================
 # 🧱 DATA CLASSES
 # ======================================================
-def bubble(dialog="", x=50, y=20, type='speech'):
-    # Apply classes
+def bubble(dialog="...", x=50, y=50, type='speech'):
+    # Default styling
     classes = f"speech-bubble {type}"
     if type == 'speech':
         classes += " tail-bottom"
@@ -61,7 +61,7 @@ def bubble(dialog="", x=50, y=20, type='speech'):
         classes += " pos-bl"
         
     return {
-        'dialog': dialog,
+        'dialog': dialog if dialog.strip() else "...", # Ensure text is never empty
         'bubble_offset_x': int(x),
         'bubble_offset_y': int(y),
         'type': type,
@@ -71,14 +71,6 @@ def bubble(dialog="", x=50, y=20, type='speech'):
         '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
 # ======================================================
@@ -104,17 +96,13 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
         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")
+            with open(user_srt, 'w') as f: f.write("1\n00:00:01,000 --> 00:00:04,000\nText\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, 'w') as f: f.write("1\n00:00:01,000 --> 00:00:04,000\nText\n")
             
     with open(user_srt, 'r', encoding='utf-8') as f:
-        try:
-            all_subs = list(srt.parse(f.read()))
-        except:
-            all_subs = []
+        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()]
     if valid_subs:
@@ -128,8 +116,9 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
 
     selected_moments = []
     if not raw_moments:
+        # Create timestamps if no text
         times = np.linspace(1, max(1, duration-1), total_panels_needed)
-        for t in times: selected_moments.append({'text': '', 'start': t, 'end': t+1})
+        for t in times: selected_moments.append({'text': '...', 'start': t, 'end': t+1})
     elif len(raw_moments) <= total_panels_needed:
         selected_moments = raw_moments
     else:
@@ -146,21 +135,23 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
         cap.set(cv2.CAP_PROP_POS_MSEC, mid * 1000)
         ret, frame = cap.read()
         if ret:
-            # 🎯 SQUARE PADDING (0% Cut) - HD Output
+            # 🎯 SQUARE PADDING (0% Cut, Matches Template)
             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
-            # Resize to standard high res (1024x1024)
+            # Standardize size
             square_img = cv2.resize(square_img, (1024, 1024))
             
             fname = f"frame_{count:04d}.png"
             p = os.path.join(frames_dir, fname)
             cv2.imwrite(p, square_img)
             
-            frame_metadata[fname] = {'dialogue': moment['text'], 'time': mid}
+            # Ensure text exists
+            txt = moment['text'] if moment['text'].strip() else "..."
+            frame_metadata[fname] = {'dialogue': txt, 'time': mid}
             frame_files_ordered.append(fname)
             count += 1
     cap.release()
@@ -169,29 +160,25 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
         
     bubbles_list = []
     for i, f in enumerate(frame_files_ordered):
-        dialogue = frame_metadata.get(f, {}).get('dialogue', '')
+        dialogue = frame_metadata.get(f, {}).get('dialogue', '...')
         
         # Determine Bubble Type
         b_type = 'speech'
-        if '(' in dialogue: b_type = 'narration'
-        elif '!' in dialogue: b_type = 'reaction'
-        elif '?' in dialogue: b_type = 'speech'
+        if '(' in dialogue: 
+            b_type = 'narration'
+        elif '!' in dialogue and len(dialogue) < 15: # Reaction only if short
+            b_type = 'reaction'
+        else:
+            b_type = 'speech'
         
-        # 🎯 1 BUBBLE PER PANEL PLACEMENT (for 800x800 page)
-        # Quadrants: TL, TR, BL, BR
-        # Panel size approx 400x400
+        # Smart Positioning (Center of quadrants)
         pos_idx = i % 4
-        if pos_idx == 0:   # TL
-            bx, by = 150, 50
-        elif pos_idx == 1: # TR
-            bx, by = 550, 50
-        elif pos_idx == 2: # BL
-            bx, by = 150, 450
-        elif pos_idx == 3: # BR
-            bx, by = 550, 450
-        else:
-            bx, by = 50, 50
-            
+        if pos_idx == 0: bx, by = 150, 80
+        elif pos_idx == 1: bx, by = 600, 80
+        elif pos_idx == 2: bx, by = 150, 600
+        elif pos_idx == 3: bx, by = 600, 600
+        else: bx, by = 50, 50
+
         bubbles_list.append(bubble(dialog=dialogue, x=bx, y=by, type=b_type))
             
     pages = []
@@ -206,7 +193,6 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
              img = np.zeros((1024, 1024, 3), dtype=np.uint8); img[:] = (30,30,30)
              cv2.imwrite(os.path.join(frames_dir, fname), img)
              p_frames.append(fname)
-             # Add dummy bubble to keep count synced, but off-screen or empty
              p_bubbles.append(bubble(dialog="", x=-999, y=-999, type='speech'))
 
         if p_frames:
@@ -340,22 +326,18 @@ INDEX_HTML = '''
     .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; }
     
-    /* 🎯 5px White Border on Page */
     .comic-page { 
         width: 800px; 
         height: 800px; 
         background: white; 
         box-shadow: 0 5px 30px rgba(0,0,0,0.6); 
         position: relative; overflow: hidden; 
-        border: 5px solid #ffffff; 
+        border: 6px solid #000; 
     }
     
-    /* 🎯 5px White Borders between panels */
     .comic-grid {
-        width: 100%; height: 100%; position: relative; 
-        background: #ffffff; /* White background makes white lines */
-        --y: 50%; --t1: 100%; --t2: 100%; --b1: 100%; --b2: 100%; 
-        --gap: 5px; /* 5px gap size */
+        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; }
@@ -714,8 +696,8 @@ INDEX_HTML = '''
         const type = data.type || 'speech';
         let className = data.classes || `speech-bubble ${type} tail-bottom`;
         if (type === 'thought' && !className.includes('pos-')) className += ' pos-bl';
-        
         b.className = className;
+        
         b.dataset.type = type;
         b.style.left = data.left; b.style.top = data.top;
         if(data.width) b.style.width = data.width;
@@ -726,9 +708,26 @@ INDEX_HTML = '''
         
         if(type === 'thought') { for(let i=1; i<=2; i++){ const d = document.createElement('div'); d.className = `thought-dot thought-dot-${i}`; b.appendChild(d); } }
         
-        ['nw', 'ne', 'sw', 'se'].forEach(dir => { const handle = document.createElement('div'); handle.className = `resize-handle ${dir}`; handle.onmousedown = (e) => startResize(e, dir); b.appendChild(handle); });
+        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'; 
+        resizer.onmousedown = (e) => { e.stopPropagation(); dragType='resize'; activeObj={b:b, startW:b.offsetWidth, startH:b.offsetHeight, mx:e.clientX, my:e.clientY}; };
+        b.appendChild(resizer);
         
-        b.onmousedown = (e) => { if(e.target.classList.contains('resize-handle')) return; e.stopPropagation(); selectBubble(b); dragType = 'bubble'; activeObj = b; dragStart = {x: e.clientX, y: e.clientY}; };
+        // 🎯 DRAG FIX: Stop propagation to prevent selecting panel behind it
+        b.onmousedown = (e) => { 
+            if(e.target === resizer) return; 
+            e.stopPropagation(); 
+            e.preventDefault(); // Stop text selection
+            selectBubble(b); 
+            dragType = 'bubble'; 
+            activeObj = b; 
+            
+            // Calculate offset so we drag from clicked point, not top-left jump
+            dragStart = {
+                x: e.clientX - b.getBoundingClientRect().left,
+                y: e.clientY - b.getBoundingClientRect().top
+            };
+        };
         b.ondblclick = (e) => { e.stopPropagation(); editBubbleText(b); };
         return b;
     }
@@ -739,8 +738,10 @@ INDEX_HTML = '''
         if(newText !== null) { textSpan.textContent = newText; saveState(); }
     }
     
+    // --- GLOBAL MOUSE EVENTS ---
     document.addEventListener('mousemove', (e) => {
         if(!dragType) return;
+        
         if(dragType === 'handle') {
             const rect = activeObj.grid.getBoundingClientRect();
             let x = (e.clientX - rect.left) / rect.width * 100;
@@ -752,9 +753,13 @@ INDEX_HTML = '''
             img.dataset.translateY = parseFloat(img.dataset.translateY) + dy;
             updateImageTransform(img); dragStart = {x: e.clientX, y: e.clientY};
         } else if(dragType === 'bubble') {
-            const rect = activeObj.parentElement.getBoundingClientRect();
-            activeObj.style.left = (e.clientX - rect.left - (activeObj.offsetWidth/2)) + 'px';
-            activeObj.style.top = (e.clientY - rect.top - (activeObj.offsetHeight/2)) + 'px';
+            // Correct parent-relative positioning
+            const parentRect = activeObj.parentElement.getBoundingClientRect();
+            let newX = e.clientX - parentRect.left - dragStart.x;
+            let newY = e.clientY - parentRect.top - dragStart.y;
+            
+            activeObj.style.left = newX + 'px';
+            activeObj.style.top = newY + 'px';
         } else if(dragType === 'resize') {
             const dx = e.clientX - activeObj.mx; const dy = e.clientY - activeObj.my;
             activeObj.b.style.width = (activeObj.startW + dx) + 'px';
@@ -768,8 +773,6 @@ INDEX_HTML = '''
         dragType = null; activeObj = null; 
     });
     
-    function startResize(e, dir) { e.preventDefault(); e.stopPropagation(); dragType = 'resize'; activeObj = { b: e.target.parentElement, startW: e.target.parentElement.offsetWidth, startH: e.target.parentElement.offsetHeight, mx: e.clientX, my: e.clientY }; }
-    
     function selectBubble(el) { 
         if(selectedBubble) selectedBubble.classList.remove('selected'); 
         selectedBubble = el; el.classList.add('selected'); 
@@ -868,7 +871,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, type: b.dataset.type, colors: { fill: b.style.getPropertyValue('--bubble-fill'), text: b.style.getPropertyValue('--bubble-text') }, tailPos: b.style.getPropertyValue('--tail-pos'), classes: b.className });
+                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') } });
             });
             const panels = [];
             grid.querySelectorAll('.panel').forEach(pan => {
@@ -894,7 +897,8 @@ 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)
@@ -929,23 +933,6 @@ 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')
@@ -954,31 +941,49 @@ 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_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)
+        
+        save_data = {
+            'code': save_code,
+            'originalSid': sid,
+            'pages': data.get('pages', []),
+            'savedAt': data.get('savedAt', time.strftime('%Y-%m-%d %H:%M:%S'))
+        }
+        with open(os.path.join(save_dir, 'comic_state.json'), 'w') as f: json.dump(save_data, f, indent=2)
         return jsonify({'success': True, 'code': save_code})
-    except Exception as e: return jsonify({'success': False, 'message': str(e)})
+    except Exception as e:
+        traceback.print_exc()
+        return jsonify({'success': False, 'message': str(e)})
 
 @app.route('/load_comic/<code>')
 def load_comic(code):
     code = code.upper()
     save_dir = os.path.join(SAVED_COMICS_DIR, code)
-    if not os.path.exists(save_dir): return jsonify({'success': False, 'message': 'Code not found'})
+    state_file = os.path.join(save_dir, 'comic_state.json')
+    
+    if not os.path.exists(state_file): return jsonify({'success': False, 'message': 'Code not found'})
+    
     try:
-        with open(os.path.join(save_dir, 'comic_state.json'), 'r') as f: data = json.load(f)
-        orig_sid = data['originalSid']
-        saved_frames = os.path.join(save_dir, 'frames')
-        user_frames = os.path.join(BASE_USER_DIR, orig_sid, 'frames')
-        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)})
+        with open(state_file, 'r') as f: save_data = json.load(f)
+        original_sid = save_data.get('originalSid')
+        saved_frames_dir = os.path.join(save_dir, 'frames')
+        if original_sid and os.path.exists(saved_frames_dir):
+            user_frames_dir = os.path.join(BASE_USER_DIR, original_sid, 'frames')
+            os.makedirs(user_frames_dir, exist_ok=True)
+            for fname in os.listdir(saved_frames_dir):
+                src = os.path.join(saved_frames_dir, fname)
+                dst = os.path.join(user_frames_dir, fname)
+                if not os.path.exists(dst): shutil.copy2(src, dst)
+        return jsonify({ 'success': True, 'pages': save_data.get('pages', []), 'originalSid': original_sid, 'savedAt': save_data.get('savedAt') })
+    except Exception as e:
+        traceback.print_exc()
+        return jsonify({'success': False, 'message': str(e)})
 
 if __name__ == '__main__':
     try: gpu_warmup()