Spaces:

coollsd
/

fileuploader

Running

App Files Files Community

coollsd commited on about 17 hours ago

Commit

5e36128

•

1 Parent(s): b70a217

Update app.py

Browse files

Files changed (1) hide show

app.py +27 -16

app.py CHANGED Viewed

@@ -1,12 +1,17 @@
-from fastapi import FastAPI, File, UploadFile, Request
 from fastapi.responses import HTMLResponse, JSONResponse, StreamingResponse
 import aiohttp
 import asyncio
 from typing import Dict
 import io
 app = FastAPI()
 HTML_CONTENT = """
 <!DOCTYPE html>
 <html lang="en">
@@ -916,24 +921,28 @@ 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 get 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)
-    upload_success = await chunked_upload(upload_result['upload_url'], file, file.content_type)
-    if not upload_success:
-        return JSONResponse(content={"error": "Failed to upload file after multiple 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})
 @app.get("/rbxg/{path:path}")
 async def handle_video_stream(path: str, request: Request):
@@ -1019,6 +1028,8 @@ async def initiate_upload(cookies: Dict[str, str], filename: str, content_type:
     }
     async with aiohttp.ClientSession() as session:
         async with session.post(url, cookies=cookies, headers=headers) as response:
             return await response.json()
 async def chunked_upload(upload_url: str, file: UploadFile, content_type: str, chunk_size: int = 1024 * 1024) -> bool:
@@ -1046,7 +1057,7 @@ async def chunked_upload(upload_url: str, file: UploadFile, content_type: str, c
                             raise aiohttp.ClientError(f"Unexpected status code: {response.status}")
                 except aiohttp.ClientError as e:
                     if attempt == 4:  # Last attempt
-                        print(f"Upload failed: {str(e)}")
                         return False
                     await asyncio.sleep(2 ** attempt)  # Exponential backoff
             else:
@@ -1055,7 +1066,7 @@ async def chunked_upload(upload_url: str, file: UploadFile, content_type: str, c
         # Verify the upload
         async with session.put(upload_url, headers={'Content-Range': f'bytes */{file_size}'}) as response:
             if response.status not in [200, 201, 204]:
-                print(f"Upload verification failed: {response.status}")
                 return False
     return True

+from fastapi import FastAPI, File, UploadFile, Request, HTTPException
 from fastapi.responses import HTMLResponse, JSONResponse, StreamingResponse
 import aiohttp
 import asyncio
 from typing import Dict
 import io
+import logging
 app = FastAPI()
+# Set up logging
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
 HTML_CONTENT = """
 <!DOCTYPE html>
 <html lang="en">
 @app.post("/upload")
 async def handle_upload(file: UploadFile = File(...)):
     if not file.filename:
+        raise HTTPException(status_code=400, detail="No file selected.")
+    try:
+        cookies = await get_cookies()
+        if 'csrftoken' not in cookies or 'sessionid' not in cookies:
+            raise HTTPException(status_code=500, detail="Failed to get 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")
+        upload_success = await chunked_upload(upload_result['upload_url'], file, file.content_type)
+        if not upload_success:
+            raise HTTPException(status_code=500, detail="Failed to upload file after multiple attempts")
+        original_url = upload_result['serving_url']
+        mirrored_url = f"/rbxg/{original_url.split('/pbxt/')[1]}"
+        return JSONResponse(content={"url": mirrored_url})
+    except Exception as e:
+        logger.error(f"Upload error: {str(e)}")
+        raise HTTPException(status_code=500, detail=str(e))
 @app.get("/rbxg/{path:path}")
 async def handle_video_stream(path: str, request: Request):
     }
     async with aiohttp.ClientSession() as session:
         async with session.post(url, cookies=cookies, headers=headers) as response:
+            if response.status != 200:
+                raise HTTPException(status_code=response.status, detail=f"Failed to initiate upload: {await response.text()}")
             return await response.json()
 async def chunked_upload(upload_url: str, file: UploadFile, content_type: str, chunk_size: int = 1024 * 1024) -> bool:
                             raise aiohttp.ClientError(f"Unexpected status code: {response.status}")
                 except aiohttp.ClientError as e:
                     if attempt == 4:  # Last attempt
+                        logger.error(f"Upload failed: {str(e)}")
                         return False
                     await asyncio.sleep(2 ** attempt)  # Exponential backoff
             else:
         # Verify the upload
         async with session.put(upload_url, headers={'Content-Range': f'bytes */{file_size}'}) as response:
             if response.status not in [200, 201, 204]:
+                logger.error(f"Upload verification failed: {response.status}")
                 return False
     return True