Update app.py

app.py

@@ -117,56 +117,97 @@ def main():
 async def get_info(
     request: Request,
     url: str, 
-    quality: Union[str, None] = None, 
-    playlist: bool = True
+    quality: str = "1080",
+    audio_only: bool = False  # <-- Added audio toggle
 ):
-    # Get client IP
+    """
+    Resolves a video or audio URL and returns a simplified JSON payload.
+    Auto-detects SoundCloud to prevent video-filter errors.
+    """
     client_ip = get_client_ip(request)
-    
-    # Check rate limit
     is_allowed, remaining = check_rate_limit(client_ip)
     
     if not is_allowed:
         raise HTTPException(
             status_code=status.HTTP_429_TOO_MANY_REQUESTS,
             detail=f"Daily limit of {DAILY_LIMIT} requests exceeded. Try again tomorrow.",
-            headers={
-                "X-RateLimit-Limit": str(DAILY_LIMIT),
-                "X-RateLimit-Remaining": "0",
-                "X-RateLimit-Reset": str(int(time.time()) + 86400),
-                "Cache-Control": "no-store, max-age=0"
-            }
+            headers={"X-RateLimit-Reset": str(int(time.time()) + 86400)}
         )
     
+    # --- SMART FORMAT SELECTION ---
+    # Auto-detect SoundCloud, or check if the client explicitly wants audio
+    if "soundcloud.com" in url or audio_only:
+        format_selector = "bestaudio/best"
+    else:
+        # Your custom H.264 first, AV1 second video logic
+        format_selector = f"best[height<={quality}][vcodec^=avc][ext=mp4]/best[height<={quality}][vcodec^=av01][ext=mp4]/best[height<={quality}][ext=mp4]/bestvideo[height<={quality}]+bestaudio/best"
+
     ydl_options = {
-        "retries": 3,
-        "encoding": "utf8",
-        "noplaylist": not playlist,
-        "dump_single_json": True,
-        "format": "bestvideo+bestaudio/best",
-        "ignoreerrors": True,
-        "extract_flat": playlist,
-        "cachedir": "/tmp/yt-dlp-cache"
+        "format": format_selector,
+        "quiet": True,
+        "no_warnings": True,
+        "skip_download": True,
+        "noplaylist": True,
+        "cachedir": "/tmp/yt-dlp-cache",
+        "js-runtimes": "node"
     }
     
-    with YoutubeDL(ydl_options) as ytdl:
+    with YoutubeDL(ydl_options) as ydl:
         try:
-            response = ytdl.extract_info(url, download=False)
+            info = ydl.extract_info(url, download=False)
+            
+            download_url = info.get("url")
+            http_headers = info.get("http_headers", {})
+            
+            # Fallback for split formats (bestvideo+bestaudio)
+            if not download_url and info.get("requested_formats"):
+                # If audio_only is True, requested_formats[0] might be audio. 
+                # If video, requested_formats[0] is video, [1] is audio.
+                # We grab the first one to ensure we get a valid URL.
+                fmt = info["requested_formats"][0] 
+                download_url = fmt.get("url")
+                http_headers = fmt.get("http_headers", http_headers)
+                
+            if not download_url:
+                raise HTTPException(
+                    status_code=400, 
+                    detail="ダウンロードURLを取得できませんでした",
+                    headers={"Cache-Control": "no-store, max-age=0"}
+                )
+                
+            title = info.get("title", "audio" if audio_only else "video")
+            ext = info.get("ext", "mp3" if audio_only else "mp4")
+            filename = f"{title}.{ext}"
+            filesize = info.get("filesize") or info.get("filesize_approx")
+            
+            response_data = {
+                "status": "ok",
+                "url": download_url,
+                "title": title,
+                "filename": filename,
+                "ext": ext,
+                "filesize": filesize,
+                "headers": http_headers,
+            }
+            
             return JSONResponse(
-                response,
+                response_data,
                 headers={
                     "Cache-Control": "s-maxage=2592000, stale-while-revalidate",
                     "X-RateLimit-Limit": str(DAILY_LIMIT),
-                    "X-RateLimit-Remaining": str(remaining),
-                    "X-RateLimit-Reset": str(int(time.time()) + 86400)
+                    "X-RateLimit-Remaining": str(remaining)
                 }
             )
+            
         except Exception as e:
-            print(e)
+            error_msg = str(e)
+            if "DownloadError" in str(type(e)):
+                error_msg = f"メディアの取得に失敗: {error_msg}" # Changed 'video' to 'media' in JP
+            
             raise HTTPException(
                 status_code=status.HTTP_400_BAD_REQUEST,
-                detail=repr(e),
-                headers={"Cache-Control": "no-store, max-age=0"},
+                detail=error_msg,
+                headers={"Cache-Control": "no-store, max-age=0"}
             )
 
 @app.get("/api/playlist")