sync ms

app.py

@@ -1,7 +1,6 @@
 import gradio as gr
 from modules.tiktok import tiktok_parser
-from modules.bili import bili_parser
-from modules.bvid2acid import bv2acid
+from modules.bili import bili
 from utils import EN_US
 
 ZH2EN = {
@@ -22,8 +21,6 @@ if __name__ == "__main__":
             tiktok_parser()
 
         with gr.Tab(_L("B站")):
-            with gr.Column():
-                bv2acid()
-                bili_parser()
+            bili()
 
     demo.launch()

modules/bili.py

@@ -23,10 +23,11 @@ ZH2EN = {
     "视频时长(s)": "Video duration(s)",
     "UP主头像": "Uploader avatar",
     "UP主昵称": "Uploader nickname",
-    "B站视频解析": "BiliBili video parser",
     "通道": "Channel",
     "接口1": "Interface 1",
     "接口2": "Interface 2",
+    "B站视频解析": "BiliBili video parser",
+    "将 Bvid 转为 aid 或 cid": "Bvid to aid / cid",
 }
 
 
@@ -200,7 +201,6 @@ def bili_parser():
             gr.Image(label=_L("UP主头像"), show_share_button=False),
             gr.Textbox(label=_L("UP主昵称"), show_copy_button=True),
         ],
-        title=_L("B站视频解析"),
         flagging_mode="never",
         examples=[
             [_L("接口1"), "BV1Dt4y1o7bU", 1],
@@ -214,3 +214,48 @@ def bili_parser():
         ],
         cache_examples=False,
     )
+
+
+# bv2acid
+def bvid_to_aid_or_cid(bvid: str):
+    status = "Success"
+    aid = cid = None
+    try:
+        response = requests.get(
+            "https://api.bilibili.com/x/web-interface/view",
+            params={"bvid": bvid},
+            headers=HEADER,
+        )
+        data = response.json()["data"]
+        aid = data["aid"]
+        cid = data["cid"]
+
+    except Exception as e:
+        status = f"{e}"
+
+    return status, aid, cid
+
+
+def bv2acid():
+    return gr.Interface(
+        fn=bvid_to_aid_or_cid,
+        inputs=gr.Textbox(label="bvid"),
+        outputs=[
+            gr.Textbox(label=_L("状态栏"), show_copy_button=True),
+            gr.Textbox(label="aid", show_copy_button=True),
+            gr.Textbox(label="cid", show_copy_button=True),
+        ],
+        flagging_mode="never",
+        examples=["BV1Dt4y1o7bU", "BV1G8iRYBE4f"],
+    )
+
+
+# bili ui
+def bili():
+    with gr.Blocks() as demo:
+        with gr.Tab(_L("B站视频解析")):
+            bili_parser()
+        with gr.Tab(_L("将 Bvid 转为 aid 或 cid")):
+            bv2acid()
+
+    return demo

modules/bvid2acid.py

@@ -1,45 +0,0 @@
-import requests
-import gradio as gr
-from utils import EN_US, HEADER
-
-ZH2EN = {
-    "状态栏": "Status",
-    "将 Bvid 转为 aid 或 cid": "Bvid to aid / cid",
-}
-
-
-def _L(zh_txt: str):
-    return ZH2EN[zh_txt] if EN_US else zh_txt
-
-
-def infer(bvid: str):
-    status = "Success"
-    aid = cid = None
-    try:
-        response = requests.get(
-            "https://api.bilibili.com/x/web-interface/view",
-            params={"bvid": bvid},
-            headers=HEADER,
-        )
-        data = response.json()["data"]
-        aid = data["aid"]
-        cid = data["cid"]
-
-    except Exception as e:
-        status = f"{e}"
-
-    return status, aid, cid
-
-
-def bv2acid():
-    return gr.Interface(
-        fn=infer,
-        inputs=gr.Textbox(label="bvid"),
-        outputs=[
-            gr.Textbox(label=_L("状态栏"), show_copy_button=True),
-            gr.Textbox(label="aid", show_copy_button=True),
-            gr.Textbox(label="cid", show_copy_button=True),
-        ],
-        title=_L("将 Bvid 转为 aid 或 cid"),
-        flagging_mode="never",
-    )