Update app.py

app.py

@@ -100,21 +100,13 @@ class DownloadResponse(BaseModel):
 
 
 
-
-# Function to wait until the file is fully downloaded
-def wait_for_file_to_complete(file_path, initial_size, max_wait_time=60):
-    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:
-                logger.info(f"Timeout reached waiting for file to complete: {file_path}")
-                break
-        else:
-            wait_time = 0
-        initial_size = current_size
-        time.sleep(2)  # Wait 2 seconds before checking again
+# Function to monitor gamdl output for "Done" message
+def wait_for_done_message(process):
+    for line in process.stdout:
+        logger.info(f"Gamdl stdout: {line.strip()}")
+        if "Done" in line:
+            return True
+    return False
 
 @app.post("/download", response_model=DownloadResponse)
 async def download_file(request: DownloadRequest):
@@ -127,56 +119,51 @@ async def download_file(request: DownloadRequest):
         cmd = ["gamdl", "--output-path", download_subdir, request.url]
         logger.info(f"Executing command: {' '.join(cmd)}")
         
-        # Run gamdl command
-        process = subprocess.run(
+        # Run gamdl command and capture stdout
+        process = subprocess.Popen(
             cmd,
-            capture_output=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
             text=True
         )
-
-        # Log the command output
-        logger.info(f"Gamdl stdout: {process.stdout}")
-        logger.info(f"Gamdl stderr: {process.stderr}")
-        logger.info(f"Gamdl returncode: {process.returncode}")
         
-        if process.returncode != 0:
-            raise Exception(f"Failed to download file: {process.stderr}")
+        # Wait for the "Done" message from the gamdl command output
+        if wait_for_done_message(process):
+            logger.info("Download completed successfully.")
 
-        # Check all files in the current directory
-        logger.info(f"All files in current directory: {os.listdir(download_subdir)}")
-        
-        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(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")
-
-        # If the size is still incorrect, raise an error
-        if file_size < 7_000_000:  # Assuming 7 MB is the minimum expected file size
-            raise Exception(f"File seems incomplete. Final 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)
-        download_url = f"{space_url}/files/{timestamp}/{encoded_filename}"
-        logger.info(f"Generated download URL: {download_url}")
-
-        return DownloadResponse(
-            success=True,
-            message="File downloaded successfully",
-            filename=downloaded_file,
-            download_url=download_url,
-            file_size=file_size
-        )
+            # Check all files in the download directory
+            logger.info(f"All files in current directory: {os.listdir(download_subdir)}")
+            
+            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}")
+
+            # 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")
+
+            # If the size is still incorrect, raise an error
+            if file_size < 5_000_000:  # Assuming 7 MB is the minimum expected file size
+                raise Exception(f"File seems incomplete. Final 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)
+            download_url = f"{space_url}/files/{timestamp}/{encoded_filename}"
+            logger.info(f"Generated download URL: {download_url}")
+
+            return DownloadResponse(
+                success=True,
+                message="File downloaded successfully",
+                filename=downloaded_file,
+                download_url=download_url,
+                file_size=file_size
+            )
+        else:
+            raise Exception("Gamdl did not complete successfully. No 'Done' message found in output.")
     
     except subprocess.CalledProcessError as e:
         logger.error(f"Download process failed: stdout={e.stdout}, stderr={e.stderr}")
@@ -192,6 +179,7 @@ async def download_file(request: DownloadRequest):
         )
 
 
+
 @app.get("/test")
 async def test():
     """Test endpoint to verify setup"""