Update app.py

app.py

@@ -6,7 +6,6 @@ import asyncio
 from typing import Dict
 import os
 import mimetypes
-import uuid
 
 app = FastAPI()
 
@@ -426,7 +425,7 @@ HTML_CONTENT = """
             gap: 5px;
         }
 
-                .quick-open-modal {
+        .quick-open-modal {
             display: none;
             position: fixed;
             z-index: 4;
@@ -446,7 +445,7 @@ HTML_CONTENT = """
             text-align: center;
         }
 
-        .quick-open-content img,
+                .quick-open-content img,
         .quick-open-content video,
         .quick-open-content audio {
             max-width: 100%;
@@ -538,12 +537,12 @@ HTML_CONTENT = """
         <h1>Radd PRO Uploader</h1>
         <form id="uploadForm">
             <div id="dropZone" class="drop-zone">
-                <input type="file" name="file" id="file" class="file-input" accept="*" required multiple>
-                <label for="file" class="btn">Choose Files</label>
-                <p>or drag and drop files here/paste image</p>
+                <input type="file" name="file" id="file" class="file-input" accept="*" required>
+                <label for="file" class="btn">Choose File</label>
+                <p>or drag and drop file here/paste image</p>
             </div>
             <div class="file-name" id="fileName"></div>
-            <button type="submit" id="uploadBtn" class="btn" style="display: none; margin-top: 1rem;">Upload Files</button>
+            <button type="submit" id="uploadBtn" class="btn" style="display: none; margin-top: 1rem;">Upload File</button>
             <div class="progress-container" id="progressContainer"></div>
             <div class="loading-spinner" id="loadingSpinner"></div>
         </form>
@@ -603,15 +602,12 @@ HTML_CONTENT = """
         const historyList = document.getElementById('historyList');
         const quickOpenContent = document.getElementById('quickOpenContent');
 
-        let pastedFiles = [];
-
         fileInput.addEventListener('change', handleFileSelect);
 
         uploadForm.addEventListener('submit', (e) => {
             e.preventDefault();
-            const filesToUpload = fileInput.files.length > 0 ? Array.from(fileInput.files) : pastedFiles;
-            if (filesToUpload.length > 0) {
-                uploadFiles(filesToUpload);
+            if (fileInput.files.length > 0) {
+                uploadFile(fileInput.files[0]);
             }
         });
 
@@ -635,22 +631,12 @@ HTML_CONTENT = """
             for (let i = 0; i < items.length; i++) {
                 if (items[i].kind === 'file') {
                     const file = items[i].getAsFile();
-                    const newFileName = `pasted_image_${Date.now()}.png`;
-                    const renamedFile = new File([file], newFileName, { type: file.type });
-                    pastedFiles.push(renamedFile);
+                    handleFileSelect({ target: { files: [file] } });
+                    break;
                 }
             }
-            if (pastedFiles.length > 0) {
-                updateFileNameDisplay();
-                uploadBtn.style.display = 'inline-block';
-            }
         });
 
-        function updateFileNameDisplay() {
-            const fileNames = pastedFiles.map(file => file.name).join(', ');
-            fileName.textContent = fileNames;
-        }
-
         span[0].onclick = function() {
             modal.style.display = "none";
         }
@@ -688,14 +674,17 @@ HTML_CONTENT = """
 
         function handleFileSelect(e) {
             if (e.target.files && e.target.files.length > 0) {
-                const fileNames = Array.from(e.target.files).map(file => file.name).join(', ');
-                fileName.textContent = fileNames;
+                const file = e.target.files[0];
+                fileName.textContent = file.name;
                 uploadBtn.style.display = 'inline-block';
-                pastedFiles = []; // Clear pasted files when new files are selected
+                
+                const dataTransfer = new DataTransfer();
+                dataTransfer.items.add(file);
+                fileInput.files = dataTransfer.files;
             }
         }
 
-        async function uploadFiles(files) {
+        async function uploadFile(file) {
             progressContainer.innerHTML = '';
             progressContainer.style.display = 'block';
             loadingSpinner.style.display = 'block';
@@ -703,37 +692,51 @@ HTML_CONTENT = """
             resultContainer.innerHTML = '';
             resultContainer.style.display = 'none';
 
-            for (let file of files) {
-                const progressBar = createProgressBar(file.name);
-                progressContainer.appendChild(progressBar);
+            const progressBar = createProgressBar(file.name);
+            progressContainer.appendChild(progressBar);
 
-                const formData = new FormData();
-                formData.append('file', file);
+            const formData = new FormData();
+            formData.append('file', file);
 
+            while (true) {
                 try {
-                    const response = await fetch('/upload', {
-                        method: 'POST',
-                        body: formData
-                    });
-
-                    if (response.ok) {
-                        const result = await response.json();
-                        if (result.url) {
-                            addResultLink(result.url, file.name, result.originalExtension);
-                            saveToHistory(file.name, result.url, result.originalExtension);
+                    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('Upload failed: ' + result.error);
+                            throw new Error(`HTTP error! status: ${xhr.status}`);
                         }
-                    } else {
-                        throw new Error(`HTTP error! status: ${response.status}`);
-                    }
+                    };
+
+                    xhr.onerror = function() {
+                        throw new Error('Network error occurred');
+                    };
+
+                    xhr.send(formData);
+
+                    await new Promise((resolve, reject) => {
+                        xhr.onloadend = resolve;
+                        xhr.onerror = reject;
+                    });
+
+                    break;
                 } catch (error) {
                     console.error('Upload error:', error);
-                    alert(`Failed to upload ${file.name}: ${error.message}`);
+                    await new Promise(resolve => setTimeout(resolve, 1000));
                 }
             }
-
-            resetUploadState();
         }
 
         function createProgressBar(fileName) {
@@ -752,13 +755,19 @@ 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';
-            pastedFiles = [];
         }
 
         function addResultLink(url, fileName, originalExtension) {
@@ -863,7 +872,7 @@ HTML_CONTENT = """
                 };
                 actionsContainer.appendChild(openBtn);
 
-                                if (item.originalExtension.toLowerCase() === 'mp4') {
+                if (item.originalExtension.toLowerCase() === 'mp4') {
                     const embedBtn = document.createElement('button');
                     embedBtn.textContent = 'Embed';
                     embedBtn.className = 'small-btn';
@@ -880,7 +889,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;
             
@@ -920,7 +929,7 @@ HTML_CONTENT = """
                 quickOpenContent.appendChild(link);
             }
 
-                        quickOpenModal.style.display = "block";
+            quickOpenModal.style.display = "block";
         }
     </script>
 </body>
@@ -938,7 +947,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 to get cookies"}, status_code=500)
+        return JSONResponse(content={"error": "Failed"}, status_code=500)
 
     original_extension = os.path.splitext(file.filename)[1][1:]
     supported_types = ['mp4', 'png', 'jpg', 'jpeg', 'gif', 'mp3', 'pdf', 'txt']
@@ -952,12 +961,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 initiate upload"}, status_code=500)
+        return JSONResponse(content={"error": "Failed to 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 to upload after multiple attempts"}, status_code=500)
+        return JSONResponse(content={"error": "FAILED GOD MAN AFTER alot of attempts"}, status_code=500)
 
     original_url = upload_result['serving_url']
     mirrored_url = f"/rbxg/{original_url.split('/pbxt/')[1]}"
@@ -1078,7 +1087,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:
-    for _ in range(max_retries):
+    while True:
         try:
             success = await upload_file(upload_url, file_content, content_type)
             if success:
@@ -1090,4 +1099,4 @@ async def retry_upload(upload_url: str, file_content: bytes, content_type: str,
         await asyncio.sleep(delay)
         delay = min(delay * 2, 60)
     
-    return False
+    return False