Update app.py

app.py

@@ -4,6 +4,7 @@ import requests
 import time
 import asyncio
 from typing import Dict
+import os
 
 app = FastAPI()
 
@@ -435,7 +436,7 @@ HTML_CONTENT = """
             overflow: auto;
         }
 
-        .quick-open-content {
+                .quick-open-content {
             margin: 5% auto;
             padding: 20px;
             width: 90%;
@@ -535,7 +536,7 @@ 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=".zip,.mp4,.txt,.mp3,image/*,.pdf" required>
+                <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>
@@ -546,7 +547,7 @@ HTML_CONTENT = """
         </form>
         <div class="result-container" id="resultContainer"></div>
         <div class="file-types">
-            Allowed file types: .zip, .mp4, .txt, .mp3, all image types, .pdf
+            All file types are supported
         </div>
         <div class="history-btn-container">
             <button id="historyBtn" class="history-btn">View Upload History</button>
@@ -706,8 +707,8 @@ HTML_CONTENT = """
                         if (xhr.status === 200) {
                             const response = JSON.parse(xhr.responseText);
                             if (response.url) {
-                                addResultLink(response.url, file.name);
-                                saveToHistory(file.name, response.url);
+                                addResultLink(response.url, file.name, response.originalExtension);
+                                saveToHistory(file.name, response.url, response.originalExtension);
                                 resetUploadState();
                                 return;
                             } else {
@@ -768,7 +769,7 @@ HTML_CONTENT = """
             loadingSpinner.style.display = 'none';
         }
 
-        function addResultLink(url, fileName) {
+        function addResultLink(url, fileName, originalExtension) {
             const linkContainer = document.createElement('div');
             linkContainer.style.marginBottom = '10px';
 
@@ -777,6 +778,7 @@ HTML_CONTENT = """
             link.textContent = `View ${fileName}`;
             link.className = 'result-link';
             link.target = '_blank';
+            link.download = `${fileName.split('.')[0]}.${originalExtension}`;
 
             linkContainer.appendChild(link);
 
@@ -793,7 +795,7 @@ HTML_CONTENT = """
             };
             buttonsContainer.appendChild(copyBtn);
 
-            if (fileName.toLowerCase().endsWith('.mp4')) {
+            if (originalExtension.toLowerCase() === 'mp4') {
                 const embedBtn = document.createElement('button');
                 embedBtn.textContent = 'Embed Video for Discord';
                 embedBtn.className = 'small-btn embed-btn';
@@ -821,9 +823,9 @@ HTML_CONTENT = """
             alert('Embed link copied to clipboard!');
         }
 
-        function saveToHistory(fileName, url) {
+        function saveToHistory(fileName, url, originalExtension) {
             let history = JSON.parse(localStorage.getItem('uploadHistory')) || [];
-            history.unshift({ fileName, url, timestamp: new Date().toISOString() });
+            history.unshift({ fileName, url, originalExtension, timestamp: new Date().toISOString() });
             if (history.length > 500) history = history.slice(0, 500);
             localStorage.setItem('uploadHistory', JSON.stringify(history));
         }
@@ -853,7 +855,7 @@ HTML_CONTENT = """
                 };
                 actionsContainer.appendChild(copyBtn);
 
-                                const openBtn = document.createElement('button');
+                const openBtn = document.createElement('button');
                 openBtn.textContent = 'Open';
                 openBtn.className = 'small-btn';
                 openBtn.onclick = () => {
@@ -865,11 +867,11 @@ HTML_CONTENT = """
                 quickOpenBtn.textContent = 'Quick Open';
                 quickOpenBtn.className = 'small-btn';
                 quickOpenBtn.onclick = () => {
-                    quickOpen(item.url, item.fileName);
+                    quickOpen(item.url, item.fileName, item.originalExtension);
                 };
                 actionsContainer.appendChild(quickOpenBtn);
 
-                if (item.fileName.toLowerCase().endsWith('.mp4')) {
+                                if (item.originalExtension.toLowerCase() === 'mp4') {
                     const embedBtn = document.createElement('button');
                     embedBtn.textContent = 'Embed';
                     embedBtn.className = 'small-btn';
@@ -886,30 +888,30 @@ HTML_CONTENT = """
             historyModal.style.display = "block";
         }
 
-        function quickOpen(url, fileName) {
+        function quickOpen(url, fileName, originalExtension) {
             quickOpenContent.innerHTML = '';
             const fullUrl = window.location.origin + url;
             
-            if (fileName.match(/\.(jpeg|jpg|gif|png)$/i)) {
+            if (['jpeg', 'jpg', 'gif', 'png'].includes(originalExtension.toLowerCase())) {
                 const img = document.createElement('img');
                 img.src = fullUrl;
                 img.alt = fileName;
                 quickOpenContent.appendChild(img);
-            } else if (fileName.toLowerCase().endsWith('.mp4')) {
+            } else if (originalExtension.toLowerCase() === 'mp4') {
                 const video = document.createElement('video');
                 video.src = fullUrl;
                 video.controls = true;
                 quickOpenContent.appendChild(video);
-            } else if (fileName.toLowerCase().endsWith('.mp3')) {
+            } else if (originalExtension.toLowerCase() === 'mp3') {
                 const audio = document.createElement('audio');
                 audio.src = fullUrl;
                 audio.controls = true;
                 quickOpenContent.appendChild(audio);
-            } else if (fileName.toLowerCase().endsWith('.pdf')) {
+            } else if (originalExtension.toLowerCase() === 'pdf') {
                 const iframe = document.createElement('iframe');
                 iframe.src = fullUrl;
                 quickOpenContent.appendChild(iframe);
-            } else if (fileName.toLowerCase().endsWith('.txt')) {
+            } else if (originalExtension.toLowerCase() === 'txt') {
                 fetch(fullUrl)
                     .then(response => response.text())
                     .then(text => {
@@ -922,6 +924,7 @@ HTML_CONTENT = """
                 link.href = fullUrl;
                 link.textContent = 'Download ' + fileName;
                 link.target = '_blank';
+                link.download = `${fileName.split('.')[0]}.${originalExtension}`;
                 quickOpenContent.appendChild(link);
             }
 
@@ -945,22 +948,25 @@ async def handle_upload(file: UploadFile = File(...)):
     if 'csrftoken' not in cookies or 'sessionid' not in cookies:
         return JSONResponse(content={"error": "Failed"}, status_code=500)
 
-    upload_result = await initiate_upload(cookies, file.filename, file.content_type)
+    original_extension = os.path.splitext(file.filename)[1][1:]
+    temp_filename = f"{file.filename}.png"
+
+    upload_result = await initiate_upload(cookies, temp_filename, "image/png")
     if not upload_result or 'upload_url' not in upload_result:
         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, file.content_type)
+    upload_success = await retry_upload(upload_result['upload_url'], file_content, "image/png")
     if not upload_success:
         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]}"
 
-    return JSONResponse(content={"url": mirrored_url})
+    return JSONResponse(content={"url": mirrored_url, "originalExtension": original_extension})
 
 @app.get("/rbxg/{path:path}")
-async def handle_video_stream(path: str, request: Request):
+async def handle_file_stream(path: str, request: Request):
     original_url = f'https://replicate.delivery/pbxt/{path}'
     range_header = request.headers.get('Range')
 
@@ -1074,4 +1080,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