Spaces:

coollsd
/

fileuploader

Running

App Files Files Community

coollsd commited on Sep 19, 2024

Commit

9e4646e

verified ·

1 Parent(s): cea9cc2

Update app.py

Browse files

Files changed (1) hide show

app.py +41 -70

app.py CHANGED Viewed

@@ -1,5 +1,6 @@
-from fastapi import FastAPI, File, UploadFile, Request
 from fastapi.responses import HTMLResponse, JSONResponse, StreamingResponse
 import requests
 import time
 import asyncio
@@ -7,6 +8,14 @@ from typing import Dict
 app = FastAPI()
 HTML_CONTENT = """
 <!DOCTYPE html>
 <html lang="en">
@@ -400,7 +409,7 @@ HTML_CONTENT = """
         const progressContainer = document.getElementById('progressContainer');
         const loadingSpinner = document.getElementById('loadingSpinner');
         const resultContainer = document.getElementById('resultContainer');
-        const dropZone = document.getElementById('dropZone');
         const modal = document.getElementById('embedModal');
         const span = document.getElementsByClassName("close")[0];
         const embedLinkInput = document.getElementById('embedLink');
@@ -408,14 +417,14 @@ HTML_CONTENT = """
         fileInput.addEventListener('change', handleFileSelect);
-        uploadForm.addEventListener('submit', (e) => {
             e.preventDefault();
             if (fileInput.files.length > 0) {
-                uploadFile(fileInput.files[0]);
             }
         });
-                dropZone.addEventListener('dragover', (e) => {
             e.preventDefault();
             dropZone.classList.add('drag-over');
         });
@@ -477,59 +486,27 @@ HTML_CONTENT = """
             const formData = new FormData();
             formData.append('file', file);
-            let uploadedBytes = 0;
-            let totalBytes = file.size;
-            while (uploadedBytes < totalBytes) {
-                try {
-                    const xhr = new XMLHttpRequest();
-                    xhr.open('POST', '/upload', true);
-                    xhr.setRequestHeader('Content-Range', `bytes ${uploadedBytes}-${totalBytes-1}/${totalBytes}`);
-                    xhr.upload.onprogress = (event) => updateProgress(event, progressBar.querySelector('.progress'), uploadedBytes);
-                    xhr.onload = function() {
-                        if (xhr.status === 200) {
-                            const response = JSON.parse(xhr.responseText);
-                            if (response.url) {
-                                addResultLink(response.url, file.name);
-                                resetUploadState();
-                                return;
-                            } else {
-                                throw new Error('Upload failed: ' + response.error);
-                            }
-                        } else if (xhr.status === 308) {
-                            // Partial upload successful, update uploadedBytes
-                            const range = xhr.getResponseHeader('Range');
-                            if (range) {
-                                uploadedBytes = parseInt(range.split('-')[1]) + 1;
-                            }
-                        } else {
-                            throw new Error(`HTTP error! status: ${xhr.status}`);
-                        }
-                    };
-                    xhr.onerror = function() {
-                        throw new Error('Network error occurred');
-                    };
-                    const chunk = file.slice(uploadedBytes, uploadedBytes + 1024 * 1024); // 1MB chunks
-                    xhr.send(chunk);
-                    // Wait for the request to complete
-                    await new Promise((resolve, reject) => {
-                        xhr.onloadend = resolve;
-                        xhr.onerror = reject;
-                    });
-                    if (uploadedBytes >= totalBytes) {
-                        break; // Upload complete
-                    }
-                } catch (error) {
-                    console.error('Upload error:', error);
-                    // Wait for a short time before retrying
-                    await new Promise(resolve => setTimeout(resolve, 1000));
-                    // The loop will continue, retrying the upload from where it left off
                 }
             }
         }
@@ -549,14 +526,6 @@ HTML_CONTENT = """
             return container;
         }
-        function updateProgress(event, progressBar, uploadedBytes) {
-            if (event.lengthComputable) {
-                const totalBytes = uploadedBytes + event.total;
-                const percentComplete = ((uploadedBytes + event.loaded) / totalBytes) * 100;
-                progressBar.style.width = percentComplete + '%';
-            }
-        }
         function resetUploadState() {
             fileInput.value = '';
             fileName.textContent = '';
@@ -628,21 +597,23 @@ async def index():
 @app.post("/upload")
 async def handle_upload(file: UploadFile = File(...)):
-    if not file.filename:
-        return JSONResponse(content={"error": "No file selected."}, status_code=400)
     cookies = await get_cookies()
     if 'csrftoken' not in cookies or 'sessionid' not in cookies:
-        return JSONResponse(content={"error": "Failed to obtain necessary cookies"}, status_code=500)
     upload_result = await initiate_upload(cookies, file.filename, file.content_type)
     if not upload_result or 'upload_url' not in upload_result:
-        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, file.content_type)
     if not upload_success:
-        return JSONResponse(content={"error": "File upload failed after multiple attempts"}, status_code=500)
     original_url = upload_result['serving_url']
     mirrored_url = f"/rbxg/{original_url.split('/pbxt/')[1]}"

+from fastapi import FastAPI, File, UploadFile, Request, HTTPException
 from fastapi.responses import HTMLResponse, JSONResponse, StreamingResponse
+from fastapi.middleware.cors import CORSMiddleware
 import requests
 import time
 import asyncio
 app = FastAPI()
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=["*"],
+    allow_credentials=True,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
 HTML_CONTENT = """
 <!DOCTYPE html>
 <html lang="en">
         const progressContainer = document.getElementById('progressContainer');
         const loadingSpinner = document.getElementById('loadingSpinner');
         const resultContainer = document.getElementById('resultContainer');
+                const dropZone = document.getElementById('dropZone');
         const modal = document.getElementById('embedModal');
         const span = document.getElementsByClassName("close")[0];
         const embedLinkInput = document.getElementById('embedLink');
         fileInput.addEventListener('change', handleFileSelect);
+        uploadForm.addEventListener('submit', async (e) => {
             e.preventDefault();
             if (fileInput.files.length > 0) {
+                await uploadFile(fileInput.files[0]);
             }
         });
+        dropZone.addEventListener('dragover', (e) => {
             e.preventDefault();
             dropZone.classList.add('drag-over');
         });
             const formData = new FormData();
             formData.append('file', file);
+            try {
+                const response = await fetch('/upload', {
+                    method: 'POST',
+                    body: formData
+                });
+                if (!response.ok) {
+                    throw new Error(`HTTP error! status: ${response.status}`);
+                }
+                const result = await response.json();
+                if (result.url) {
+                    addResultLink(result.url, file.name);
+                } else {
+                    throw new Error('Upload failed: ' + result.error);
                 }
+            } catch (error) {
+                console.error('Upload error:', error);
+                alert('Upload failed: ' + error.message);
+            } finally {
+                resetUploadState();
             }
         }
             return container;
         }
         function resetUploadState() {
             fileInput.value = '';
             fileName.textContent = '';
 @app.post("/upload")
 async def handle_upload(file: UploadFile = File(...)):
+    if not file:
+        raise HTTPException(status_code=400, detail="No file part")
+    if file.filename == '':
+        raise HTTPException(status_code=400, detail="No selected file")
     cookies = await get_cookies()
     if 'csrftoken' not in cookies or 'sessionid' not in cookies:
+        raise HTTPException(status_code=500, detail="Failed to obtain necessary cookies")
     upload_result = await initiate_upload(cookies, file.filename, file.content_type)
     if not upload_result or 'upload_url' not in upload_result:
+        raise HTTPException(status_code=500, detail="Failed to initiate upload")
     file_content = await file.read()
     upload_success = await retry_upload(upload_result['upload_url'], file_content, file.content_type)
     if not upload_success:
+        raise HTTPException(status_code=500, detail="File upload failed after multiple attempts")
     original_url = upload_result['serving_url']
     mirrored_url = f"/rbxg/{original_url.split('/pbxt/')[1]}"