From 0f774c3d98134c95149617e57b4e9eda0c878c11 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Tue, 14 May 2024 11:43:51 +0800 Subject: [PATCH] fix #290 --- package.json | 7 +++++-- plugins/bestfilmversion/__init__.py | 14 +++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 2516d98..5fec129 100644 --- a/package.json +++ b/package.json @@ -164,10 +164,13 @@ "name": "收藏洗版", "description": "Jellyfin/Emby/Plex点击收藏电影后,自动订阅洗版。", "labels": "订阅", - "version": "2.1", + "version": "2.2", "icon": "like.jpg", "author": "wlj", - "level": 2 + "level": 2, + "history": { + "v2.2": "修复运行报错问题" + } }, "MediaServerMsg": { "name": "媒体库服务器通知", diff --git a/plugins/bestfilmversion/__init__.py b/plugins/bestfilmversion/__init__.py index 92aba56..e1af397 100644 --- a/plugins/bestfilmversion/__init__.py +++ b/plugins/bestfilmversion/__init__.py @@ -34,7 +34,7 @@ class BestFilmVersion(_PluginBase): # 插件图标 plugin_icon = "like.jpg" # 插件版本 - plugin_version = "2.1" + plugin_version = "2.2" # 插件作者 plugin_author = "wlj" # 作者主页 @@ -448,7 +448,7 @@ class BestFilmVersion(_PluginBase): continue # 获取tmdb_id - tmdb_id = item_info_resp.tmdbid + tmdb_id = item_info_resp.get("tmdbid") if not tmdb_id: continue # 识别媒体信息 @@ -594,7 +594,7 @@ class BestFilmVersion(_PluginBase): return [] @staticmethod - def plex_get_iteminfo(itemid): + def plex_get_iteminfo(itemid) -> dict: url = f"https://metadata.provider.plex.tv/library/metadata/{itemid}" \ f"?X-Plex-Token={settings.PLEX_TOKEN}" ids = [] @@ -614,14 +614,14 @@ class BestFilmVersion(_PluginBase): ids.append({'Name': 'TheMovieDb', 'Url': id_list[0]}) if not ids: - return [] + return {} return {'ExternalUrls': ids} else: logger.error(f"Plex/Items 未获取到返回数据") - return [] + return {} except Exception as e: logger.error(f"连接Plex/Items 出错:" + str(e)) - return [] + return {} @eventmanager.register(EventType.WebhookMessage) def webhook_message_action(self, event): @@ -662,7 +662,7 @@ class BestFilmVersion(_PluginBase): if info.item_type not in ['Movie', 'MOV', 'movie']: return # 获取tmdb_id - tmdb_id = info.tmdbid + tmdb_id = info.get("tmdbid") else: tmdb_id = data.tmdb_id if (data.channel == 'jellyfin'