Update app.py

app.py

@@ -17,6 +17,11 @@ HTML_CONTENT = """
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Radd PRO Uploader</title>
     <link href="https://fonts.googleapis.com/css2?family=Poppins:wght@300;400;600&display=swap" rel="stylesheet">
+    <link rel="manifest" href="/manifest.json">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="apple-mobile-web-app-title" content="Radd PRO">
+    <link rel="apple-touch-icon" href="/icon-192x192.png">
     <style>
         body {
             font-family: 'Poppins', sans-serif;
@@ -420,117 +425,117 @@ HTML_CONTENT = """
             word-break: break-all;
         }
 
-        .history-item-actions {
-            display: flex;
-            gap: 5px;
+            .history-item-actions {
+        display: flex;
+        gap: 5px;
+    }
+
+    .quick-open-modal {
+        display: none;
+        position: fixed;
+        z-index: 4;
+        left: 0;
+        top: 0;
+        width: 100%;
+        height: 100%;
+        background-color: rgba(0,0,0,0.9);
+        overflow: auto;
+    }
+
+    .quick-open-content {
+        margin: 5% auto;
+        padding: 20px;
+        width: 90%;
+        max-width: 800px;
+        text-align: center;
+    }
+
+    .quick-open-content img,
+    .quick-open-content video,
+    .quick-open-content audio {
+        max-width: 100%;
+        max-height: 70vh;
+        margin-bottom: 20px;
+    }
+
+    .quick-open-content iframe {
+        width: 100%;
+        height: 70vh;
+        border: none;
+    }
+
+    @media (max-width: 480px) {
+        .container {
+            padding: 1.5rem;
         }
 
-        .quick-open-modal {
-            display: none;
-            position: fixed;
-            z-index: 4;
-            left: 0;
-            top: 0;
-            width: 100%;
-            height: 100%;
-            background-color: rgba(0,0,0,0.9);
-            overflow: auto;
+        h1 {
+            font-size: 1.5rem;
         }
 
-        .quick-open-content {
-            margin: 5% auto;
-            padding: 20px;
-            width: 90%;
-            max-width: 800px;
-            text-align: center;
+        .btn, .small-btn {
+            font-size: 0.9rem;
+            padding: 10px 20px;
+            margin: 0.25rem;
         }
 
-                .quick-open-content img,
-        .quick-open-content video,
-        .quick-open-content audio {
-            max-width: 100%;
-            max-height: 70vh;
-            margin-bottom: 20px;
+        .file-types {
+            font-size: 0.7rem;
         }
 
-        .quick-open-content iframe {
-            width: 100%;
-            height: 70vh;
-            border: none;
+        .modal-content, .history-modal-content {
+            width: 95%;
+            margin: 5% auto;
+            padding: 15px;
         }
 
-        @media (max-width: 480px) {
-            .container {
-                padding: 1.5rem;
-            }
-
-            h1 {
-                font-size: 1.5rem;
-            }
-
-            .btn, .small-btn {
-                font-size: 0.9rem;
-                padding: 10px 20px;
-                margin: 0.25rem;
-            }
-
-            .file-types {
-                font-size: 0.7rem;
-            }
-
-            .modal-content, .history-modal-content {
-                width: 95%;
-                margin: 5% auto;
-                padding: 15px;
-            }
-
-            .history-item {
-                flex-direction: column;
-                align-items: flex-start;
-            }
+        .history-item {
+            flex-direction: column;
+            align-items: flex-start;
+        }
 
-            .history-item-actions {
-                margin-top: 10px;
-                flex-wrap: wrap;
-            }
+        .history-item-actions {
+            margin-top: 10px;
+            flex-wrap: wrap;
+        }
 
-            .history-item-name {
-                font-size: 0.9rem;
-            }
+        .history-item-name {
+            font-size: 0.9rem;
+        }
 
-            .drop-zone {
-                padding: 15px;
-            }
+        .drop-zone {
+            padding: 15px;
+        }
 
-            .drop-zone p {
-                font-size: 0.9rem;
-            }
+        .drop-zone p {
+            font-size: 0.9rem;
+        }
 
-            .result-link {
-                font-size: 0.9rem;
-            }
+        .result-link {
+            font-size: 0.9rem;
+        }
 
-            .link-buttons {
-                flex-direction: column;
-                align-items: stretch;
-            }
+        .link-buttons {
+            flex-direction: column;
+            align-items: stretch;
+        }
 
-            .link-buttons .small-btn {
-                margin: 0.25rem 0;
-            }
+        .link-buttons .small-btn {
+            margin: 0.25rem 0;
+        }
 
-            .close {
-                top: 5px;
-                right: 10px;
-                font-size: 24px;
-            }
+        .close {
+            top: 5px;
+            right: 10px;
+            font-size: 24px;
+        }
 
-            .quick-open-content {
-                margin: 10% auto;
-                padding: 10px;
-            }
+                .quick-open-content {
+            margin: 10% auto;
+            padding: 10px;
         }
-    </style>
+    }
+</style>
 </head>
 <body>
     <div class="container">
@@ -637,26 +642,18 @@ HTML_CONTENT = """
             }
         });
 
-        span[0].onclick = function() {
-            modal.style.display = "none";
-        }
-
-        span[1].onclick = function() {
-            historyModal.style.display = "none";
-        }
-
-        span[2].onclick = function() {
-            quickOpenModal.style.display = "none";
+        for (let i = 0; i < span.length; i++) {
+            span[i].onclick = function() {
+                modal.style.display = "none";
+                historyModal.style.display = "none";
+                quickOpenModal.style.display = "none";
+            }
         }
 
         window.onclick = function(event) {
-            if (event.target == modal) {
+            if (event.target == modal || event.target == historyModal || event.target == quickOpenModal) {
                 modal.style.display = "none";
-            }
-            if (event.target == historyModal) {
                 historyModal.style.display = "none";
-            }
-            if (event.target == quickOpenModal) {
                 quickOpenModal.style.display = "none";
             }
         }
@@ -677,10 +674,6 @@ HTML_CONTENT = """
                 const file = e.target.files[0];
                 fileName.textContent = file.name;
                 uploadBtn.style.display = 'inline-block';
-                
-                const dataTransfer = new DataTransfer();
-                dataTransfer.items.add(file);
-                fileInput.files = dataTransfer.files;
             }
         }
 
@@ -698,44 +691,29 @@ HTML_CONTENT = """
             const formData = new FormData();
             formData.append('file', file);
 
-            while (true) {
-                try {
-                    const xhr = new XMLHttpRequest();
-                    xhr.open('POST', '/upload', true);
-                    xhr.upload.onprogress = (event) => updateProgress(event, progressBar.querySelector('.progress'));
-                    
-                    xhr.onload = function() {
-                        if (xhr.status === 200) {
-                            const response = JSON.parse(xhr.responseText);
-                            if (response.url) {
-                                addResultLink(response.url, file.name, response.originalExtension);
-                                saveToHistory(file.name, response.url, response.originalExtension);
-                                resetUploadState();
-                                return;
-                            } else {
-                                throw new Error('Upload failed: ' + response.error);
-                            }
-                        } else {
-                            throw new Error(`HTTP error! status: ${xhr.status}`);
-                        }
-                    };
-
-                    xhr.onerror = function() {
-                        throw new Error('Network error occurred');
-                    };
+            try {
+                const response = await fetch('/upload', {
+                    method: 'POST',
+                    body: formData
+                });
 
-                    xhr.send(formData);
+                if (!response.ok) {
+                    throw new Error(`HTTP error! status: ${response.status}`);
+                }
 
-                    await new Promise((resolve, reject) => {
-                        xhr.onloadend = resolve;
-                        xhr.onerror = reject;
-                    });
+                const result = await response.json();
 
-                    break;
-                } catch (error) {
-                    console.error('Upload error:', error);
-                    await new Promise(resolve => setTimeout(resolve, 1000));
+                if (result.url) {
+                    addResultLink(result.url, file.name, result.originalExtension);
+                    saveToHistory(file.name, result.url, result.originalExtension);
+                } else {
+                    throw new Error('Upload failed: ' + result.error);
                 }
+            } catch (error) {
+                console.error('Upload error:', error);
+                alert('Upload failed. Please try again.');
+            } finally {
+                resetUploadState();
             }
         }
 
@@ -755,19 +733,13 @@ HTML_CONTENT = """
             return container;
         }
 
-        function updateProgress(event, progressBar) {
-            if (event.lengthComputable) {
-                const percentComplete = (event.loaded / event.total) * 100;
-                progressBar.style.width = percentComplete + '%';
-            }
-        }
-
         function resetUploadState() {
             fileInput.value = '';
             fileName.textContent = '';
             uploadBtn.style.display = 'none';
             uploadBtn.disabled = false;
             loadingSpinner.style.display = 'none';
+            progressContainer.style.display = 'none';
         }
 
         function addResultLink(url, fileName, originalExtension) {
@@ -889,7 +861,7 @@ HTML_CONTENT = """
             historyModal.style.display = "block";
         }
 
-                function quickOpen(url, fileName, originalExtension) {
+        function quickOpen(url, fileName, originalExtension) {
             quickOpenContent.innerHTML = '';
             const fullUrl = window.location.origin + url;
             
@@ -931,7 +903,17 @@ HTML_CONTENT = """
 
             quickOpenModal.style.display = "block";
         }
-    </script>
+
+        if ('serviceWorker' in navigator) {
+            window.addEventListener('load', () => {
+                navigator.serviceWorker.register('/sw.js').then(registration => {
+                    console.log('ServiceWorker registration successful with scope: ', registration.scope);
+                }, err => {
+                    console.log('ServiceWorker registration failed: ', err);
+                });
+            });
+        }
+        </script>
 </body>
 </html>
 """
@@ -947,7 +929,7 @@ async def handle_upload(file: UploadFile = File(...)):
 
     cookies = await get_cookies()
     if 'csrftoken' not in cookies or 'sessionid' not in cookies:
-        return JSONResponse(content={"error": "Failed"}, status_code=500)
+        return JSONResponse(content={"error": "Failed to obtain necessary cookies."}, status_code=500)
 
     original_extension = os.path.splitext(file.filename)[1][1:]
     supported_types = ['mp4', 'png', 'jpg', 'jpeg', 'gif', 'mp3', 'pdf', 'txt']
@@ -961,12 +943,12 @@ async def handle_upload(file: UploadFile = File(...)):
 
     upload_result = await initiate_upload(cookies, temp_filename, content_type)
     if not upload_result or 'upload_url' not in upload_result:
-        return JSONResponse(content={"error": "Failed to upload"}, status_code=500)
+        return JSONResponse(content={"error": "Failed to initiate upload."}, status_code=500)
 
     file_content = await file.read()
     upload_success = await retry_upload(upload_result['upload_url'], file_content, content_type)
     if not upload_success:
-        return JSONResponse(content={"error": "FAILED GOD MAN AFTER alot of attempts"}, status_code=500)
+        return JSONResponse(content={"error": "Failed to upload after multiple attempts."}, status_code=500)
 
     original_url = upload_result['serving_url']
     mirrored_url = f"/rbxg/{original_url.split('/pbxt/')[1]}"
@@ -1087,7 +1069,7 @@ async def upload_file(upload_url: str, file_content: bytes, content_type: str) -
         return False
 
 async def retry_upload(upload_url: str, file_content: bytes, content_type: str, max_retries: int = 5, delay: int = 1) -> bool:
-    while True:
+    for _ in range(max_retries):
         try:
             success = await upload_file(upload_url, file_content, content_type)
             if success: