sync ms

app.py

@@ -12,10 +12,7 @@ ZH2EN = {
 
 
 def _L(zh_txt: str):
-    if LANG:
-        return ZH2EN[zh_txt]
-    else:
-        return zh_txt
+    return ZH2EN[zh_txt] if LANG else zh_txt
 
 
 if __name__ == "__main__":

modules/bili.py

@@ -1,8 +1,8 @@
-import re
 import requests
 import gradio as gr
 from utils import (
     download_file,
+    extract_fst_url,
     HEADER,
     TIMEOUT,
     API_BILI,
@@ -31,17 +31,13 @@ ZH2EN = {
 
 
 def _L(zh_txt: str):
-    if LANG:
-        return ZH2EN[zh_txt]
-    else:
-        return zh_txt
+    return ZH2EN[zh_txt] if LANG else zh_txt
 
 
-def extract_fst_url(text):
-    url_pattern = r'(https?://[^\s"]+)'
-    match = re.search(url_pattern, text)
-    if match:
-        out_url = match.group(1).split("?")[0]
+def get_fst_url(text):
+    fst_url = extract_fst_url(text)
+    if fst_url:
+        out_url = fst_url.split("?")[0]
         if out_url[-1] == "/":
             out_url = out_url[:-1]
 
@@ -110,12 +106,13 @@ def channel_2(video_url: str, p: int, cache: str):
 
         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"]
 
+        video = get_video(video_url, p, cache)
+
         return title, cover, video, desc, dur, avatar, author
 
     else:
@@ -131,15 +128,15 @@ def channel_1(video_url: str, p: int, cache: str):
         cover = response_json["imgurl"]
         desc = response_json["desc"]
 
+        author_data = response_json["user"]
+        author = author_data["name"]
+        avatar = author_data["user_img"]
+
         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:
@@ -157,7 +154,7 @@ def infer(ch: str, video_url: str, p: int, cache=f"{TMP_DIR}/bili"):
         if not video_url:
             raise ValueError("视频链接为空!")
 
-        video_url = extract_fst_url(video_url)
+        video_url = get_fst_url(video_url)
         if "b23.tv" in video_url:
             video_url = get_real_url(video_url)
 

modules/bvid2acid.py

@@ -9,10 +9,7 @@ ZH2EN = {
 
 
 def _L(zh_txt: str):
-    if LANG:
-        return ZH2EN[zh_txt]
-    else:
-        return zh_txt
+    return ZH2EN[zh_txt] if LANG else zh_txt
 
 
 def infer(bvid: str):

modules/tiktok.py

@@ -1,7 +1,6 @@
-import re
 import requests
 import gradio as gr
-from utils import download_file, API_TIKTOK, TIMEOUT, LANG, TMP_DIR
+from utils import download_file, extract_fst_url, API_TIKTOK, TIMEOUT, LANG, TMP_DIR
 
 ZH2EN = {
     "状态栏": "Status",
@@ -13,27 +12,16 @@ ZH2EN = {
     "作者昵称": "Author nickname",
     "作者签名": "Author signature",
     "抖音无水印视频解析": "Parse TikTok video without watermark",
+    "直链": "Direct link",
 }
 
 
 def _L(zh_txt: str):
-    if LANG:
-        return ZH2EN[zh_txt]
-    else:
-        return zh_txt
-
-
-def extract_fst_url(text):
-    url_pattern = r'(https?://[^\s"]+)'
-    match = re.search(url_pattern, text)
-    if match:
-        return match.group(1)
-    else:
-        return None
+    return ZH2EN[zh_txt] if LANG else zh_txt
 
 
 # outer func
-def infer(video_url, cache=f"{TMP_DIR}/tiktok"):
+def infer(direct_link, video_url, cache=f"{TMP_DIR}/tiktok"):
     status = "Success"
     video = parse_time = desc = avatar = author = sign = None
     try:
@@ -49,16 +37,19 @@ def infer(video_url, cache=f"{TMP_DIR}/tiktok"):
         retcode = response_json["code"]
         if retcode == 200:
             response_data = response_json["data"]
-            video_id = response_data["play_url"].split("video_id=")[1].split("&")[0]
-            video = download_file(response_data["video_url"], video_id, cache)
             parse_time = response_data["parse_time"]
-
             additional_data = response_data["additional_data"][0]
             desc = additional_data["desc"]
             avatar = additional_data["url"].split("?from=")[0]
             author = additional_data["nickname"]
             sign = additional_data["signature"]
 
+            if direct_link:
+                video = response_data["video_url"]
+            else:
+                video_id = response_data["play_url"].split("video_id=")[1].split("&")[0]
+                video = download_file(response_data["video_url"], video_id, cache)
+
         else:
             raise ConnectionError(f"接口调用失败, 错误码: HTTP {retcode}")
 
@@ -72,6 +63,7 @@ def tiktok_parser():
     return gr.Interface(
         fn=infer,
         inputs=[
+            gr.Checkbox(label=_L("直链"), value=False),
             gr.Textbox(
                 label=_L("请输入抖音视频分享短链接"),
                 placeholder="https://v.douyin.com/*",
@@ -93,8 +85,11 @@ def tiktok_parser():
         title=_L("抖音无水印视频解析"),
         flagging_mode="never",
         examples=[
-            "https://v.douyin.com/8FVe5DzarE0",
-            "8.20 Njc:/ [email protected] 11/03 黑塔女士举世无双！# 大黑塔 # 黑塔 # 崩坏星穹铁道 # 再创世的凯歌 # 天才俱乐部  https://v.douyin.com/8FVe5DzarE0/ 复制此链接，打开Dou音搜索，直接观看视频！",
+            [False, "https://v.douyin.com/8FVe5DzarE0"],
+            [
+                True,
+                "8.20 Njc:/ [email protected] 11/03 黑塔女士举世无双！# 大黑塔 # 黑塔 # 崩坏星穹铁道 # 再创世的凯歌 # 天才俱乐部  https://v.douyin.com/8FVe5DzarE0/ 复制此链接，打开Dou音搜索，直接观看视频！",
+            ],
         ],
         cache_examples=False,
     )

utils.py

@@ -1,8 +1,11 @@
 import os
+import re
 import shutil
 import requests
 from tqdm import tqdm
 from datetime import datetime
+from zoneinfo import ZoneInfo
+from tzlocal import get_localzone
 
 
 LANG = os.getenv("language")
@@ -21,11 +24,13 @@ HEADER = {
 }
 
 
-def timestamp(naive_time: datetime = None):
+def timestamp(naive_time: datetime = None, target_tz=ZoneInfo("Asia/Shanghai")):
     if not naive_time:
         naive_time = datetime.now()
 
-    return naive_time.strftime("%Y-%m-%d %H:%M:%S")
+    local_tz = get_localzone()
+    aware_local = naive_time.replace(tzinfo=local_tz)
+    return aware_local.astimezone(target_tz).strftime("%Y-%m-%d %H:%M:%S")
 
 
 def mk_dir(dirpath: str):
@@ -66,3 +71,12 @@ def download_file(url, video_id, cache_dir: str):
         raise ConnectionError(f"HTTP: {response.status_code}")
 
     return local_file
+
+
+def extract_fst_url(text):
+    url_pattern = r'(https?://[^\s"]+)'
+    match = re.search(url_pattern, text)
+    if match:
+        return match.group(1)
+    else:
+        return None