Update app.py

app.py

@@ -2,24 +2,25 @@
 from fastapi import FastAPI, HTTPException
 from fastapi.staticfiles import StaticFiles
 from pydantic import BaseModel
-from dotenv import load_dotenv
 import subprocess
 import os
 import shutil
 import logging
 from datetime import datetime
+import tempfile
+from pathlib import Path
+from dotenv import load_dotenv
 
 # Set up logging
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
 def env_to_cookies(env_content: str, output_file: str) -> None:
-    """Convert environment variable content back to cookie file"""
+    """Convert environment variable content to cookie file"""
     try:
         # Extract content from env format
         if '="' not in env_content:
             raise ValueError("Invalid env content format")
-            
         content = env_content.split('="', 1)[1].strip('"')
         
         # Replace escaped newlines with actual newlines
@@ -29,53 +30,34 @@ def env_to_cookies(env_content: str, output_file: str) -> None:
         with open(output_file, 'w') as f:
             f.write(cookie_content)
             
+        logger.info(f"Successfully created cookie file at {output_file}")
     except Exception as e:
+        logger.error(f"Error creating cookie file: {str(e)}")
         raise ValueError(f"Error converting to cookie file: {str(e)}")
 
-def save_to_env_file(env_content: str, env_file: str = '.env') -> None:
-    """Save environment variable content to .env file"""
-    try:
-        with open(env_file, 'w') as f:
-            f.write(env_content)
-        #print(f"Successfully saved to {env_file}")
-    except Exception as e:
-        raise ValueError(f"Error saving to env file: {str(e)}")
+def get_cookies() -> str:
+    """Get cookies from environment variable"""
+    load_dotenv()
+    cookie_content = os.getenv('COOKIES')
+    if not cookie_content:
+        raise ValueError("COOKIES environment variable not set")
+    return cookie_content
 
 def env_to_cookies_from_env(output_file: str) -> None:
     """Convert environment variable from .env file to cookie file"""
     try:
-        load_dotenv()  # Load from .env file
+        load_dotenv()
         env_content = os.getenv('COOKIES')
-        #print(f"Printing env content: \n{env_content}")
+        logger.info("Retrieved cookies from environment variable")
+        
         if not env_content:
-            raise ValueError("COOKIES not found in .env file")
+            raise ValueError("COOKIES not found in environment variables")
             
         env_to_cookies(f'COOKIES="{env_content}"', output_file)
     except Exception as e:
+        logger.error(f"Error creating cookie file from env: {str(e)}")
         raise ValueError(f"Error converting to cookie file: {str(e)}")
 
-def get_cookies():
-    """Get cookies from environment variable"""
-    load_dotenv()
-    cookie_content = os.getenv('COOKIES')
-    #print(cookie_content)
-    if not cookie_content:
-        raise ValueError("COOKIES environment variable not set")
-    return cookie_content
-
-def create_temp_cookie_file():
-    """Create temporary cookie file from environment variable"""
-    temp_cookie = tempfile.NamedTemporaryFile(mode='w+', delete=False, suffix='.txt')
-    try:
-        cookie_content = get_cookies()
-        # Replace escaped newlines with actual newlines
-        cookie_content = cookie_content.replace('\\n', '\n')
-        temp_cookie.write()
-        temp_cookie.flush()
-        return Path(temp_cookie.name)
-    finally:
-        temp_cookie.close()
-
 app = FastAPI(
     title="GAMDL API",
     description="API for downloading Google Drive files using gamdl",
@@ -100,8 +82,6 @@ class DownloadResponse(BaseModel):
 
 @app.post("/download", response_model=DownloadResponse)
 async def download_file(request: DownloadRequest):
-    cookiefile = "cookies.txt"
-    env_to_cookies_from_env("cookies.txt")
     try:
         # Create a unique subdirectory for this download
         timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
@@ -112,6 +92,11 @@ async def download_file(request: DownloadRequest):
         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)
@@ -135,7 +120,7 @@ async def download_file(request: DownloadRequest):
         process.check_returncode()
         
         # Get the downloaded filename
-        files = os.listdir()
+        files = [f for f in os.listdir() if f != "cookies.txt"]
         logger.info(f"Files in download directory: {files}")
         
         if not files:
@@ -176,17 +161,21 @@ async def download_file(request: DownloadRequest):
         if 'original_dir' in locals():
             os.chdir(original_dir)
 
-@app.get("/")
-async def root():
-    return {"message": "Welcome to GAMDL API. Visit /docs for API documentation."}
-
 @app.get("/test")
 async def test():
-    """Test endpoint to verify gamdl installation"""
+    """Test endpoint to verify setup"""
     try:
+        # Test cookie creation
+        temp_cookie = os.path.join(DOWNLOADS_DIR, "test_cookies.txt")
+        env_to_cookies_from_env(temp_cookie)
+        
+        # Test gamdl installation
         process = subprocess.run(["gamdl", "--version"], capture_output=True, text=True)
+        
         return {
             "gamdl_version": process.stdout.strip(),
+            "cookies_created": os.path.exists(temp_cookie),
+            "cookies_size": os.path.getsize(temp_cookie) if os.path.exists(temp_cookie) else 0,
             "installed": True,
             "error": process.stderr if process.stderr else None
         }