From 0fadba57075c89d3dc1c00a8a46fca5bbe58a316 Mon Sep 17 00:00:00 2001 From: ForgQi <34411314+ForgQi@users.noreply.github.com> Date: Wed, 29 May 2024 23:44:11 +0800 Subject: [PATCH] Bumping version --- biliup/__init__.py | 2 +- biliup/engine/download.py | 4 ++-- biliup/handler.py | 12 +++++++----- biliup/plugins/huya.py | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/biliup/__init__.py b/biliup/__init__.py index 57f5b67..84f1247 100644 --- a/biliup/__init__.py +++ b/biliup/__init__.py @@ -2,7 +2,7 @@ import logging import platform import sys -__version__ = "0.4.66" +__version__ = "0.4.67" LOG_CONF = { 'version': 1, diff --git a/biliup/engine/download.py b/biliup/engine/download.py index f1e5539..68e96b7 100644 --- a/biliup/engine/download.py +++ b/biliup/engine/download.py @@ -308,8 +308,8 @@ class DownloadBase(ABC): if self.is_download: break - # 最后一次下载完成时间 - end_time = time.localtime() + # 最后一次下载完成时间 + end_time = time.localtime() self.download_cover( time.strftime(self.gen_download_filename().encode("unicode-escape").decode(), end_time if end_time else time.localtime() diff --git a/biliup/handler.py b/biliup/handler.py index cb8400f..7b054a6 100644 --- a/biliup/handler.py +++ b/biliup/handler.py @@ -93,8 +93,13 @@ def process_upload(stream_info): url_upload_count = context['url_upload_count'] # 上传开始 try: - url_status = context['PluginInfo'].url_status + file_list = UploadBase.file_list(name) + if len(file_list) <= 0: + logger.debug("无需上传") + return + # 上传延迟检测 + url_status = context['PluginInfo'].url_status delay = int(config.get('delay', 0)) if delay: logger.info(f'{name} -> {url} {delay}s 后检测是否上传') @@ -102,10 +107,7 @@ def process_upload(stream_info): if url_status[url] == 1: # 上传延迟检测,启用的话会在一段时间后检测是否存在下载任务,若存在则跳过本次上传 return logger.info(f'{name} -> {url} 存在下载任务, 跳过本次上传') - file_list = UploadBase.file_list(name) - if len(file_list) <= 0: - logger.debug("无需上传") - return + if ("title" not in stream_info) or (not stream_info["title"]): # 如果 data 中不存在标题, 说明下载信息已丢失, 则尝试从数据库获取 with SessionLocal() as db: data, _ = fmt_title_and_desc({ diff --git a/biliup/plugins/huya.py b/biliup/plugins/huya.py index 577bd7b..9e6e324 100644 --- a/biliup/plugins/huya.py +++ b/biliup/plugins/huya.py @@ -69,7 +69,7 @@ class Huya(DownloadBase): # 虎牙直播流只允许连接一次,非常丑陋的代码 if cdn_fallback: - _url = self.acheck_url_healthy(stream_url) + _url = await self.acheck_url_healthy(stream_url) if _url is None: logger.info(f"{self.plugin_msg}: {list(sCdns.keys())}") for sCdn in sCdns.keys():