merge 2 bili apis

modules/bili.py

@@ -1,7 +1,16 @@
 import re
 import requests
 import gradio as gr
-from utils import download_file, HEADER, TIMEOUT, API_BILI_2, API_BILI_1, LANG, TMP_DIR
+from utils import (
+    download_file,
+    HEADER,
+    TIMEOUT,
+    API_BILI,
+    API_BILI_2,
+    API_BILI_1,
+    LANG,
+    TMP_DIR,
+)
 
 ZH2EN = {
     "状态栏": "Status",
@@ -15,6 +24,9 @@ ZH2EN = {
     "UP主头像": "Uploader avatar",
     "UP主昵称": "Uploader nickname",
     "B站视频解析": "Bilibili video parser",
+    "通道": "Channel",
+    "接口1": "Interface 1",
+    "接口2": "Interface 2",
 }
 
 
@@ -48,7 +60,7 @@ def get_real_url(short_url):
     ).url.split("/?")[0]
 
 
-def get_video(video_url: str, p: int, cache=f"{TMP_DIR}/bili"):
+def get_video(video_url: str, p: int, cache: str):
     bvid = video_url.split("bilibili.com/video/")[-1]
     response = requests.get(
         API_BILI_2,
@@ -80,8 +92,62 @@ def get_video(video_url: str, p: int, cache=f"{TMP_DIR}/bili"):
         raise ConnectionError(f"Failed to get video: {retcode}")
 
 
+def channel_2(video_url: str, p: int, cache: str):
+    response = requests.get(
+        API_BILI_1,
+        params={
+            "url": video_url,
+            "type": "json",
+        },
+        timeout=TIMEOUT,
+    )
+    response_json = response.json()
+    retcode = response_json["code"]
+    if retcode == 200:
+        title = response_json["title"]
+        cover = response_json["imgurl"]
+        desc = response_json["desc"]
+
+        response_data = response_json["data"][int(p) - 1]
+        dur = response_data["duration"]
+        video = get_video(video_url, p, cache)
+
+        author_data = response_json["user"]
+        author = author_data["name"]
+        avatar = author_data["user_img"]
+
+        return title, cover, video, desc, dur, avatar, author
+
+    else:
+        raise ConnectionError(f"接口调用失败, 错误码: {retcode}")
+
+
+def channel_1(video_url: str, p: int, cache: str):
+    response = requests.get(API_BILI, params={"url": video_url}, timeout=TIMEOUT)
+    response_json = response.json()
+    retcode = response_json["code"]
+    if retcode == 1:
+        title = response_json["title"]
+        cover = response_json["imgurl"]
+        desc = response_json["desc"]
+
+        response_data = response_json["data"][int(p) - 1]
+        dur = response_data["duration"]
+        video_id = video_url.split("/")[-1]
+        video = download_file(response_data["video_url"], video_id, cache)
+
+        author_data = response_json["user"]
+        author = author_data["name"]
+        avatar = author_data["user_img"]
+
+        return title, cover, video, desc, dur, avatar, author
+
+    else:
+        raise ConnectionError(f"Failed to call API, error code: {retcode}")
+
+
 # outer func
-def infer(video_url: str, p: int):
+def infer(ch: str, video_url: str, p: int, cache=f"{TMP_DIR}/bili"):
     status = "Success"
     title = cover = desc = dur = video = author = avatar = None
     try:
@@ -92,31 +158,11 @@ def infer(video_url: str, p: int):
         if "b23.tv" in video_url:
             video_url = get_real_url(video_url)
 
-        response = requests.get(
-            API_BILI_1,
-            params={
-                "url": video_url,
-                "type": "json",
-            },
-            timeout=TIMEOUT,
+        title, cover, video, desc, dur, avatar, author = (
+            channel_1(video_url, p, cache)
+            if ch == _L("接口1")
+            else channel_2(video_url, p, cache)
         )
-        response_json = response.json()
-        retcode = response_json["code"]
-        if retcode == 200:
-            title = response_json["title"]
-            cover = response_json["imgurl"]
-            desc = response_json["desc"]
-
-            response_data = response_json["data"][int(p) - 1]
-            dur = response_data["duration"]
-            video = get_video(video_url, p)
-
-            author_data = response_json["user"]
-            author = author_data["name"]
-            avatar = author_data["user_img"]
-
-        else:
-            raise ConnectionError(f"接口调用失败, 错误码: {retcode}")
 
     except Exception as e:
         status = f"视频解析失败: {e}"
@@ -128,6 +174,11 @@ def bili_parser():
     return gr.Interface(
         fn=infer,
         inputs=[
+            gr.Dropdown(
+                label=_L("通道"),
+                choices=[_L("接口1"), _L("接口2")],
+                value=_L("接口1"),
+            ),
             gr.Textbox(
                 label=_L("请输入B站视频链接"),
                 placeholder="https://www.bilibili.com/video/*",
@@ -152,10 +203,11 @@ def bili_parser():
         title=_L("B站视频解析"),
         flagging_mode="never",
         examples=[
-            ["BV1Dt4y1o7bU", 1],
-            ["https://b23.tv/LuTAbzj", 1],
-            ["https://www.bilibili.com/video/BV1Dt4y1o7bU", 1],
+            [_L("接口1"), "BV1Dt4y1o7bU", 1],
+            [_L("接口1"), "https://b23.tv/LSoJzpW", 1],
+            [_L("接口2"), "https://www.bilibili.com/video/BV1G8iRYBE4f", 1],
             [
+                _L("接口2"),
                 "【『新年おめでとう | 2024』你就如同烟花一般，在我心中绽放！-哔哩哔哩】 https://b23.tv/LuTAbzj",
                 1,
             ],

utils.py

@@ -7,6 +7,7 @@ from datetime import datetime
 
 LANG = os.getenv("language")
 API_TIKTOK = os.getenv("api_tiktok")
+API_BILI = os.getenv("api_bili")
 API_BILI_1 = os.getenv("api_bili_1")
 API_BILI_2 = os.getenv("api_bili_2")
 if not (API_TIKTOK and API_BILI_1 and API_BILI_2):