Update app.py

app.py

@@ -100,98 +100,72 @@ class DownloadResponse(BaseModel):
 
 
 def wait_for_file_to_complete(file_path, initial_size, max_wait_time=30):
-    """
-    Wait until the file size stops increasing for a set amount of time,
-    indicating the download has completed.
-    """
     wait_time = 0
     while True:
         current_size = os.path.getsize(file_path)
         if current_size == initial_size:
             wait_time += 1
             if wait_time >= max_wait_time:
-                # File size hasn't changed for max_wait_time seconds
                 break
         else:
-            # Reset wait time if the file is still growing
             wait_time = 0
         initial_size = current_size
-        time.sleep(1)  # Check every second
-
-
-
+        time.sleep(1)
 
 @app.post("/download", response_model=DownloadResponse)
 async def download_file(request: DownloadRequest):
     try:
-        # Create a unique subdirectory for this download
         timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
         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}")
-        
-        # Create cookies file from environment variable
-        cookie_path = os.path.join(download_subdir, "cookies.txt")
-        logger.info(f"Creating cookies file at: {cookie_path}")
-        env_to_cookies_from_env(cookie_path)
-        
-        # Change to download directory
-        original_dir = os.getcwd()
-        os.chdir(download_subdir)
-        
+
         # Log the command being executed
         cmd = ["gamdl", request.url]
         logger.info(f"Executing command: {' '.join(cmd)}")
         
-        # Run gamdl command with more detailed output
+        # Run gamdl command
         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}")
+        logger.info(f"Return code: {process.returncode}")
         
-        # Check if the command was successful
-        process.check_returncode()
-        
+        if process.returncode != 0:
+            raise Exception(f"Failed to download file: {process.stderr}")
+
         # Get the downloaded filename
-        files = [f for f in os.listdir() if f != "cookies.txt"]
-        logger.info(f"Files in download directory: {files}")
-        
+        files = [f for f in os.listdir(download_subdir) if f != "cookies.txt"]
         if not files:
             raise Exception("No files found in download directory after download attempt")
-        
+
         downloaded_file = files[0]
         logger.info(f"Downloaded file: {downloaded_file}")
-        
+
         # Ensure the file is fully written (wait for download to complete)
-        initial_size = os.path.getsize(downloaded_file)
-        wait_for_file_to_complete(downloaded_file, initial_size)
-        
-        # Get the file size
-        file_size = os.path.getsize(downloaded_file)
-        
+        initial_size = os.path.getsize(os.path.join(download_subdir, downloaded_file))
+        wait_for_file_to_complete(os.path.join(download_subdir, downloaded_file), initial_size)
+
+        # Verify the final file size
+        file_size = os.path.getsize(os.path.join(download_subdir, downloaded_file))
+        logger.info(f"Final file size: {file_size} bytes")
+
         # Generate the download URL and URL encode the filename
         space_url = os.getenv("SPACE_URL", "https://tecuts-vob.hf.space")
-        encoded_filename = quote(downloaded_file)  # URL encode the filename
+        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
-        os.chdir(original_dir)
-        
+
         return DownloadResponse(
             success=True,
             message="File downloaded successfully",
             filename=downloaded_file,
             download_url=download_url,
-            file_size=file_size  # Include the file size in the response
+            file_size=file_size
         )
     
     except subprocess.CalledProcessError as e:
@@ -206,10 +180,6 @@ async def download_file(request: DownloadRequest):
             status_code=500,
             detail=f"Error: {str(e)}"
         )
-    finally:
-        # Always try to return to the original directory
-        if 'original_dir' in locals():
-            os.chdir(original_dir)