Update app.py

app.py

@@ -3,9 +3,7 @@ from fastapi.responses import HTMLResponse, JSONResponse, StreamingResponse
 import requests
 import time
 import asyncio
-from typing import Dict, List
-import uuid
-import os
+from typing import Dict
 
 app = FastAPI()
 
@@ -420,7 +418,7 @@ HTML_CONTENT = """
             overflow: auto;
         }
 
-                .quick-open-content {
+        .quick-open-content {
             margin: 5% auto;
             padding: 20px;
             width: 90%;
@@ -442,7 +440,7 @@ HTML_CONTENT = """
             border: none;
         }
 
-        @media (max-width: 480px) {
+                @media (max-width: 480px) {
             .container {
                 padding: 1.5rem;
             }
@@ -520,12 +518,12 @@ HTML_CONTENT = """
         <h1>Radd PRO Uploader</h1>
         <form id="uploadForm">
             <div id="dropZone" class="drop-zone">
-                <input type="file" name="files" id="files" class="file-input" accept=".zip,.mp4,.txt,.mp3,image/*,.pdf" required multiple>
-                <label for="files" class="btn">Choose Files</label>
-                <p>or drag and drop files here/paste images</p>
+                <input type="file" name="file" id="file" class="file-input" accept=".zip,.mp4,.txt,.mp3,image/*,.pdf" 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>
@@ -564,7 +562,7 @@ HTML_CONTENT = """
     </div>
 
     <script>
-        const fileInput = document.getElementById('files');
+        const fileInput = document.getElementById('file');
         const fileName = document.getElementById('fileName');
         const uploadForm = document.getElementById('uploadForm');
         const progressContainer = document.getElementById('progressContainer');
@@ -586,7 +584,7 @@ HTML_CONTENT = """
         uploadForm.addEventListener('submit', (e) => {
             e.preventDefault();
             if (fileInput.files.length > 0) {
-                uploadFiles(fileInput.files);
+                uploadFile(fileInput.files[0]);
             }
         });
 
@@ -646,13 +644,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';
+                
+                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';
@@ -660,32 +662,73 @@ HTML_CONTENT = """
             resultContainer.innerHTML = '';
             resultContainer.style.display = 'none';
 
-            const formData = new FormData();
-            for (let i = 0; i < files.length; i++) {
-                formData.append('files', files[i]);
-            }
+            const progressBar = createProgressBar(file.name);
+            progressContainer.appendChild(progressBar);
 
-            try {
-                const response = await fetch('/upload', {
-                    method: 'POST',
-                    body: formData
-                });
+            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);
+                                saveToHistory(file.name, response.url);
+                                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');
+                    };
+
+                    xhr.send(formData);
+
+                    await new Promise((resolve, reject) => {
+                        xhr.onloadend = resolve;
+                        xhr.onerror = reject;
+                    });
 
-                if (response.ok) {
-                    const result = await response.json();
-                    if (result.folder_url) {
-                        addFolderResult(result.folder_url, result.files);
-                    } else {
-                        throw new Error('Upload failed: No folder URL received');
-                    }
-                } else {
-                    throw new Error(`HTTP error! status: ${response.status}`);
+                    break;
+                } catch (error) {
+                    console.error('Upload error:', error);
+                    await new Promise(resolve => setTimeout(resolve, 1000));
                 }
-            } catch (error) {
-                console.error('Upload error:', error);
-                alert('Upload failed. Please try again.');
-            } finally {
-                resetUploadState();
+            }
+        }
+
+        function createProgressBar(fileName) {
+            const progressBarContainer = document.createElement('div');
+            progressBarContainer.className = 'progress-bar';
+            const progress = document.createElement('div');
+            progress.className = 'progress';
+            progressBarContainer.appendChild(progress);
+            const label = document.createElement('div');
+            label.textContent = fileName;
+            label.style.fontSize = '0.8rem';
+            label.style.marginBottom = '5px';
+            const container = document.createElement('div');
+            container.appendChild(label);
+            container.appendChild(progressBarContainer);
+            return container;
+        }
+
+        function updateProgress(event, progressBar) {
+            if (event.lengthComputable) {
+                const percentComplete = (event.loaded / event.total) * 100;
+                progressBar.style.width = percentComplete + '%';
             }
         }
 
@@ -695,46 +738,47 @@ HTML_CONTENT = """
             uploadBtn.style.display = 'none';
             uploadBtn.disabled = false;
             loadingSpinner.style.display = 'none';
-            progressContainer.style.display = 'none';
-        }
-
-        function addFolderResult(folderUrl, files) {
-            const folderContainer = document.createElement('div');
-            folderContainer.className = 'folder-result';
-
-            const folderLink = document.createElement('a');
-            folderLink.href = folderUrl;
-            folderLink.textContent = 'View Folder';
-            folderLink.className = 'result-link';
-            folderLink.target = '_blank';
-            folderContainer.appendChild(folderLink);
-
-            const copyFolderBtn = document.createElement('button');
-            copyFolderBtn.textContent = 'Copy Folder Link';
-            copyFolderBtn.className = 'small-btn';
-            copyFolderBtn.onclick = () => {
-                navigator.clipboard.writeText(window.location.origin + folderUrl).then(() => {
-                    alert('Folder link copied to clipboard!');
+        }
+
+        function addResultLink(url, fileName) {
+            const linkContainer = document.createElement('div');
+            linkContainer.style.marginBottom = '10px';
+
+            const link = document.createElement('a');
+            link.href = url;
+            link.textContent = `View ${fileName}`;
+            link.className = 'result-link';
+            link.target = '_blank';
+
+            linkContainer.appendChild(link);
+
+            const buttonsContainer = document.createElement('div');
+            buttonsContainer.className = 'link-buttons';
+
+            const copyBtn = document.createElement('button');
+            copyBtn.textContent = 'Copy Link';
+            copyBtn.className = 'small-btn copy-btn';
+            copyBtn.onclick = () => {
+                navigator.clipboard.writeText(window.location.origin + url).then(() => {
+                    alert('Link copied to clipboard!');
                 });
             };
-            folderContainer.appendChild(copyFolderBtn);
-
-            const fileList = document.createElement('ul');
-            files.forEach(file => {
-                const listItem = document.createElement('li');
-                const fileLink = document.createElement('a');
-                fileLink.href = file.url;
-                fileLink.textContent = file.name;
-                fileLink.target = '_blank';
-                listItem.appendChild(fileLink);
-                fileList.appendChild(listItem);
-            });
-            folderContainer.appendChild(fileList);
+            buttonsContainer.appendChild(copyBtn);
+
+            if (fileName.toLowerCase().endsWith('.mp4')) {
+                const embedBtn = document.createElement('button');
+                embedBtn.textContent = 'Embed Video for Discord';
+                embedBtn.className = 'small-btn embed-btn';
+                embedBtn.onclick = () => {
+                    showEmbedModal(url);
+                };
+                buttonsContainer.appendChild(embedBtn);
+            }
 
-            resultContainer.appendChild(folderContainer);
-            resultContainer.style.display = 'block';
+            linkContainer.appendChild(buttonsContainer);
 
-            saveToHistory(folderUrl, files);
+            resultContainer.appendChild(linkContainer);
+            resultContainer.style.display = 'block';
         }
 
         function showEmbedModal(url) {
@@ -749,9 +793,9 @@ HTML_CONTENT = """
             alert('Embed link copied to clipboard!');
         }
 
-        function saveToHistory(folderUrl, files) {
+        function saveToHistory(fileName, url) {
             let history = JSON.parse(localStorage.getItem('uploadHistory')) || [];
-            history.unshift({ folderUrl, files, timestamp: new Date().toISOString() });
+            history.unshift({ fileName, url, timestamp: new Date().toISOString() });
             if (history.length > 500) history = history.slice(0, 500);
             localStorage.setItem('uploadHistory', JSON.stringify(history));
         }
@@ -765,37 +809,56 @@ HTML_CONTENT = """
                 
                 const itemName = document.createElement('span');
                 itemName.className = 'history-item-name';
-                itemName.textContent = `Folder: ${new Date(item.timestamp).toLocaleString()}`;
+                itemName.textContent = item.fileName;
                 historyItem.appendChild(itemName);
 
                 const actionsContainer = document.createElement('div');
                 actionsContainer.className = 'history-item-actions';
 
                 const copyBtn = document.createElement('button');
-                copyBtn.textContent = 'Copy Folder Link';
+                copyBtn.textContent = 'Copy Link';
                 copyBtn.className = 'small-btn';
                 copyBtn.onclick = () => {
-                    navigator.clipboard.writeText(window.location.origin + item.folderUrl).then(() => {
-                        alert('Folder link copied to clipboard!');
+                    navigator.clipboard.writeText(window.location.origin + item.url).then(() => {
+                        alert('Link copied to clipboard!');
                     });
                 };
                 actionsContainer.appendChild(copyBtn);
 
                 const openBtn = document.createElement('button');
-                openBtn.textContent = 'Open Folder';
+                openBtn.textContent = 'Open';
                 openBtn.className = 'small-btn';
                 openBtn.onclick = () => {
-                    window.open(window.location.origin + item.folderUrl, '_blank');
+                    window.open(window.location.origin + item.url, '_blank');
                 };
                 actionsContainer.appendChild(openBtn);
 
+                const quickOpenBtn = document.createElement('button');
+                quickOpenBtn.textContent = 'Quick Open';
+                quickOpenBtn.className = 'small-btn';
+                quickOpenBtn.onclick = () => {
+                    quickOpen(item.url, item.fileName);
+                };
+                actionsContainer.appendChild(quickOpenBtn);
+
+                if (item.fileName.toLowerCase().endsWith('.mp4')) {
+                    const embedBtn = document.createElement('button');
+                    embedBtn.textContent = 'Embed';
+                    embedBtn.className = 'small-btn';
+                    embedBtn.onclick = () => {
+                        showEmbedModal(item.url);
+                        historyModal.style.display = "none";
+                    };
+                    actionsContainer.appendChild(embedBtn);
+                }
+
                 historyItem.appendChild(actionsContainer);
                 historyList.appendChild(historyItem);
             });
             historyModal.style.display = "block";
         }
 
-        function quickOpen(url, fileName) {
+                function quickOpen(url, fileName) {
             quickOpenContent.innerHTML = '';
             const fullUrl = window.location.origin + url;
             
@@ -846,38 +909,31 @@ async def index():
     return HTML_CONTENT
 
 @app.post("/upload")
-async def handle_upload(files: List[UploadFile] = File(...)):
-    if not files:
-        return JSONResponse(content={"error": "No files selected."}, status_code=400)
+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)
 
-    folder_id = str(uuid.uuid4())
-    folder_path = os.path.join("uploads", folder_id)
-    os.makedirs(folder_path, exist_ok=True)
-
-    uploaded_files = []
-    for file in files:
-        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": f"Failed to initiate upload for {file.filename}"}, 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": f"File upload failed for {file.filename} after multiple attempts"}, 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/{folder_id}/{file.filename}"
-        uploaded_files.append({"name": file.filename, "url": mirrored_url})
+    original_url = upload_result['serving_url']
+    mirrored_url = f"/rbxg/{original_url.split('/pbxt/')[1]}"
 
-    return JSONResponse(content={"folder_url": f"/rbxg/{folder_id}", "files": uploaded_files})
+    return JSONResponse(content={"url": mirrored_url})
 
-@app.get("/rbxg/{folder_id}/{file_name}")
-async def handle_file_stream(folder_id: str, file_name: str, request: Request):
-    original_url = f'https://replicate.delivery/pbxt/{folder_id}/{file_name}'
+@app.get("/rbxg/{path:path}")
+async def handle_video_stream(path: str, request: Request):
+    original_url = f'https://replicate.delivery/pbxt/{path}'
     range_header = request.headers.get('Range')
 
     headers = {'Range': range_header} if range_header else {}
@@ -978,7 +1034,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:
@@ -991,7 +1047,3 @@ async def retry_upload(upload_url: str, file_content: bytes, content_type: str,
         delay = min(delay * 2, 60)  # Exponential backoff, capped at 60 seconds
     
     return False
-
-if __name__ == "__main__":
-    import uvicorn
-    uvicorn.run(app, host="0.0.0.0", port=7860)