Update app_enhanced.py

app_enhanced.py

@@ -1,15 +1,16 @@
-import spaces # MUST BE FIRST
+import spaces  # <--- CRITICAL: MUST BE THE FIRST IMPORT
 import os
 import time
 import threading
 import json
+import shutil
 import cv2
 import numpy as np
 import srt
 from flask import Flask, jsonify, request, send_from_directory, send_file
 
 # ======================================================
-# 🚀 ZEROGPU & STORAGE
+# 🚀 ZEROGPU & STORAGE SETUP
 # ======================================================
 @spaces.GPU
 def gpu_warmup():
@@ -28,7 +29,7 @@ def sanitize_json(obj):
     return obj
 
 # ======================================================
-# 🧠 THE ENGINE
+# 🧠 THE GEOMETRIC ENGINE
 # ======================================================
 @spaces.GPU(duration=300)
 def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_pages):
@@ -48,16 +49,17 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
     user_srt = os.path.join(user_dir, 'subs.srt')
     try:
         get_real_subtitles(video_path)
-        if os.path.exists('test1.srt'): os.rename('test1.srt', user_srt)
+        if os.path.exists('test1.srt'): shutil.move('test1.srt', user_srt)
     except:
-        with open(user_srt, 'w') as f: f.write("1\n00:00:01,000 --> 00:00:05,000\nDialogue...\n")
+        with open(user_srt, 'w') as f: f.write("1\n00:00:01,000 --> 00:00:05,000\n...\n")
 
     with open(user_srt, 'r', encoding='utf-8') as f:
         try: all_subs = list(srt.parse(f.read()))
         except: all_subs = []
 
     panels_per_page = 5
-    total_needed = int(target_pages) * panels_per_page
+    target_pages = int(target_pages)
+    total_needed = target_pages * panels_per_page
     indices = np.linspace(0, len(all_subs) - 1, total_needed, dtype=int) if all_subs else range(total_needed)
     
     frame_metadata = {}
@@ -80,7 +82,7 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
 
     se = SimpleColorEnhancer()
     pages_data = []
-    for p_idx in range(int(target_pages)):
+    for p_idx in range(target_pages):
         p_p, p_b = [], []
         start = p_idx * 5
         for i in range(start, start + 5):
@@ -101,7 +103,7 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
     return sanitize_json(pages_data)
 
 # ======================================================
-# 🌐 FLASK & HTML
+# 🌐 FLASK SERVER
 # ======================================================
 app = Flask(__name__)
 
@@ -112,13 +114,19 @@ def index(): return INDEX_HTML
 def uploader():
     sid = request.args.get('sid')
     u_dir = os.path.join(BASE_USER_DIR, sid)
-    f_dir = os.path.join(u_dir, 'frames'); o_dir = os.path.join(u_dir, 'output')
+    f_dir = os.path.join(u_dir, 'frames')
+    o_dir = os.path.join(u_dir, 'output')
     os.makedirs(f_dir, exist_ok=True); os.makedirs(o_dir, exist_ok=True)
-    request.files['file'].save(os.path.join(u_dir, 'video.mp4'))
     
+    video_file = request.files['file']
+    video_path = os.path.join(u_dir, 'video.mp4')
+    video_file.save(video_path)
+    
+    pages = request.form.get('pages', 2)
+
     def task():
         try:
-            data = generate_comic_gpu(os.path.join(u_dir, 'video.mp4'), u_dir, f_dir, os.path.join(f_dir, 'm.json'), request.form.get('pages', 2))
+            data = generate_comic_gpu(video_path, u_dir, f_dir, os.path.join(f_dir, 'm.json'), pages)
             with open(os.path.join(o_dir, 'p.json'), 'w') as f: json.dump(data, f)
             with open(os.path.join(o_dir, 's.json'), 'w') as f: json.dump({'progress': 100}, f)
         except Exception as e:
@@ -129,8 +137,10 @@ def uploader():
 
 @app.route('/status')
 def status():
-    p = os.path.join(BASE_USER_DIR, request.args.get('sid'), 'output', 's.json')
-    return send_file(p) if os.path.exists(p) else jsonify({'progress': 0})
+    sid = request.args.get('sid')
+    p = os.path.join(BASE_USER_DIR, sid, 'output', 's.json')
+    if os.path.exists(p): return send_file(p)
+    return jsonify({'progress': 1, 'msg': 'Processing...'})
 
 @app.route('/frames/<sid>/<path:f>')
 def get_frame(sid, f): return send_from_directory(os.path.join(BASE_USER_DIR, sid, 'frames'), f)
@@ -138,95 +148,143 @@ def get_frame(sid, f): return send_from_directory(os.path.join(BASE_USER_DIR, si
 @app.route('/output/<sid>/<path:f>')
 def get_output(sid, f): return send_from_directory(os.path.join(BASE_USER_DIR, sid, 'output'), f)
 
+# ======================================================
+# 🖼️ UI HTML (FIXED GENERATE BUTTON)
+# ======================================================
 INDEX_HTML = '''
 <!DOCTYPE html><html><head><meta charset="UTF-8">
+<title>Pro Geometric Comic Maker</title>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/html-to-image/1.11.11/html-to-image.min.js"></script>
 <style>
-    :root { 
-        --slant: 40px; /* MATHEMATICAL PARALLEL OFFSET */
-        --hairline: 0.1px; /* SUB-PIXEL PRECISION GAP */
-    }
-    body { background: #000; font-family: sans-serif; padding: 20px; color: white; }
+    :root { --slant: 40px; --hairline: 0.1px; }
+    body { background: #000; font-family: sans-serif; color: white; text-align: center; padding: 20px; }
     
-    /* THE PERFECT GEOMETRIC TEMPLATE */
     .comic-page { 
-        background: white; width: 1000px; height: 750px; margin: auto; 
+        background: white; width: 1000px; height: 750px; margin: 20px auto; 
         border: 12px solid black; padding: 2px; display: grid; gap: var(--hairline);
         grid-template-columns: repeat(6, 1fr); grid-template-rows: 1.35fr 1fr;
         position: relative; overflow: hidden;
     }
     .panel { position: relative; background: #000; overflow: hidden; border: 1px solid black; }
+    .panel img { width: 115%; height: 115%; object-fit: cover; position: absolute; top: -7.5%; left: -7.5%; object-position: center 15%; }
     
-    /* TECHNIQUE: OVERSCAN & HEADROOM PROTECTION */
-    .panel img { 
-        width: 115%; height: 115%; object-fit: cover; 
-        position: absolute; top: -7.5%; left: -7.5%; 
-        object-position: center 15%; /* PROTECTS FACES FROM TOP CLIPPING */
-    }
-    
-    /* ROW 1: PARALLEL SLANT LEFT \ */
+    /* TILTED GEOMETRY */
     .panel:nth-child(1) { grid-column: span 4; clip-path: polygon(0 0, 100% 0, calc(100% - var(--slant)) 100%, 0 100%); }
     .panel:nth-child(2) { grid-column: span 2; clip-path: polygon(var(--slant) 0, 100% 0, 100% 100%, 0 100%); }
-
-    /* ROW 2: PARALLEL SLANT RIGHT / */
     .panel:nth-child(3) { grid-column: span 2; clip-path: polygon(0 0, calc(100% - var(--slant)) 0, 100% 100%, 0 100%); }
     .panel:nth-child(4) { grid-column: span 2; clip-path: polygon(var(--slant) 0, calc(100% - var(--slant)) 0, 100% 100%, var(--slant) 100%); }
     .panel:nth-child(5) { grid-column: span 2; clip-path: polygon(var(--slant) 0, 100% 0, 100% 100%, var(--slant) 100%); }
 
-    .bubble { position: absolute; background: white; border: 2.5px solid black; border-radius: 25px; padding: 10px; color: black; font-weight: bold; cursor: move; z-index: 99; text-align: center; min-width: 100px;}
-    .controls { position: fixed; bottom: 20px; right: 20px; background: #222; padding: 20px; border-radius: 10px; }
+    .bubble { position: absolute; background: white; border: 2.5px solid black; border-radius: 25px; padding: 10px; color: black; font-weight: bold; z-index: 99; min-width: 100px;}
     .hidden { display: none; }
+    .btn { padding: 15px 30px; font-size: 18px; font-weight: bold; cursor: pointer; border-radius: 8px; border: none; }
+    #status-msg { margin-top: 20px; font-weight: bold; color: cyan; }
 </style></head>
 <body>
-    <div id="u-zone" style="text-align:center; margin-top:100px;">
-        <h1>Elite Geometric Generator</h1>
-        <input type="file" id="vid"><br><br>
-        <button onclick="start()" style="padding:10px 20px; background:cyan; font-weight:bold;">GENERATE PERFECT COMIC</button>
+    <div id="u-zone">
+        <h1>🎬 Elite Geometric Generator</h1>
+        <p>Parallel Trapezoid Geometry | 0.1px Hairline Gutters</p>
+        <input type="file" id="vid" accept="video/mp4"><br><br>
+        <label>Pages: </label><input type="number" id="pg-count" value="2" style="width: 50px; padding: 5px;"><br><br>
+        <button id="gen-btn" class="btn" onclick="start()" style="background:cyan; color:black;">GENERATE PERFECT COMIC</button>
+        <div id="status-msg"></div>
     </div>
+
     <div id="e-zone" class="hidden">
         <div id="out"></div>
-        <div class="controls">
-            <button onclick="exportPNG()" style="background:lime; padding:10px; width:100%;">DOWNLOAD PNG</button>
+        <div style="position:fixed; bottom:20px; right:20px;">
+            <button class="btn" onclick="exportPNG()" style="background:lime;">DOWNLOAD PNG</button>
+            <button class="btn" onclick="location.reload()" style="background:grey;">RESET</button>
         </div>
     </div>
+
 <script>
     let sid = 's'+Math.random().toString(36).substr(2,9);
+    
     async function start() {
-        const fd = new FormData(); fd.append('file', document.getElementById('vid').files[0]);
-        await fetch(`/uploader?sid=${sid}`, {method: 'POST', body: fd});
-        const itv = setInterval(async () => {
-            const r = await fetch(`/status?sid=${sid}`); const d = await r.json();
-            if(d.progress >= 100) { clearInterval(itv); load(); }
-        }, 2000);
+        const fileInput = document.getElementById('vid');
+        const pgCount = document.getElementById('pg-count').value;
+        
+        if(!fileInput.files[0]) return alert("Please select a video file first!");
+
+        // Feedback to user
+        document.getElementById('gen-btn').disabled = true;
+        document.getElementById('gen-btn').innerText = "UPLOADING...";
+        document.getElementById('status-msg').innerText = "Uploading video to GPU... please wait.";
+
+        const fd = new FormData();
+        fd.append('file', fileInput.files[0]);
+        fd.append('pages', pgCount);
+
+        try {
+            const resp = await fetch(`/uploader?sid=${sid}`, {method: 'POST', body: fd});
+            const result = await resp.json();
+            
+            if(result.ok) {
+                const itv = setInterval(async () => {
+                    const r = await fetch(`/status?sid=${sid}`);
+                    const d = await r.json();
+                    
+                    if(d.progress === 100) {
+                        clearInterval(itv);
+                        loadEditor();
+                    } else if (d.progress === -1) {
+                        clearInterval(itv);
+                        alert("Error: " + d.msg);
+                        location.reload();
+                    } else {
+                        document.getElementById('status-msg').innerText = "GPU Processing: " + (d.msg || "Extracting Frames...");
+                    }
+                }, 3000);
+            }
+        } catch (e) {
+            alert("Connection Error. Check if Space is awake.");
+            location.reload();
+        }
     }
-    async function load() {
-        const r = await fetch(`/output/${sid}/p.json`); const pages = await r.json();
+
+    async function loadEditor() {
+        const r = await fetch(`/output/${sid}/p.json`);
+        const pages = await r.json();
         document.getElementById('u-zone').classList.add('hidden');
         document.getElementById('e-zone').classList.remove('hidden');
+        
         pages.forEach(p => {
-            const pg = document.createElement('div'); pg.className='comic-page';
+            const pgDiv = document.createElement('div');
+            pgDiv.className = 'comic-page';
             p.panels.forEach((pan, i) => {
-                const div = document.createElement('div'); div.className='panel';
-                const img = document.createElement('img'); img.src=`/frames/${sid}/${pan.image}`;
+                const div = document.createElement('div');
+                div.className = 'panel';
+                const img = document.createElement('img');
+                img.src = `/frames/${sid}/${pan.image}`;
                 div.appendChild(img);
-                if(p.bubbles[i]) {
-                    const b = document.createElement('div'); b.className='bubble'; b.innerText=p.bubbles[i].dialog;
-                    b.style.left=p.bubbles[i].x+'px'; b.style.top=p.bubbles[i].y+'px';
+                
+                if(p.bubbles[i] && p.bubbles[i].dialog) {
+                    const b = document.createElement('div');
+                    b.className = 'bubble';
+                    b.innerText = p.bubbles[i].dialog;
+                    b.style.left = p.bubbles[i].x + 'px';
+                    b.style.top = p.bubbles[i].y + 'px';
                     div.appendChild(b);
                 }
-                pg.appendChild(div);
+                pgDiv.appendChild(div);
             });
-            document.getElementById('out').appendChild(pg);
+            document.getElementById('out').appendChild(pgDiv);
         });
     }
+
     async function exportPNG() {
         const pgs = document.querySelectorAll('.comic-page');
         for(let pg of pgs) {
             const url = await htmlToImage.toPng(pg, {pixelRatio: 3});
-            const l = document.createElement('a'); l.download='Page.png'; l.href=url; l.click();
+            const l = document.createElement('a');
+            l.download = 'Comic_Page.png';
+            l.href = url;
+            l.click();
         }
     }
-</script></body></html>'''
+</script></body></html>
+'''
 
 if __name__ == '__main__':
     try: gpu_warmup()