Commit cf4b914
Changed files (1)
src
preview
src/preview/ytdlp.py
@@ -39,7 +39,6 @@ async def preview_ytdlp(
client: Client,
message: Message,
url: str = "",
- platform: str = "",
*,
ytdlp_audio_only: bool = False,
ytdlp_send_video: bool = True,
@@ -55,7 +54,6 @@ async def preview_ytdlp(
client (Client): The Pyrogram client.
message (Message): The trigger message object.
url (str, optional): ytdlp link.
- platform (str, optional): Platform of the link, e.g. "bilibili", "youtube".
ytdlp_audio_only (bool, optional): Download audio only. Defaults to True.
ytdlp_send_video (bool, optional): Send video. Defaults to True.
ytdlp_send_audio (bool, optional): Send audio. Defaults to False.
@@ -65,11 +63,11 @@ async def preview_ytdlp(
"""
logger.trace(f"{url=} {kwargs=}")
if kwargs.get("show_progress") and "progress" not in kwargs:
- res = await send2tg(client, message, texts=f"🔗正在解析{platform}链接\n{url}", **kwargs)
+ res = await send2tg(client, message, texts=f"🔗正在解析链接\n{url}", **kwargs)
kwargs["progress"] = res[0]
db_key = url
if kv := await get_db(db_key):
- logger.debug(f"{platform} preview {DB.ENGINE} cache hit for key={db_key}")
+ logger.debug(f"YT-DLP preview {DB.ENGINE} cache hit for key={db_key}")
if await copy_messages_from_db(client, message, key=db_key, kv=kv, **kwargs):
return
await modify_progress(text=f"❌从{DB.ENGINE}缓存中转发失败, 尝试重新解析...", **kwargs)
@@ -338,7 +336,7 @@ def download_video_info(url: str, ydl_opts: dict, json_path: str | Path) -> dict
with Path(json_path).open("w") as f:
json.dump(ydl.sanitize_info(info), f, ensure_ascii=False, indent=2)
# add custom fields
- info["extractor"] = info.get("extractor", "")
+ info["extractor"] = info.get("extractor", "").lower()
info["author"] = info.get("uploader", info.get("series", info["extractor"]))
info["author_url"] = uploader_url(info, info["extractor"])
info["title"] = info.get("title", "")
@@ -438,7 +436,6 @@ def uploader_url(info: dict, extractor: str) -> str:
if url := info.get("uploader_url"):
return url
if author_id := info.get("uploader_id"):
- extractor = extractor.lower()
if "youtube" in extractor:
return f"https://www.youtube.com/{author_id}"
if "bilibili" in extractor:
@@ -447,7 +444,6 @@ def uploader_url(info: dict, extractor: str) -> str:
def platform_emoji(extractor: str) -> str:
- extractor = extractor.lower()
if "bilibili" in extractor:
return "🅱️"
if "youtube" in extractor: