From 48a19fd57c17434790a2002a0741a1147591c037 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Sat, 9 Mar 2024 20:03:57 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix=20=E4=B8=8B=E8=BD=BD=E5=99=A8=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/modules/qbittorrent/__init__.py | 4 ++-- app/modules/transmission/__init__.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/modules/qbittorrent/__init__.py b/app/modules/qbittorrent/__init__.py index 17471b5b..7950f44f 100644 --- a/app/modules/qbittorrent/__init__.py +++ b/app/modules/qbittorrent/__init__.py @@ -32,8 +32,8 @@ class QbittorrentModule(_ModuleBase): """ if self.qbittorrent.is_inactive(): self.qbittorrent.reconnect() - if self.qbittorrent.is_inactive(): - return False, "无法连接Qbittorrent，请检查参数配置" + if not self.qbittorrent.transfer_info(): + return False, "无法获取Qbittorrent状态，请检查参数配置" return True, "" def init_setting(self) -> Tuple[str, Union[str, bool]]: diff --git a/app/modules/transmission/__init__.py b/app/modules/transmission/__init__.py index 34b2f58f..09a0b264 100644 --- a/app/modules/transmission/__init__.py +++ b/app/modules/transmission/__init__.py @@ -32,8 +32,8 @@ class TransmissionModule(_ModuleBase): """ if self.transmission.is_inactive(): self.transmission.reconnect() - if self.transmission.is_inactive(): - return False, "无法连接Transmission，请检查参数配置" + if not self.transmission.transfer_info(): + return False, "无法获取Transmission状态，请检查参数配置" return True, "" def init_setting(self) -> Tuple[str, Union[str, bool]]: From 04c21232e34735950e4b5c1d0ad6cd721b59bb35 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Sat, 9 Mar 2024 21:03:29 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix=20yyyymmdd=E6=9C=9F=20=E8=AF=86?= =?UTF-8?q?=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/core/meta/metabase.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/core/meta/metabase.py b/app/core/meta/metabase.py index 9b395e13..686c0afd 100644 --- a/app/core/meta/metabase.py +++ b/app/core/meta/metabase.py @@ -131,6 +131,10 @@ class MetaBase(object): except Exception as err: logger.debug(f'识别季失败：{str(err)} - {traceback.format_exc()}') return + if begin_season and begin_season > 100: + return + if end_season and end_season > 100: + return if self.begin_season is None and isinstance(begin_season, int): self.begin_season = begin_season self.total_season = 1 From 542531a1caf7ba2503c6df7b2f6142605f72e91a Mon Sep 17 00:00:00 2001 From: jxxghp Date: Sat, 9 Mar 2024 21:13:23 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix=20yyyymmdd=E6=9C=9F=20=E8=AF=86?= =?UTF-8?q?=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/core/meta/metabase.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/core/meta/metabase.py b/app/core/meta/metabase.py index 686c0afd..fdb93dbf 100644 --- a/app/core/meta/metabase.py +++ b/app/core/meta/metabase.py @@ -166,6 +166,10 @@ class MetaBase(object): except Exception as err: logger.debug(f'识别集失败：{str(err)} - {traceback.format_exc()}') return + if begin_episode and begin_episode >= 10000: + return + if end_episode and end_episode >= 10000: + return if self.begin_episode is None and isinstance(begin_episode, int): self.begin_episode = begin_episode self.total_episode = 1 From e10464c278f4fb2103bcf8599d4eeaa2647b200d Mon Sep 17 00:00:00 2001 From: jxxghp Date: Sat, 9 Mar 2024 21:20:36 +0800 Subject: [PATCH 4/6] v1.7.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 动漫独立目录时支持二级分类（category.yml配置模板已更新） - 支持同时启用两个下载器，但只有第1个才会被默认使用（官方插件库个别插件进行了适配升级） - 实时日志的最新日志显示在最顶部 - 优化了下载器及媒体目录的健康检查 - 优化了版本升级后因为浏览器缓存一直加载中的问题 - 优先级规则新增支持`官种` - 修复了普通用户无法查看下载中任务的问题 - 修复了设定中修改定时服务相关设置时不立即生效的问题 --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index 77478818..447b04e5 100644 --- a/version.py +++ b/version.py @@ -1 +1 @@ -APP_VERSION = 'v1.7.0-1' +APP_VERSION = 'v1.7.1' From 9b9ae9401e3747cd46d709685abd41f7e9eeef3f Mon Sep 17 00:00:00 2001 From: jxxghp Date: Sat, 9 Mar 2024 21:33:59 +0800 Subject: [PATCH 5/6] fix bug --- app/chain/__init__.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/chain/__init__.py b/app/chain/__init__.py index 50b0b4c6..e0bcd08e 100644 --- a/app/chain/__init__.py +++ b/app/chain/__init__.py @@ -325,8 +325,7 @@ class ChainBase(metaclass=ABCMeta): def transfer(self, path: Path, meta: MetaBase, mediainfo: MediaInfo, transfer_type: str, target: Path = None, - episodes_info: List[TmdbEpisode] = None, - downloader: str = settings.DEFAULT_DOWNLOADER) -> Optional[TransferInfo]: + episodes_info: List[TmdbEpisode] = None) -> Optional[TransferInfo]: """ 文件转移 :param path: 文件路径 @@ -335,12 +334,10 @@ class ChainBase(metaclass=ABCMeta): :param transfer_type: 转移模式 :param target: 转移目标路径 :param episodes_info: 当前季的全部集信息 - :param downloader: 下载器 :return: {path, target_path, message} """ return self.run_module("transfer", path=path, meta=meta, mediainfo=mediainfo, - transfer_type=transfer_type, target=target, - episodes_info=episodes_info, downloader=downloader) + transfer_type=transfer_type, target=target, episodes_info=episodes_info) def transfer_completed(self, hashs: Union[str, list], path: Path = None, downloader: str = settings.DEFAULT_DOWNLOADER) -> None: From 4510382f7474be8b821314da7a8aa6537c5fa21b Mon Sep 17 00:00:00 2001 From: thsrite Date: Sun, 10 Mar 2024 09:27:48 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix=20tv=E5=8A=A8=E6=BC=AB=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E4=B8=8D=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/modules/themoviedb/category.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/modules/themoviedb/category.py b/app/modules/themoviedb/category.py index daf2f091..ff3ff459 100644 --- a/app/modules/themoviedb/category.py +++ b/app/modules/themoviedb/category.py @@ -107,7 +107,7 @@ class CategoryHelper(metaclass=Singleton): :return: 二级分类的名称 """ genre_ids = tmdb_info.get("genre_ids") or [] - if genre_ids \ + if self._anime_categorys and genre_ids \ and set(genre_ids).intersection(set(settings.ANIME_GENREIDS)): return self.get_category(self._anime_categorys, tmdb_info) return self.get_category(self._tv_categorys, tmdb_info)