Update app.py

app.py

@@ -12,6 +12,8 @@ from dotenv import load_dotenv
 from pydantic import BaseModel
 from urllib.parse import quote
 from pathlib import Path
+import uuid
+from fastapi import BackgroundTasks
 
 
 # Set up logging
@@ -33,9 +35,7 @@ DEEZER_API_URL = "https://api.deezer.com"
 # Base URL for the server
 BASE_URL = "https://tecuts-depot.hf.space"
 
-# Deezer ARL token (required for deezspot downloads)
-ARL_TOKEN = os.getenv('ARL')
-dl = DeeLogin(arl=ARL_TOKEN)
+
 
 # Spotify credentials from environment variables
 SPOTIFY_USERNAME = os.getenv("SPOTIFY_USERNAME")
@@ -63,55 +63,52 @@ class DownloadRequest(BaseModel):
     quality: str
 
 
+def cleanup_dir(dir_path: Path):
+    """Background task to clean up directory"""
+    try:
+        shutil.rmtree(dir_path)
+        logger.info(f"Cleaned up directory: {dir_path}")
+    except Exception as e:
+        logger.error(f"Error cleaning up {dir_path}: {e}")
 
 
-
-# Download a Spotify track and return a download URL
+# Download a Spotify track and return a download URL       
 @app.post("/spot-track/{track_id}")
-def download_spotify_track(track_id: str):
+async def download_spotify_track(
+    track_id: str,
+    background_tasks: BackgroundTasks
+):
     try:
-        # Clear the downloads directory
         downloads_dir = Path("downloads")
-        for item in downloads_dir.iterdir():
-            if item.is_file():
-                item.unlink()
-            elif item.is_dir():
-                shutil.rmtree(item)
-                
-        # Download the track using spotloader
-        logger.info(f"Downloading Spotify track: {track_id}")
+        # Create unique directory for this download
+        download_id = uuid.uuid4().hex
+        download_dir = downloads_dir / download_id
+        download_dir.mkdir(parents=True, exist_ok=True)
+
+        # Download to unique directory
+        logger.info(f"Downloading to {download_dir}")
         spo.download_track(
             link_track=f"https://open.spotify.com/track/{track_id}",
-            output_dir=str(downloads_dir),
+            output_dir=str(download_dir),
             quality_download="VERY_HIGH",
             recursive_quality=False,
             recursive_download=False,
             not_interface=False,
             method_save=1
         )
-        
-        file_extension = "ogg"
-        # Recursively search for the file in the downloads directory
-        filepath = None
-        for root, dirs, files in os.walk(downloads_dir):
-            for file in files:
-                if file.endswith(f'.{file_extension}'):
-                    filepath = Path(root) / file
-                    break
-            if filepath:
-                break
 
+        # Find downloaded file
+        filepath = next(download_dir.glob(f"**/*.ogg"), None)
         if not filepath:
-            raise HTTPException(status_code=500, detail=f"{file_extension} file not found after download")
-        
-        file_size = filepath.stat().st_size
-        logger.info(f"Downloaded file size: {file_size} bytes")
+            raise HTTPException(status_code=500, detail="File not found after download")
 
-        # Return the download URL
+        # Schedule cleanup after response is sent
+        background_tasks.add_task(cleanup_dir, download_dir)
+
+        # Return path with unique directory
         relative_path = quote(str(filepath.relative_to(downloads_dir)))
-        download_url = f"{BASE_URL}/downloads/{relative_path}"
-        logger.info(f"Download successful: {download_url}")
-        return {"download_url": download_url}
+        return {"download_url": f"{BASE_URL}/downloads/{relative_path}"}
+
     except Exception as e:
         logger.error(f"Error downloading track: {e}")
         raise HTTPException(status_code=500, detail=str(e))
@@ -150,6 +147,9 @@ def download_track(request: DownloadRequest):
     try:
         url = request.url
         quality = request.quality
+        # Deezer ARL token (required for deezspot downloads)
+        ARL_TOKEN = os.getenv('ARL')
+        dl = DeeLogin(arl=ARL_TOKEN)
 
         if quality not in ["MP3_320", "MP3_128", "FLAC"]:
             raise HTTPException(status_code=400, detail="Invalid quality specified")