Update app.py

app.py

@@ -251,7 +251,7 @@ async def get_track_download_url(video_url: str) -> str:
     return {"error": "Download URL not found"}
 
 
-def jio_search(query: str) -> str:
+def jio_search(query: str, quality: str) -> str:
     try:
         # Construct the API URL
         api_url = f"https://saavn.dev/api/search/songs?query={query}"
@@ -260,13 +260,29 @@ def jio_search(query: str) -> str:
         response = session.get(api_url)
         # Check if the request was successful
         response.raise_for_status()
-        return response.text
+        data = response.json().get("data")
+        song_data = data.get("results")
+        if not song_data or len(song_data) == 0:
+            logger.error("No data found in the response.")
+            raise HTTPException(status_code=404, detail="No data found for the given URL.")
+        download_urls = song_data[0].get("downloadUrl")
+        if not download_urls:
+            logger.error("No download URLs found in the response.")
+            raise HTTPException(status_code=404, detail="No download URLs found for the given song.")
+        for download_url in download_urls:
+            if download_url.get("quality") == quality:
+                return download_url.get("url")
+        logger.error(f"No download URL found for quality {quality}.")
+        raise HTTPException(status_code=404, detail=f"No download URL found for quality {quality}.")
     except cloudscraper.exceptions.CloudflareChallengeError as cf_err:
-        logger.error(f"Cloudflare challenge error while searching for {query}: {cf_err}")
+        logger.error(f"Cloudflare challenge error while fetching {url}: {cf_err}")
         raise HTTPException(status_code=503, detail="Cloudflare challenge failed")
+    except HTTPException:
+        # Re - raise the HTTPException if it's already raised
+        raise
     except Exception as e:
-        logger.error(f"Error while searching for {query}: {e}")
-        raise HTTPException(status_code=500, detail=f"An error occurred while searching: {str(e)}")
+        logger.error(f"Error while fetching {url}: {e}")
+        raise HTTPException(status_code=500, detail=f"An error occurred while fetching: {str(e)}")
 
         
 def jio_fetch(url: str, quality: str) -> str:
@@ -304,48 +320,59 @@ def jio_fetch(url: str, quality: str) -> str:
         
 # Define the request model
 class JioDownloadRequest(BaseModel):
-    url: str
-    quality: str
+    url: str = None
+    query: str = None
+    quality: str = None
     
 @app.post("/jio_dl")
 async def jio_download(request: JioDownloadRequest):
     try:
         url = request.url
+        query = request.query
         quality = request.quality
-        if not url or not quality:
-            logger.error("Missing 'url' or 'quality' in request data.")
-            raise HTTPException(status_code=400, detail="Missing 'url' or 'quality' in request data")
-        download_url = jio_fetch(url, quality)
-        return {"download_url": download_url}
+        if url and quality:
+            download_url = jio_fetch(url, quality)
+            return {"download_url": download_url}
+        elif query:
+            download_url = jio_search(query, quality)
+            return {"download_url": download_url}
+        else:
+            logger.error("Missing 'url' and 'quality' or 'query' in request data.")
+            raise HTTPException(status_code=400, detail="Missing 'url' and 'quality' or 'query' in request data")
     except HTTPException:
-        # Re - raise the HTTPException if it's already raised in jio_fetch
+        # Re - raise the HTTPException if it's already raised
         raise
     except Exception as e:
         logger.error(f"Error in jio_download: {e}")
-        raise HTTPException(status_code=500, detail=f"An error occurred during download: {str(e)}")
+        raise HTTPException(status_code=500, detail=f"An error occurred during the operation: {str(e)}")
+        
 
 @app.post("/jio_dls")
 async def jio_download(request: JioDownloadRequest):
     try:
         url = request.url
         quality = request.quality
-        if not url or not quality:
-            logger.error("Missing 'url' or 'quality' in request data.")
-            raise HTTPException(status_code=400, detail="Missing 'url' or 'quality' in request data")
+        query = request.query
         if quality == '320kbps':
             return {
                 "error": "Quality 320kbps is for Premium users only",
                 "premium": "https://chrunos.com/premium-shortcuts/"
             }
-        else:
+        if url and quality:
             download_url = jio_fetch(url, quality)
             return {"download_url": download_url}
+        elif query:
+            download_url = jio_search(query, quality)
+            return {"download_url": download_url}
+        else:
+            logger.error("Missing 'url' and 'quality' or 'query' in request data.")
+            raise HTTPException(status_code=400, detail="Missing 'url' and 'quality' or 'query' in request data")
     except HTTPException:
-        # Re - raise the HTTPException if it's already raised in jio_fetch
+        # Re - raise the HTTPException if it's already raised
         raise
     except Exception as e:
         logger.error(f"Error in jio_download: {e}")
-        raise HTTPException(status_code=500, detail=f"An error occurred during download: {str(e)}")
+        raise HTTPException(status_code=500, detail=f"An error occurred during the operation: {str(e)}")