From 9a74177d734a5c7b02d156dd630747af5628bb52 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Sun, 20 Aug 2023 08:37:06 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E8=B0=83=E6=95=B4=E4=BA=86CookieCloud?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=80=BB=E8=BE=91=EF=BC=8C=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E4=BC=9A=E5=90=8C=E6=AD=A5=E6=97=A0=E6=B3=95=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=9A=84=E7=AB=99=E7=82=B9=20-=20=E6=96=B0=E5=A2=9E=E4=BA=86?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=B7=BB=E5=8A=A0=E7=AB=99=E7=82=B9=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=20-=20=E5=A2=9E=E5=BC=BA=E4=BA=86=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E6=8F=92=E4=BB=B6=EF=BC=8C=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=8B=AC=E7=AB=8B=E7=9A=84=E8=BD=AC=E7=A7=BB?= =?UTF-8?q?=E7=9B=AE=E7=9A=84=E7=9B=AE=E5=BD=95=20-=20=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=87=8D=E6=96=B0=E6=95=B4=E7=90=86=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E7=9B=AE=E5=BD=95=E7=9B=91=E6=8E=A7=E4=BA=A7=E7=94=9F?= =?UTF-8?q?=E7=9A=84=E8=AE=B0=E5=BD=95=20-=20=E5=A2=9E=E5=BC=BA=E4=BA=86RS?= =?UTF-8?q?S=E8=AE=A2=E9=98=85=E6=8F=92=E4=BB=B6=EF=BC=8C=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E7=9B=B4=E6=8E=A5=E4=B8=8B=E8=BD=BD=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=20-=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=89=A7=E9=9B=86=E5=88=AE?= =?UTF-8?q?=E5=89=8A=E9=9B=86=E7=9A=84TMDBID=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20-=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=83=A8?= =?UTF-8?q?=E5=88=86=E7=AB=99=E7=82=B9=E5=8A=A8=E6=BC=AB=E7=94=B5=E5=BD=B1?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=97=A0=E6=B3=95=E6=90=9C=E7=B4=A2=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20-=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=AA=92?= =?UTF-8?q?=E4=BD=93=E5=BA=93=E5=A4=9A=E7=9B=98=E7=9B=AE=E5=BD=95=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E7=9A=84=E9=97=AE=E9=A2=98=20-=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BA=86=E8=87=AA=E5=8A=A8=E8=BD=AC=E7=A7=BB=E5=81=9A=E7=A7=8D?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=20-=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=AA=92?= =?UTF-8?q?=E4=BD=93=E5=BA=93=E5=88=AE=E5=89=8A=E6=8F=92=E4=BB=B6=E5=88=AE?= =?UTF-8?q?=E5=89=8A=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98=20-=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=BC=98=E5=85=88=E7=BA=A7=E5=8C=B9?= =?UTF-8?q?=E9=85=8D=E7=9A=84=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/modules/filter/__init__.py | 2 +- app/plugins/libraryscraper/__init__.py | 10 +++++++++- version.py | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/modules/filter/__init__.py b/app/modules/filter/__init__.py index 3ba8eaeb..080a7e09 100644 --- a/app/modules/filter/__init__.py +++ b/app/modules/filter/__init__.py @@ -180,7 +180,7 @@ class FilterModule(_ModuleBase): if self.__match_group(torrent, parsed_group.as_list()[0]): # 出现匹配时中断 matched = True - logger.info(f"种子 {torrent.site_name} - {torrent.title} 优先级为 {res_order}") + logger.info(f"种子 {torrent.site_name} - {torrent.title} 优先级为 {100 - res_order + 1}") torrent.pri_order = res_order break # 优先级降低，继续匹配 diff --git a/app/plugins/libraryscraper/__init__.py b/app/plugins/libraryscraper/__init__.py index 94fab4e2..24b76705 100644 --- a/app/plugins/libraryscraper/__init__.py +++ b/app/plugins/libraryscraper/__init__.py @@ -260,6 +260,9 @@ class LibraryScraper(_PluginBase): # 查找目录下所有的文件 files = SystemUtils.list_files_with_extensions(path, settings.RMT_MEDIAEXT) for file in files: + if self._event.is_set(): + logger.info(f"媒体库刮削服务停止") + return # 排除目录 exclude_flag = False for exclude_path in exclude_paths: @@ -271,6 +274,11 @@ class LibraryScraper(_PluginBase): continue # 识别媒体文件 meta_info = MetaInfo(file.name) + if meta_info.type == MediaType.TV: + dir_info = MetaInfo(file.parent.parent.name) + else: + dir_info = MetaInfo(file.parent.name) + meta_info.merge(dir_info) # 优先读取本地nfo文件 tmdbid = None if meta_info.type == MediaType.MOVIE: @@ -297,7 +305,7 @@ class LibraryScraper(_PluginBase): logger.warn(f"未识别到媒体信息：{file}") continue # 开始刮削 - self.chain.scrape_metadata(path=path, mediainfo=mediainfo) + self.chain.scrape_metadata(path=file, mediainfo=mediainfo) @staticmethod def __get_tmdbid_from_nfo(file_path: Path): diff --git a/version.py b/version.py index 64bd0374..61f01cb7 100644 --- a/version.py +++ b/version.py @@ -1 +1 @@ -APP_VERSION = 'v1.0.2' +APP_VERSION = 'v1.0.3'