Add proxy & update fetchSubtitleUrls.

fetchYoutubeSubtitle.py

@@ -36,10 +36,10 @@ def getUrlFromSubtitles(item, lang='en', subType="vtt"):
             return subtitle.get("url")
     return None
 
-async def fetchSubtitle(url: str, lang: Optional[str] = 'en', subType: Optional[str] = "vtt") -> dict:
-    return await fetchSubtitlebyType(url, lang, subType)
+async def fetchSubtitle(url: str, lang: Optional[str] = 'en', subType: Optional[str] = "vtt", proxy: Optional[str] = None) -> dict:
+    return await fetchSubtitlebyType(url, lang, subType, proxy)
 
-async def fetchSubtitlebyType(url: str, lang: Optional[str] = 'en', subType="vtt") -> dict:
+async def fetchSubtitlebyType(url: str, lang: Optional[str] = 'en', subType: Optional[str] = "vtt", proxy: Optional[str] = None) -> dict:
     ydl_opts = {
         "noplaylist": True,
         "writesubtitles": False,
@@ -49,6 +49,9 @@ async def fetchSubtitlebyType(url: str, lang: Optional[str] = 'en', subType="vtt
         "socket_timeout": 20
     }
 
+    if proxy:
+        ydl_opts.update({"proxy": proxy})
+
     title = "unknow"
     duration = ""
     try:
@@ -113,13 +116,16 @@ def xml_caption_to_srt( xml_captions: str) -> str:
         segments.append(line)
     return "\n".join(segments).strip()
 
-async def fetchSubtitleUrls(url: str) -> json:
+async def fetchSubtitleUrls(url: str, proxy: Optional[str] = None) -> json:
     ydl_opts = {
         "noplaylist": True,
         "writesubtitles": False,
         "allsubtitles": True,
         "skip_download": True,
     }
+    if proxy:
+        ydl_opts.update({"proxy": proxy})
+    
     title = "unknow"
     duration = ""
     try:
@@ -128,12 +134,8 @@ async def fetchSubtitleUrls(url: str) -> json:
             title = info_dict.get("title", "unknow")
             seconds = info_dict.get("duration")
             duration = str(seconds) if seconds else ""
-            if info_dict.get("subtitles"):
-                langs = info_dict.get("subtitles").keys()
-                if not (len(langs) == 1 and "live_chat" in langs):
-                    return {"title": title, "duration": duration, "subtitles": info_dict.get("subtitles")}
-                if info_dict.get("automatic_captions"):
-                    return {"title": title, "duration": duration, "subtitles": info_dict.get("automatic_captions")}
+
+            return {"title": title, "duration": duration, "subtitles": info_dict.get("subtitles"),"automatic_captions": info_dict.get("automatic_captions")}
+
     except Exception as e:
         return {"error": str(e)}
-    return {"title": title, "duration": duration, "error": "No subtitles"}

main.py

@@ -21,16 +21,16 @@ def read_json():
 
 
 @app.get("/subtitle/")
-async def get_subtitle(url: str, subtype: str="srt", x_token: Annotated[str | None, Header()] = None):
+async def get_subtitle(url: str, subtype: str="srt", lang:str='en', proxy: str=None, x_token: Annotated[str | None, Header()] = None):
     if token != x_token:
         return JSONResponse({"error": "Invalid token"})
-    subtitle = await fetchSubtitle(url,subType=subtype)
+    subtitle = await fetchSubtitle(url, lang=lang, subType=subtype, proxy=proxy)
     return JSONResponse(content=subtitle)
 
 
 @app.get("/subtitle-urls/")
-async def get_subtitleUrls(url: str, x_token: Annotated[str | None, Header()] = None):
+async def get_subtitleUrls(url: str, proxy: str=None, x_token: Annotated[str | None, Header()] = None):
     if token != x_token:
         return JSONResponse({"error": "Invalid token"})
-    subtitles = await fetchSubtitleUrls(url)
+    subtitles = await fetchSubtitleUrls(url, proxy=proxy)
     return JSONResponse(content=subtitles)