Update app.py

app.py

@@ -11,8 +11,6 @@ import tempfile
 from pathlib import Path
 from dotenv import load_dotenv
 from urllib.parse import quote
-from pydantic import BaseModel
-import time # Import for sleep to ensure file is fully written
 
 # Set up logging
 logging.basicConfig(level=logging.INFO)
@@ -98,73 +96,75 @@ class DownloadResponse(BaseModel):
     file_size: int = None  # Include file size in the response
 
 
-
-
-# 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 "100%" in line:
-            return True
-    return False
-
 @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", "--output-path", download_subdir, request.url]
+        cmd = ["votify", request.url]
         logger.info(f"Executing command: {' '.join(cmd)}")
         
-        # Run gamdl command and capture stdout
-        process = subprocess.Popen(
+        # Run gamdl command with more detailed output
+        process = subprocess.run(
             cmd,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
+            capture_output=True,
             text=True
         )
         
-        # Wait for the "Done" message from the gamdl command output
-        if wait_for_done_message(process):
-            logger.info("Download completed successfully.")
+        # 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}")
+        
+        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}")
 
-            # Check all files in the download directory
-            logger.info(f"All files in current directory: {os.listdir(download_subdir)}")
+        # Get the file size
+        file_size = os.path.getsize(downloaded_file)
+        
+        # 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
+        download_url = f"{space_url}/files/{timestamp}/{encoded_filename}"
+        logger.info(f"Generated download URL: {download_url}")
+        
+        # Move back to original directory
+       
+        
+        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
+        )
             
-            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}")
         raise HTTPException(
@@ -177,6 +177,10 @@ 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)
 
 
 
@@ -189,7 +193,7 @@ async def test():
         env_to_cookies_from_env(temp_cookie)
         
         # Test gamdl installation
-        process = subprocess.run(["gamdl", "--version"], capture_output=True, text=True)
+        process = subprocess.run(["votify", "--version"], capture_output=True, text=True)
         
         return {
             "gamdl_version": process.stdout.strip(),