From f87121b0716c491a4603ab74d88f4b0a003a5dcb Mon Sep 17 00:00:00 2001 From: thsrite Date: Sun, 3 Nov 2024 19:53:44 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E5=AA=92=E4=BD=93?= =?UTF-8?q?=E5=BA=93=E9=BB=91=E5=90=8D=E5=8D=95=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 ++- package.v2.json | 3 ++- plugins.v2/embyreporter/__init__.py | 7 ++++--- plugins/embyreporter/__init__.py | 7 ++++--- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 11abc83..421e018 100644 --- a/package.json +++ b/package.json @@ -218,11 +218,12 @@ "name": "Emby观影报告", "description": "推送Emby观影报告，需Emby安装Playback Report 插件。", "labels": "Emby", - "version": "1.9", + "version": "1.9.1", "icon": "Pydiocells_A.png", "author": "thsrite", "level": 1, "history": { + "v1.9.1": "修复媒体库黑名单设置", "v1.9": "支持媒体库黑名单设置", "v1.8": "推送微信增加时间戳，防止使用缓存", "v1.7": "分块发送，兼容微信推送", diff --git a/package.v2.json b/package.v2.json index d6ce825..cbac410 100644 --- a/package.v2.json +++ b/package.v2.json @@ -44,11 +44,12 @@ "name": "Emby观影报告", "description": "推送Emby观影报告，需Emby安装Playback Report 插件。", "labels": "Emby", - "version": "2.1", + "version": "2.1.1", "icon": "Pydiocells_A.png", "author": "thsrite", "level": 1, "history": { + "v2.1.1": "修复媒体库黑名单设置", "v2.1": "支持媒体库黑名单设置", "v2.0": "修复获取媒体服务器配置", "v1.9": "适配v2多媒体服务器", diff --git a/plugins.v2/embyreporter/__init__.py b/plugins.v2/embyreporter/__init__.py index 8b6a6cb..08226cd 100644 --- a/plugins.v2/embyreporter/__init__.py +++ b/plugins.v2/embyreporter/__init__.py @@ -34,7 +34,7 @@ class EmbyReporter(_PluginBase): # 插件图标 plugin_icon = "Pydiocells_A.png" # 插件版本 - plugin_version = "2.1" + plugin_version = "2.1.1" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -644,7 +644,8 @@ class EmbyReporter(_PluginBase): success, info = self.items(user_id, item_id) if success and info: success, parent_info = self.items(user_id, info["ParentId"]) - if success and parent_info and parent_info["ParentId"] in self._black_library: + if (success and parent_info + and str(parent_info["ParentId"]) in str(self._black_library).split(",")): logger.info(f"电影 {name} 已在媒体库黑名单 {self._black_library} 中，已过滤") continue exists_movies.append(i) @@ -675,7 +676,7 @@ class EmbyReporter(_PluginBase): # 过滤电视剧 if self._black_library: success, parent_info = self.items(user_id, item_id) - if success and parent_info and parent_info["ParentId"] in self._black_library: + if success and parent_info and str(parent_info["ParentId"]) in str(self._black_library).split(","): logger.info(f"电视剧 {name} 已在媒体库黑名单 {self._black_library} 中，已过滤") continue # 封面图像获取 diff --git a/plugins/embyreporter/__init__.py b/plugins/embyreporter/__init__.py index 8af5c3a..2c5d753 100644 --- a/plugins/embyreporter/__init__.py +++ b/plugins/embyreporter/__init__.py @@ -33,7 +33,7 @@ class EmbyReporter(_PluginBase): # 插件图标 plugin_icon = "Pydiocells_A.png" # 插件版本 - plugin_version = "1.9" + plugin_version = "1.9.1" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -600,7 +600,8 @@ class EmbyReporter(_PluginBase): success, info = self.items(user_id, item_id) if success and info: success, parent_info = self.items(user_id, info["ParentId"]) - if success and parent_info and parent_info["ParentId"] in self._black_library: + if (success and parent_info + and str(parent_info["ParentId"]) in str(self._black_library).split(",")): logger.info(f"电影 {name} 已在媒体库黑名单 {self._black_library} 中，已过滤") continue exists_movies.append(i) @@ -630,7 +631,7 @@ class EmbyReporter(_PluginBase): # 过滤电视剧 if self._black_library: success, parent_info = self.items(user_id, item_id) - if success and parent_info and parent_info["ParentId"] in self._black_library: + if success and parent_info and str(parent_info["ParentId"]) in str(self._black_library).split(","): logger.info(f"电视剧 {name} 已在媒体库黑名单 {self._black_library} 中，已过滤") continue # 封面图像获取