Update app.py

app.py

@@ -80,6 +80,10 @@ class DownloadResponse(BaseModel):
     filename: str = None
     download_url: str = None
 
+
+
+# [Previous cookie handling code remains the same...]
+
 @app.post("/download", response_model=DownloadResponse)
 async def download_file(request: DownloadRequest):
     try:
@@ -88,7 +92,6 @@ async def download_file(request: DownloadRequest):
         download_subdir = os.path.join(DOWNLOADS_DIR, timestamp)
         os.makedirs(download_subdir, exist_ok=True)
         
-        # Log the current working directory and download directory
         logger.info(f"Current working directory: {os.getcwd()}")
         logger.info(f"Download directory: {download_subdir}")
         
@@ -101,37 +104,50 @@ async def download_file(request: DownloadRequest):
         original_dir = os.getcwd()
         os.chdir(download_subdir)
         
-        # Log the command being executed
+        # Run gamdl command
         cmd = ["gamdl", request.url]
         logger.info(f"Executing command: {' '.join(cmd)}")
         
-        # Run gamdl command with more detailed output
         process = subprocess.run(
             cmd,
             capture_output=True,
             text=True
         )
         
-        # Log the command output
         logger.info(f"Command stdout: {process.stdout}")
         logger.info(f"Command stderr: {process.stderr}")
         
-        # Check if the command was successful
         process.check_returncode()
         
-        # Get the downloaded filename
-        files = [f for f in os.listdir() if f != "cookies.txt"]
-        logger.info(f"Files in download directory: {files}")
+        # Find all files recursively in the download directory
+        all_files = []
+        for root, dirs, files in os.walk('.'):
+            for file in files:
+                if file != "cookies.txt":
+                    all_files.append(os.path.join(root, file))
         
-        if not files:
-            raise Exception("No files found in download directory after download attempt")
+        logger.info(f"All files found: {all_files}")
+        
+        if not all_files:
+            raise Exception("No files found after download attempt")
+        
+        # Get the first downloaded file (usually there's only one)
+        downloaded_file = all_files[0]
+        if downloaded_file.startswith('./'):
+            downloaded_file = downloaded_file[2:]  # Remove leading ./
+            
+        # Move the file to the download directory root if it's in a subdirectory
+        if os.path.dirname(downloaded_file):
+            new_path = os.path.basename(downloaded_file)
+            shutil.move(downloaded_file, new_path)
+            downloaded_file = new_path
             
-        downloaded_file = files[0]
-        logger.info(f"Downloaded file: {downloaded_file}")
+        logger.info(f"Final downloaded file: {downloaded_file}")
         
-        # Generate the download URL
-        space_url = os.getenv("SPACE_URL", "http://localhost:7860")
-        download_url = f"{space_url}/files/{timestamp}/{downloaded_file}"
+        # Generate the download URL with proper URL encoding
+        space_url = os.getenv("SPACE_URL", "http://tecuts-testing.hf.space")
+        encoded_filename = quote(downloaded_file)
+        download_url = f"{space_url}/files/{timestamp}/{encoded_filename}"
         logger.info(f"Generated download URL: {download_url}")
         
         # Move back to original directory
@@ -157,7 +173,6 @@ async def download_file(request: DownloadRequest):
             detail=f"Error: {str(e)}"
         )
     finally:
-        # Always try to return to the original directory
         if 'original_dir' in locals():
             os.chdir(original_dir)