Update app_enhanced.py

app_enhanced.py

@@ -14,9 +14,6 @@ from typing import List
 import traceback
 
 # --- ROBUST IMPORTS WITH FALLBACKS ---
-# This structure prevents the app from crashing if a module is missing.
-# It will log a warning and skip the feature instead.
-
 try:
     from backend.keyframes.keyframes import black_bar_crop
     print("✅ Black bar cropping module loaded.")
@@ -66,7 +63,6 @@ try:
 except Exception as e:
     print(f"⚠️ Could not load a core utility module: {e}")
 
-# Import smart comic generation
 try:
     from backend.emotion_aware_comic import EmotionAwareComicGenerator
     from backend.story_analyzer import SmartComicGenerator
@@ -76,7 +72,6 @@ except Exception as e:
     SMART_COMIC_AVAILABLE = False
     print(f"⚠️ Smart comic generation not available: {e}")
 
-# Import panel extractor
 try:
     from backend.panel_extractor import PanelExtractor
     PANEL_EXTRACTOR_AVAILABLE = True
@@ -85,7 +80,6 @@ except Exception as e:
     PANEL_EXTRACTOR_AVAILABLE = False
     print(f"⚠️ Panel extractor not available: {e}")
 
-# Import smart story extractor
 try:
     from backend.smart_story_extractor import SmartStoryExtractor
     STORY_EXTRACTOR_AVAILABLE = True
@@ -96,7 +90,6 @@ except Exception as e:
 
 app = Flask(__name__)
 
-# Import editor routes
 try:
     from comic_editor_server import add_editor_routes
     add_editor_routes(app)
@@ -104,7 +97,6 @@ try:
 except Exception as e:
     print(f"⚠️ Could not load comic editor: {e}")
 
-# Ensure directories exist
 os.makedirs('video', exist_ok=True)
 os.makedirs('frames/final', exist_ok=True)
 os.makedirs('output', exist_ok=True)
@@ -116,6 +108,7 @@ class EnhancedComicGenerator:
         self.frames_dir = 'frames/final'
         self.output_dir = 'output'
         self.apply_comic_style = False
+        self.video_fps = None # Will store the video's FPS
 
     def cleanup_generated(self):
         """Deletes all old files to ensure a fresh start."""
@@ -155,12 +148,14 @@ class EnhancedComicGenerator:
         except:
             return 'open'
 
-    def regenerate_frame(self, frame_filename):
+    def regenerate_frame(self, frame_filename, direction):
         """
-        Regenerate frame by moving +0.1s forward in the original video.
-        Updates metadata so repeated clicks keep advancing.
+        Regenerate a frame by moving one frame forward or backward in the video.
         """
         try:
+            if not self.video_fps:
+                return {"success": False, "message": "Video FPS not found. Please regenerate the comic first."}
+
             metadata_path = 'frames/frame_metadata.json'
             if not os.path.exists(metadata_path):
                 return {"success": False, "message": "Frame metadata missing."}
@@ -170,13 +165,25 @@ class EnhancedComicGenerator:
 
             if frame_filename not in frame_to_time:
                 return {"success": False, "message": "Panel not linked to original video."}
-            
+
             if isinstance(frame_to_time[frame_filename], dict):
                 current_time = frame_to_time[frame_filename]['time']
             else:
                 current_time = frame_to_time[frame_filename]
-                
-            target_time = current_time + 0.1
+
+            # Calculate the duration of a single frame
+            frame_duration = 1.0 / self.video_fps
+
+            # Calculate the new target time based on direction
+            if direction == 'forward':
+                target_time = current_time + frame_duration
+            elif direction == 'backward':
+                target_time = current_time - frame_duration
+            else:
+                return {"success": False, "message": "Invalid direction specified."}
+
+            # Ensure the timestamp doesn't go below zero
+            target_time = max(0, target_time)
 
             cap = cv2.VideoCapture(self.video_path)
             if not cap.isOpened():
@@ -187,24 +194,27 @@ class EnhancedComicGenerator:
             cap.release()
 
             if not ret or frame is None:
-                return {"success": False, "message": "No next frame available at +0.1s."}
+                return {"success": False, "message": f"No frame available at {target_time:.2f}s."}
 
+            # Overwrite the existing frame file
             new_path = os.path.join(self.frames_dir, frame_filename)
             cv2.imwrite(new_path, frame)
             
+            # Update metadata with the new exact time
             if isinstance(frame_to_time[frame_filename], dict):
                 frame_to_time[frame_filename]['time'] = target_time
             else:
                 frame_to_time[frame_filename] = target_time
-                
+            
             with open(metadata_path, 'w') as f:
                 json.dump(frame_to_time, f, indent=2)
             
-            print(f"✅ Regenerated {frame_filename} to time {target_time:.2f}s without enhancement.")
+            message = f"Adjusted {direction} to {target_time:.3f}s"
+            print(f"✅ {message}")
 
             return {
                 "success": True,
-                "message": f"Advanced to {target_time:.2f}s (+0.1s)",
+                "message": message,
                 "new_filename": frame_filename
             }
 
@@ -222,11 +232,8 @@ class EnhancedComicGenerator:
                 print("❌ Cannot open video for keyframe extraction")
                 return False
             
-            fps = cap.get(cv2.CAP_PROP_FPS)
-            if fps == 0:
-                print("⚠️ Video FPS is 0, defaulting to 25. Keyframe extraction might be inaccurate.")
-                fps = 25
-
+            # Use the stored FPS
+            fps = self.video_fps
             total_frames = int(cap.get(cv2.CAP_PROP_FRAME_COUNT))
             duration = total_frames / fps
             
@@ -300,6 +307,17 @@ class EnhancedComicGenerator:
         self.cleanup_generated()
         print("🎬 Starting Enhanced Comic Generation...")
         try:
+            cap = cv2.VideoCapture(self.video_path)
+            if not cap.isOpened():
+                print("❌ Cannot open video to get FPS.")
+                return False
+            self.video_fps = cap.get(cv2.CAP_PROP_FPS)
+            if self.video_fps == 0:
+                print("⚠️ Video FPS is 0, defaulting to 25.")
+                self.video_fps = 25
+            cap.release()
+            print(f"✅ Video FPS detected: {self.video_fps:.2f}")
+
             print("📝 Generating subtitles...")
             get_real_subtitles(self.video_path)
             all_subs = []
@@ -518,6 +536,7 @@ body { margin: 0; padding: 20px; background: #f0f0f0; font-family: Arial, sans-s
 .edit-controls .reset-button { background-color: #e74c3c; }
 .edit-controls .action-button { background-color: #4CAF50; }
 .edit-controls .secondary-button { background-color: #f39c12; }
+.button-grid { display: grid; grid-template-columns: 1fr 1fr; gap: 5px; }
 </style>
 </head>
 <body>
@@ -537,11 +556,17 @@ body { margin: 0; padding: 20px; background: #f0f0f0; font-family: Arial, sans-s
     </div>
     <div class="control-group">
          <button onclick="replacePanelImage()" class="action-button">🖼️ Replace Panel Image</button>
-         <button onclick="regenerateFrame()" class="action-button">🔄 Regenerate Frame</button>
-         <button onclick="exportPagesToPNG()" class="action-button" style="background-color: #2196F3;">🖨️ Export Pages to PNG</button>
     </div>
     <div class="control-group">
-         <button onclick="clearSavedState()" class="reset-button">🔄 Clear Edits & Reset</button>
+        <label>Adjust Selected Panel Frame:</label>
+        <div class="button-grid">
+            <button onclick="adjustFrame('backward')" class="secondary-button">⬅️ Previous</button>
+            <button onclick="adjustFrame('forward')" class="action-button">Next ➡️</button>
+        </div>
+    </div>
+    <div class="control-group">
+        <button onclick="exportPagesToPNG()" class="action-button" style="background-color: #2196F3;">🖨️ Export Pages to PNG</button>
+        <button onclick="clearSavedState()" class="reset-button">🔄 Clear Edits & Reset</button>
     </div>
 </div>
 <script>
@@ -627,7 +652,7 @@ body { margin: 0; padding: 20px; background: #f0f0f0; font-family: Arial, sans-s
         bubbleDiv.appendChild(textSpan);
         bubbleDiv.style.left = data.left;
         bubbleDiv.style.top = data.top;
-        applyBubbleType(bubbleDiv, 'speech'); // Default to speech
+        applyBubbleType(bubbleDiv, 'speech');
         return bubbleDiv;
     }
     
@@ -658,13 +683,13 @@ body { margin: 0; padding: 20px; background: #f0f0f0; font-family: Arial, sans-s
         if (!currentlySelectedBubble) return alert("Please select a bubble to rotate.");
         const isFlippedH = currentlySelectedBubble.classList.contains('flipped');
         const isFlippedV = currentlySelectedBubble.classList.contains('flipped-vertical');
-        if (!isFlippedH && !isFlippedV) { // State 0 -> 1
+        if (!isFlippedH && !isFlippedV) {
             currentlySelectedBubble.classList.add('flipped');
-        } else if (isFlippedH && !isFlippedV) { // State 1 -> 2
+        } else if (isFlippedH && !isFlippedV) {
             currentlySelectedBubble.classList.add('flipped-vertical');
-        } else if (isFlippedH && isFlippedV) { // State 2 -> 3
+        } else if (isFlippedH && isFlippedV) {
             currentlySelectedBubble.classList.remove('flipped');
-        } else { // State 3 -> 0
+        } else {
             currentlySelectedBubble.classList.remove('flipped-vertical');
         }
     }
@@ -787,9 +812,9 @@ body { margin: 0; padding: 20px; background: #f0f0f0; font-family: Arial, sans-s
         uploader.click();
     }
     
-    function regenerateFrame() {
+    function adjustFrame(direction) {
         if (!currentlySelectedPanel) {
-            alert("Please select a panel first.");
+            alert("Please select a panel first to adjust its frame.");
             return;
         }
         const img = currentlySelectedPanel.querySelector('img');
@@ -800,27 +825,24 @@ body { margin: 0; padding: 20px; background: #f0f0f0; font-family: Arial, sans-s
             filename = filename.split('?')[0];
         }
 
-        if (!confirm(`Regenerate frame "${filename}" with a better version?`)) {
-            return;
-        }
         img.style.opacity = '0.5';
         fetch('/regenerate_frame', {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ filename: filename })
+            body: JSON.stringify({ filename: filename, direction: direction })
         })
         .then(response => response.json())
         .then(data => {
             if (data.success) {
                 img.src = `/frames/final/${filename}?t=${new Date().getTime()}`;
-                alert(data.message);
+                console.log(data.message);
             } else {
                 alert('Error: ' + data.message);
             }
             img.style.opacity = '1';
         })
         .catch(error => {
-            alert('An error occurred during regeneration.');
+            alert('An error occurred during frame adjustment.');
             img.style.opacity = '1';
         });
     }
@@ -896,8 +918,11 @@ def regenerate_frame_route():
     try:
         data = request.get_json()
         filename = data.get('filename')
-        if not filename: return jsonify({'success': False, 'message': 'No filename provided'})
-        result = comic_generator.regenerate_frame(filename)
+        direction = data.get('direction')
+        if not filename or not direction:
+            return jsonify({'success': False, 'message': 'Filename or direction missing.'})
+        
+        result = comic_generator.regenerate_frame(filename, direction)
         return jsonify(result)
     except Exception as e:
         traceback.print_exc()