Update app.py

app.py

@@ -5,8 +5,13 @@ from pydantic import BaseModel
 import subprocess
 import os
 import shutil
+import logging
 from datetime import datetime
 
+# Set up logging
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+
 app = FastAPI(
     title="GAMDL API",
     description="API for downloading Google Drive files using gamdl",
@@ -37,29 +42,46 @@ 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}")
+        
         # Change to download directory
         original_dir = os.getcwd()
         os.chdir(download_subdir)
         
-        # Run gamdl command
+        # Log the command being executed
+        cmd = ["gamdl", request.url]
+        logger.info(f"Executing command: {' '.join(cmd)}")
+        
+        # Run gamdl command with more detailed output
         process = subprocess.run(
-            ["gamdl", request.url],
+            cmd,
             capture_output=True,
-            text=True,
-            check=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 = os.listdir()
+        logger.info(f"Files in download directory: {files}")
+        
         if not files:
-            raise Exception("No file was downloaded")
+            raise Exception("No files found in download directory after download attempt")
             
         downloaded_file = files[0]
+        logger.info(f"Downloaded file: {downloaded_file}")
         
         # Generate the download URL
-        # Using the Space's domain - you'll need to replace this with your actual Space URL
         space_url = os.getenv("SPACE_URL", "http://localhost:7860")
         download_url = f"{space_url}/files/{timestamp}/{downloaded_file}"
+        logger.info(f"Generated download URL: {download_url}")
         
         # Move back to original directory
         os.chdir(original_dir)
@@ -72,33 +94,38 @@ async def download_file(request: DownloadRequest):
         )
             
     except subprocess.CalledProcessError as e:
+        logger.error(f"Download process failed: stdout={e.stdout}, stderr={e.stderr}")
         raise HTTPException(
             status_code=400,
-            detail=f"Failed to download: {e.stderr}"
+            detail=f"Failed to download: {e.stderr or e.stdout or str(e)}"
         )
     except Exception as e:
+        logger.error(f"Unexpected error: {str(e)}", exc_info=True)
         raise HTTPException(
             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)
 
-# Add basic homepage with API documentation link
 @app.get("/")
 async def root():
     return {"message": "Welcome to GAMDL API. Visit /docs for API documentation."}
 
-# Optional: Add cleanup endpoint to manage disk space
-@app.post("/cleanup")
-async def cleanup_old_files():
-    """Remove files older than 24 hours"""
+@app.get("/test")
+async def test():
+    """Test endpoint to verify gamdl installation"""
     try:
-        for item in os.listdir(DOWNLOADS_DIR):
-            item_path = os.path.join(DOWNLOADS_DIR, item)
-            if os.path.isdir(item_path):
-                shutil.rmtree(item_path)
-        return {"message": "Cleanup completed successfully"}
+        process = subprocess.run(["gamdl", "--version"], capture_output=True, text=True)
+        return {
+            "gamdl_version": process.stdout.strip(),
+            "installed": True,
+            "error": process.stderr if process.stderr else None
+        }
     except Exception as e:
-        raise HTTPException(
-            status_code=500,
-            detail=f"Cleanup failed: {str(e)}"
-        )
+        return {
+            "installed": False,
+            "error": str(e)
+        }