Update app.py

app.py

@@ -1,24 +1,17 @@
-from flask import Flask, send_from_directory, jsonify
+from flask import Flask, jsonify, Response
 import os
 import requests
 from pathlib import Path
 import threading
-import time
-import hashlib
 
 app = Flask(__name__)
 
 # Configuration
 LINKS_FILE = "links.txt"
-DOWNLOAD_PATH = "media"
 
-# Global state - shared across all users
+# Global state
 state = {
     "status": "idle",
-    "progress": 0,
-    "message": "Initializing...",
-    "total_files": 0,
-    "processed_files": 0,
     "images": []
 }
 state_lock = threading.Lock()
@@ -31,39 +24,6 @@ def get_state_copy():
     with state_lock:
         return dict(state)
 
-def get_images():
-    extensions = {".jpg", ".jpeg", ".png", ".bmp", ".gif", ".webp"}
-    images = []
-    if os.path.exists(DOWNLOAD_PATH):
-        for root, _, files in os.walk(DOWNLOAD_PATH):
-            for file in files:
-                if Path(file).suffix.lower() in extensions:
-                    rel_path = os.path.relpath(os.path.join(root, file), DOWNLOAD_PATH)
-                    images.append(rel_path)
-    return sorted(images)
-
-def get_file_extension(url, content_type=None):
-    url_path = url.split('?')[0]
-    ext = Path(url_path).suffix.lower()
-    if ext in {'.jpg', '.jpeg', '.png', '.gif', '.webp', '.bmp'}:
-        return ext
-    if content_type:
-        type_map = {
-            'image/jpeg': '.jpg',
-            'image/png': '.png',
-            'image/gif': '.gif',
-            'image/webp': '.webp',
-            'image/bmp': '.bmp'
-        }
-        for mime, extension in type_map.items():
-            if mime in content_type:
-                return extension
-    return '.jpg'
-
-def generate_filename(url, index):
-    url_hash = hashlib.md5(url.encode()).hexdigest()[:8]
-    return f"image_{index:04d}_{url_hash}"
-
 def load_links():
     links = []
     if os.path.exists(LINKS_FILE):
@@ -74,73 +34,12 @@ def load_links():
                     links.append(line)
     return links
 
-def download_images():
-    existing_images = get_images()
-    if existing_images:
-        update_state(
-            status="complete",
-            progress=100,
-            message=f"Ready! {len(existing_images)} images loaded",
-            images=existing_images,
-            total_files=len(existing_images),
-            processed_files=len(existing_images)
-        )
-        return
-
+def init_images():
     links = load_links()
-    if not links:
-        update_state(status="error", message="No links found in links.txt")
-        return
-
-    os.makedirs(DOWNLOAD_PATH, exist_ok=True)
-    total = len(links)
-
-    update_state(
-        status="downloading",
-        progress=0,
-        message="Connecting...",
-        total_files=total,
-        processed_files=0
-    )
-
-    for i, url in enumerate(links):
-        try:
-            update_state(
-                message=f"Downloading image {i + 1} of {total}",
-                processed_files=i
-            )
-            
-            response = requests.get(url, timeout=30, headers={
-                'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36'
-            })
-            response.raise_for_status()
-            
-            content_type = response.headers.get('content-type', '')
-            ext = get_file_extension(url, content_type)
-            filename = generate_filename(url, i) + ext
-            filepath = os.path.join(DOWNLOAD_PATH, filename)
-            
-            with open(filepath, 'wb') as f:
-                f.write(response.content)
-            
-            progress = int((i + 1) / total * 100)
-            update_state(progress=progress, processed_files=i + 1)
-            time.sleep(0.05)
-            
-        except Exception as e:
-            print(f"Failed to download {url}: {e}")
-            continue
-
-    images = get_images()
-    if images:
-        update_state(
-            status="complete",
-            progress=100,
-            message=f"Complete! {len(images)} images ready",
-            images=images
-        )
+    if links:
+        update_state(status="complete", images=links)
     else:
-        update_state(status="error", message="No images downloaded")
+        update_state(status="error", images=[])
 
 HTML_PAGE = '''<!DOCTYPE html>
 <html lang="en">
@@ -224,76 +123,19 @@ HTML_PAGE = '''<!DOCTYPE html>
         .corner-bracket.bl { bottom: -6px; left: -6px; border-right: none; border-top: none; }
         .corner-bracket.br { bottom: -6px; right: -6px; border-left: none; border-top: none; }
         
-        .progress-card {
-            width: 100%;
-            max-width: 400px;
-            background: #000;
-            border: 3px solid #fff;
-            padding: 30px;
-        }
-        
-        .progress-status {
-            font-size: 16px;
-            font-weight: 700;
+        .loading-text {
+            font-size: 14px;
             letter-spacing: 4px;
             color: #fff;
-            margin-bottom: 20px;
-            text-transform: uppercase;
-            text-align: center;
         }
         
-        .progress-bar-outer {
-            width: 100%;
-            height: 35px;
-            background: #111;
-            border: 2px solid #fff;
-            position: relative;
-            overflow: hidden;
-        }
-        
-        .progress-bar-inner {
-            height: 100%;
-            background: #fff;
-            width: 0%;
-            transition: width 0.3s ease-out;
-        }
-        
-        .progress-percent {
-            position: absolute;
-            top: 50%;
-            left: 50%;
-            transform: translate(-50%, -50%);
+        .error-message {
+            color: #f44;
             font-size: 14px;
-            font-weight: 800;
-            color: #fff;
-            z-index: 2;
-            mix-blend-mode: difference;
-        }
-        
-        .file-counter {
-            display: flex;
-            justify-content: center;
-            gap: 5px;
-            margin-top: 20px;
-            font-size: 20px;
-            font-weight: 800;
-        }
-        
-        .file-counter .current { color: #fff; }
-        .file-counter .separator { color: #444; }
-        .file-counter .total { color: #666; }
-        
-        .progress-detail {
-            margin-top: 15px;
-            font-size: 11px;
-            color: #888;
+            letter-spacing: 2px;
             text-align: center;
         }
         
-        .error-message {
-            color: #f44 !important;
-        }
-        
         /* ===== GALLERY ===== */
         #gallery-screen {
             display: none;
@@ -520,14 +362,6 @@ HTML_PAGE = '''<!DOCTYPE html>
                 width: 100px;
                 height: 100px;
             }
-            
-            .progress-card {
-                padding: 25px 20px;
-            }
-            
-            .progress-status {
-                font-size: 14px;
-            }
         }
         
         @media (max-width: 380px) {
@@ -550,23 +384,7 @@ HTML_PAGE = '''<!DOCTYPE html>
             <div class="corner-bracket br"></div>
             <img class="epstein-image" src="https://upload.wikimedia.org/wikipedia/commons/thumb/3/34/Epstein-mugshot.jpg/440px-Epstein-mugshot.jpg" alt="Loading">
         </div>
-        
-        <div class="progress-card">
-            <div class="progress-status" id="status-text">LOADING</div>
-            
-            <div class="progress-bar-outer">
-                <div class="progress-bar-inner" id="progress-bar"></div>
-                <div class="progress-percent" id="progress-pct">0%</div>
-            </div>
-            
-            <div class="file-counter">
-                <span class="current" id="current-count">0</span>
-                <span class="separator">/</span>
-                <span class="total" id="total-count">0</span>
-            </div>
-            
-            <div class="progress-detail" id="detail-text">Connecting...</div>
-        </div>
+        <div class="loading-text" id="loading-text">LOADING</div>
     </div>
     
     <!-- Gallery Screen -->
@@ -601,33 +419,7 @@ HTML_PAGE = '''<!DOCTYPE html>
         
         const loadingScreen = document.getElementById('loading-screen');
         const galleryScreen = document.getElementById('gallery-screen');
-        const progressBar = document.getElementById('progress-bar');
-        const progressPct = document.getElementById('progress-pct');
-        const statusText = document.getElementById('status-text');
-        const detailText = document.getElementById('detail-text');
-        const currentCount = document.getElementById('current-count');
-        const totalCount = document.getElementById('total-count');
-        
-        function updateUI(data) {
-            progressBar.style.width = data.progress + '%';
-            progressPct.textContent = data.progress + '%';
-            detailText.textContent = data.message;
-            currentCount.textContent = data.processed_files || 0;
-            totalCount.textContent = data.total_files || 0;
-            
-            if (data.status === 'idle') {
-                statusText.textContent = 'CONNECTING';
-            } else if (data.status === 'downloading') {
-                statusText.textContent = 'DOWNLOADING';
-            } else if (data.status === 'complete') {
-                statusText.textContent = 'COMPLETE';
-                showGallery(data.images);
-            } else if (data.status === 'error') {
-                statusText.textContent = 'ERROR';
-                statusText.classList.add('error-message');
-                detailText.classList.add('error-message');
-            }
-        }
+        const loadingText = document.getElementById('loading-text');
         
         function showGallery(imageList) {
             images = imageList;
@@ -640,14 +432,14 @@ HTML_PAGE = '''<!DOCTYPE html>
             const grid = document.getElementById('gallery-grid');
             grid.innerHTML = '';
             
-            images.forEach((img, idx) => {
+            images.forEach((url, idx) => {
                 const item = document.createElement('div');
                 item.className = 'gallery-item';
                 
                 const imgEl = document.createElement('img');
                 imgEl.loading = 'lazy';
                 imgEl.alt = 'File ' + (idx + 1);
-                imgEl.src = '/media/' + encodeURIComponent(img);
+                imgEl.src = url;
                 
                 const number = document.createElement('div');
                 number.className = 'item-number';
@@ -660,6 +452,11 @@ HTML_PAGE = '''<!DOCTYPE html>
             });
         }
         
+        function showError(msg) {
+            loadingText.textContent = msg;
+            loadingText.classList.add('error-message');
+        }
+        
         const lightbox = document.getElementById('lightbox');
         const lbImg = document.getElementById('lightbox-img');
         const lbCounter = document.getElementById('lb-counter');
@@ -678,7 +475,7 @@ HTML_PAGE = '''<!DOCTYPE html>
         }
         
         function updateLightbox() {
-            lbImg.src = '/media/' + encodeURIComponent(images[currentIdx]);
+            lbImg.src = images[currentIdx];
             lbCounter.textContent = (currentIdx + 1) + ' / ' + images.length;
             lbFilename.textContent = 'FILE #' + (currentIdx + 1);
         }
@@ -720,19 +517,17 @@ HTML_PAGE = '''<!DOCTYPE html>
             }
         }, { passive: true });
         
-        function poll() {
-            fetch('/status')
-                .then(r => r.json())
-                .then(data => {
-                    updateUI(data);
-                    if (data.status !== 'complete' && data.status !== 'error') {
-                        setTimeout(poll, 300);
-                    }
-                })
-                .catch(() => setTimeout(poll, 1000));
-        }
-        
-        poll();
+        // Load images
+        fetch('/status')
+            .then(r => r.json())
+            .then(data => {
+                if (data.status === 'complete' && data.images.length > 0) {
+                    showGallery(data.images);
+                } else {
+                    showError('NO IMAGES FOUND');
+                }
+            })
+            .catch(() => showError('CONNECTION ERROR'));
     </script>
 </body>
 </html>'''
@@ -745,15 +540,8 @@ def index():
 def get_status():
     return jsonify(get_state_copy())
 
-@app.route('/media/<path:filename>')
-def serve_media(filename):
-    return send_from_directory(DOWNLOAD_PATH, filename)
-
-def start_download():
-    thread = threading.Thread(target=download_images, daemon=True)
-    thread.start()
-
-start_download()
+# Initialize on startup
+init_images()
 
 if __name__ == "__main__":
     app.run(host="0.0.0.0", port=7860, threaded=True)