Spaces:

albumup
/

file

Sleeping

App Files Files Community

albumup commited on Jan 18, 2025

Commit

fd225e2

verified ·

1 Parent(s): c75edd2

Update app.py

Browse files

Files changed (1) hide show

app.py +54 -54

app.py CHANGED Viewed

@@ -9,7 +9,7 @@ import mimetypes
 import httpx
 import io
 import zipfile
-import time
 app = FastAPI()
@@ -64,57 +64,65 @@ async def index():
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <title>File Upload</title>
     </head>
     <body>
         <h1>File Upload & Album Management</h1>
-        <form action="/upload/single" method="post" enctype="multipart/form-data">
-            <h2>Single File Upload</h2>
-            <input type="file" name="file" accept="*/*" required><br><br>
-            <button type="submit">Upload</button>
-        </form>
-        <form action="/album/create" method="post" enctype="multipart/form-data">
-            <h2>Create Album</h2>
             <input type="text" name="album_name" placeholder="Album Name" required><br><br>
             <input type="file" name="files" accept="*/*" multiple required><br><br>
             <button type="submit">Create Album</button>
         </form>
         <h2>Search Albums</h2>
         <form action="/search" method="get">
             <input type="text" name="query" placeholder="Search by album name..." required>
             <button type="submit">Search</button>
         </form>
     </body>
     </html>
     """
-@app.post("/upload/single")
-async def upload_single_file(file: UploadFile = File(...)):
-    cookies = await get_cookies()
-    upload_result = await initiate_upload(cookies, file.filename, file.content_type)
-    if upload_result and 'upload_url' in upload_result:
-        start_time = time.time()
-        file_size = 0
-        async def generate():
-            nonlocal file_size
-            while chunk := await file.read(8192):
-                file_size += len(chunk)
-                yield chunk
-        upload_success = await retry_upload_streaming(upload_result['upload_url'], generate(), file.content_type)
-        if upload_success:
-            serving_path = upload_result['serving_url'].split('/pbxt/')[1]
-            elapsed_time = time.time() - start_time
-            return {
-                "success": True,
-                "message": "File uploaded successfully",
-                "file_url": f"/upload/{serving_path}",
-                "file_size": file_size,
-                "elapsed_time": f"{elapsed_time:.2f} seconds"
-            }
-    return {"error": "File upload failed"}
 @app.post("/album/create")
 async def create_album(
@@ -126,32 +134,26 @@ async def create_album(
     album_files = []
     cookies = await get_cookies()
     for file in files:
-        start_time = time.time()
-        file_size = 0
-        async def generate():
-            nonlocal file_size
-            while chunk := await file.read(8192):
-                file_size += len(chunk)
-                yield chunk
         upload_result = await initiate_upload(cookies, file.filename, file.content_type)
         if upload_result and 'upload_url' in upload_result:
-            upload_success = await retry_upload_streaming(upload_result['upload_url'], generate(), file.content_type)
             if upload_success:
                 serving_path = upload_result['serving_url'].split('/pbxt/')[1]
-                elapsed_time = time.time() - start_time
                 album_files.append({
                     'filename': file.filename,
                     'path': serving_path,
                     'content_type': file.content_type,
-                    'uploaded_at': datetime.now().isoformat(),
-                    'file_size': file_size,
-                    'elapsed_time': f"{elapsed_time:.2f} seconds"
                 })
     # Save to Deno KV database
     await save_album_to_db(album_name, album_id, album_files)
@@ -198,8 +200,6 @@ async def view_album(album_id: str):
         <div class="file-item">
             {preview_html}
             <p>{file['filename']}</p>
-            <p>Size: {file['file_size']} bytes</p>
-            <p>Upload Time: {file['elapsed_time']}</p>
             <a href="{file_url}" class="button" onclick="openModal('{file_url}'); return false;">View</a>
             <a href="{file_url}?download=true" class="button" target="_blank">Download</a>
         </div>
@@ -316,11 +316,11 @@ async def initiate_upload(cookies, filename, content_type):
     response = requests.post(url, cookies=cookies, headers=headers)
     return response.json()
-async def retry_upload_streaming(upload_url, generator, content_type, max_retries=5):
     delay = 1
     for _ in range(max_retries):
         try:
-            response = requests.put(upload_url, data=generator, headers={'Content-Type': content_type})
             if response.status_code == 200:
                 return True
         except Exception:

 import httpx
 import io
 import zipfile
+import math
 app = FastAPI()
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <title>File Upload</title>
+        <style>
+            .progress-bar {
+                width: 100%;
+                background-color: #f3f3f3;
+                border-radius: 5px;
+                margin-top: 10px;
+            }
+            .progress-bar-inner {
+                width: 0%;
+                height: 30px;
+                background-color: #4caf50;
+                border-radius: 5px;
+                text-align: center;
+                line-height: 30px;
+                color: white;
+            }
+        </style>
     </head>
     <body>
         <h1>File Upload & Album Management</h1>
+        <form action="/album/create" method="post" enctype="multipart/form-data" onsubmit="showProgressBar()">
             <input type="text" name="album_name" placeholder="Album Name" required><br><br>
             <input type="file" name="files" accept="*/*" multiple required><br><br>
+            <div class="progress-bar">
+                <div class="progress-bar-inner" id="progressBar">0%</div>
+            </div>
             <button type="submit">Create Album</button>
         </form>
+        <h2>Single File Upload</h2>
+        <form action="/single/upload" method="post" enctype="multipart/form-data">
+            <input type="file" name="file" accept="*/*" required><br><br>
+            <button type="submit">Upload Single File</button>
+        </form>
         <h2>Search Albums</h2>
         <form action="/search" method="get">
             <input type="text" name="query" placeholder="Search by album name..." required>
             <button type="submit">Search</button>
         </form>
+        <script>
+            function showProgressBar() {
+                const progressBar = document.getElementById('progressBar');
+                progressBar.style.width = '0%';
+                progressBar.textContent = '0%';
+                const interval = setInterval(() => {
+                    const width = parseInt(progressBar.style.width);
+                    if (width < 90) {
+                        progressBar.style.width = (width + 10) + '%';
+                        progressBar.textContent = (width + 10) + '%';
+                    }
+                }, 500);
+            }
+        </script>
     </body>
     </html>
     """
+@app.post("/single/upload")
+async def single_upload(file: UploadFile = File(...)):
+    return RedirectResponse(url="https://albumup-up1.hf.space/", status_code=303)
 @app.post("/album/create")
 async def create_album(
     album_files = []
     cookies = await get_cookies()
+    total_files = len(files)
+    uploaded_files = 0
     for file in files:
+        file_content = await file.read()
         upload_result = await initiate_upload(cookies, file.filename, file.content_type)
         if upload_result and 'upload_url' in upload_result:
+            upload_success = await retry_upload(upload_result['upload_url'], file_content, file.content_type)
             if upload_success:
                 serving_path = upload_result['serving_url'].split('/pbxt/')[1]
                 album_files.append({
                     'filename': file.filename,
                     'path': serving_path,
                     'content_type': file.content_type,
+                    'uploaded_at': datetime.now().isoformat()
                 })
+                uploaded_files += 1
+                progress = math.floor((uploaded_files / total_files) * 100)
+                print(f"Upload Progress: {progress}%")
     # Save to Deno KV database
     await save_album_to_db(album_name, album_id, album_files)
         <div class="file-item">
             {preview_html}
             <p>{file['filename']}</p>
             <a href="{file_url}" class="button" onclick="openModal('{file_url}'); return false;">View</a>
             <a href="{file_url}?download=true" class="button" target="_blank">Download</a>
         </div>
     response = requests.post(url, cookies=cookies, headers=headers)
     return response.json()
+async def retry_upload(upload_url, file_content, content_type, max_retries=5):
     delay = 1
     for _ in range(max_retries):
         try:
+            response = requests.put(upload_url, data=file_content, headers={'Content-Type': content_type})
             if response.status_code == 200:
                 return True
         except Exception: