Update app.py

app.py

@@ -1,12 +1,9 @@
-from fastapi import FastAPI, File, UploadFile, Request, HTTPException
-from fastapi.responses import HTMLResponse, JSONResponse, StreamingResponse, RedirectResponse
+from fastapi import FastAPI, File, UploadFile, Request
+from fastapi.responses import HTMLResponse, JSONResponse, StreamingResponse
 import requests
 import time
 import asyncio
 from typing import Dict
-import base64
-import hashlib
-from cryptography.fernet import Fernet
 
 app = FastAPI()
 
@@ -409,7 +406,41 @@ HTML_CONTENT = """
             gap: 5px;
         }
 
-        @media (max-width: 480px) {
+        .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;
             }
@@ -428,7 +459,7 @@ HTML_CONTENT = """
                 font-size: 0.7rem;
             }
 
-                        .modal-content, .history-modal-content {
+            .modal-content, .history-modal-content {
                 width: 95%;
                 margin: 5% auto;
                 padding: 15px;
@@ -474,6 +505,11 @@ HTML_CONTENT = """
                 right: 10px;
                 font-size: 24px;
             }
+
+            .quick-open-content {
+                margin: 10% auto;
+                padding: 10px;
+            }
         }
     </style>
 </head>
@@ -518,6 +554,13 @@ HTML_CONTENT = """
         </div>
     </div>
 
+    <div id="quickOpenModal" class="quick-open-modal">
+        <div class="quick-open-content">
+            <span class="close">&times;</span>
+            <div id="quickOpenContent"></div>
+        </div>
+    </div>
+
     <script>
         const fileInput = document.getElementById('file');
         const fileName = document.getElementById('fileName');
@@ -528,11 +571,13 @@ HTML_CONTENT = """
         const dropZone = document.getElementById('dropZone');
         const modal = document.getElementById('embedModal');
         const historyModal = document.getElementById('historyModal');
+        const quickOpenModal = document.getElementById('quickOpenModal');
         const span = document.getElementsByClassName("close");
         const embedLinkInput = document.getElementById('embedLink');
         const uploadBtn = document.getElementById('uploadBtn');
         const historyBtn = document.getElementById('historyBtn');
         const historyList = document.getElementById('historyList');
+        const quickOpenContent = document.getElementById('quickOpenContent');
 
         fileInput.addEventListener('change', handleFileSelect);
 
@@ -577,6 +622,10 @@ HTML_CONTENT = """
             historyModal.style.display = "none";
         }
 
+        span[2].onclick = function() {
+            quickOpenModal.style.display = "none";
+        }
+
         window.onclick = function(event) {
             if (event.target == modal) {
                 modal.style.display = "none";
@@ -584,6 +633,9 @@ HTML_CONTENT = """
             if (event.target == historyModal) {
                 historyModal.style.display = "none";
             }
+            if (event.target == quickOpenModal) {
+                quickOpenModal.style.display = "none";
+            }
         }
 
         historyBtn.onclick = function() {
@@ -723,17 +775,6 @@ HTML_CONTENT = """
                 buttonsContainer.appendChild(embedBtn);
             }
 
-            const encryptBtn = document.createElement('button');
-            encryptBtn.textContent = 'Encrypt Link';
-            encryptBtn.className = 'small-btn encrypt-btn';
-            encryptBtn.onclick = () => {
-                const encryptedUrl = encryptUrl(url);
-                navigator.clipboard.writeText(encryptedUrl).then(() => {
-                    alert('Encrypted link copied to clipboard!');
-                });
-            };
-            buttonsContainer.appendChild(encryptBtn);
-
             linkContainer.appendChild(buttonsContainer);
 
             resultContainer.appendChild(linkContainer);
@@ -792,6 +833,14 @@ HTML_CONTENT = """
                 };
                 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';
@@ -803,32 +852,54 @@ HTML_CONTENT = """
                     actionsContainer.appendChild(embedBtn);
                 }
 
-                const encryptBtn = document.createElement('button');
-                encryptBtn.textContent = 'Encrypt';
-                encryptBtn.className = 'small-btn';
-                encryptBtn.onclick = () => {
-                    const encryptedUrl = encryptUrl(item.url);
-                    navigator.clipboard.writeText(encryptedUrl).then(() => {
-                        alert('Encrypted link copied to clipboard!');
-                    });
-                };
-                actionsContainer.appendChild(encryptBtn);
-
                 historyItem.appendChild(actionsContainer);
                 historyList.appendChild(historyItem);
             });
             historyModal.style.display = "block";
         }
 
-        function encryptUrl(url) {
-            const browserInfo = navigator.userAgent + navigator.language + screen.width + screen.height + new Date().getTimezoneOffset();
-            const key = CryptoJS.SHA256(browserInfo).toString();
-            const encryptedData = CryptoJS.AES.encrypt(url, key).toString();
-            const encryptedUrl = `${window.location.origin}/decrypt?data=${encodeURIComponent(encryptedData)}`;
-            return encryptedUrl;
+                function quickOpen(url, fileName) {
+            quickOpenContent.innerHTML = '';
+            const fullUrl = window.location.origin + url;
+            
+            if (fileName.match(/\.(jpeg|jpg|gif|png)$/i)) {
+                const img = document.createElement('img');
+                img.src = fullUrl;
+                img.alt = fileName;
+                quickOpenContent.appendChild(img);
+            } else if (fileName.toLowerCase().endsWith('.mp4')) {
+                const video = document.createElement('video');
+                video.src = fullUrl;
+                video.controls = true;
+                quickOpenContent.appendChild(video);
+            } else if (fileName.toLowerCase().endsWith('.mp3')) {
+                const audio = document.createElement('audio');
+                audio.src = fullUrl;
+                audio.controls = true;
+                quickOpenContent.appendChild(audio);
+            } else if (fileName.toLowerCase().endsWith('.pdf')) {
+                const iframe = document.createElement('iframe');
+                iframe.src = fullUrl;
+                quickOpenContent.appendChild(iframe);
+            } else if (fileName.toLowerCase().endsWith('.txt')) {
+                fetch(fullUrl)
+                    .then(response => response.text())
+                    .then(text => {
+                        const pre = document.createElement('pre');
+                        pre.textContent = text;
+                        quickOpenContent.appendChild(pre);
+                    });
+            } else {
+                const link = document.createElement('a');
+                link.href = fullUrl;
+                link.textContent = 'Download ' + fileName;
+                link.target = '_blank';
+                quickOpenContent.appendChild(link);
+            }
+
+            quickOpenModal.style.display = "block";
         }
     </script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.1.1/crypto-js.min.js"></script>
 </body>
 </html>
 """
@@ -881,23 +952,6 @@ async def handle_video_stream(path: str, request: Request):
 
     return StreamingResponse(generate(), status_code=response.status_code, headers=headers)
 
-@app.get("/e/{encrypted_data}")
-async def handle_encrypted_stream(encrypted_data: str, request: Request):
-    try:
-        browser_info = request.headers.get('User-Agent', '') + request.headers.get('Accept-Language', '') + str(request.client.host)
-        key = hashlib.sha256(browser_info.encode()).hexdigest()[:32].encode()
-        fernet = Fernet(base64.urlsafe_b64encode(key))
-        
-        decrypted_url = fernet.decrypt(encrypted_data.encode()).decode()
-        
-        if not decrypted_url.startswith('/rbxg/'):
-            raise ValueError("Invalid decrypted URL")
-        
-        path = decrypted_url.split('/rbxg/')[1]
-        return await handle_video_stream(path, request)
-    except Exception as e:
-        raise HTTPException(status_code=400, detail="Invalid or expired link")
-
 @app.get("/embed")
 async def embed_video(url: str, thumbnail: str):
     html = f'''
@@ -980,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:
@@ -993,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)