From b670ec6cbc9fbbd068405289d09932bc18e60d1f Mon Sep 17 00:00:00 2001 From: thsrite Date: Thu, 17 Oct 2024 09:10:27 +0800 Subject: [PATCH] fix v2 Emby instance fetch --- package.v2.json | 17 ++++++++--------- plugins.v2/embyactorsync/__init__.py | 4 ++-- plugins.v2/embyaudiobook/__init__.py | 5 ++--- plugins.v2/embycollectionsort/__init__.py | 5 ++--- plugins.v2/embydanmu/__init__.py | 4 ++-- plugins.v2/embyextendtype/__init__.py | 4 ++-- plugins.v2/embymetarefresh/__init__.py | 4 ++-- plugins.v2/embymetatag/__init__.py | 4 ++-- plugins.v2/embyreporter/__init__.py | 4 ++-- 9 files changed, 24 insertions(+), 27 deletions(-) diff --git a/package.v2.json b/package.v2.json index 8918714..9fe52b3 100644 --- a/package.v2.json +++ b/package.v2.json @@ -34,11 +34,10 @@ "name": "Emby元数据刷新", "description": "定时刷新Emby媒体库元数据，演职人员中文。", "labels": "Emby", - "version": "1.7.3", + "version": "1.7.4", "icon": "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/emby-icon.png", "author": "thsrite", "level": 1, - "v2": true, "history": { "v1.7.3": "优化剧集演员刮削", "v1.7.2": "优化剧集演员刮削", @@ -57,7 +56,7 @@ "name": "Emby媒体标签", "description": "自动给媒体库媒体添加标签。", "labels": "Emby", - "version": "1.2", + "version": "1.2.1", "icon": "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/tag.png", "author": "thsrite", "level": 1, @@ -71,7 +70,7 @@ "name": "Emby观影报告", "description": "推送Emby观影报告，需Emby安装Playback Report 插件。", "labels": "Emby", - "version": "1.8", + "version": "1.8.1", "icon": "Pydiocells_A.png", "author": "thsrite", "level": 1, @@ -118,7 +117,7 @@ "name": "Emby弹幕下载", "description": "通知Emby Danmu插件下载弹幕。", "labels": "Emby,媒体库", - "version": "1.2", + "version": "1.2.1", "icon": "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/danmu.png", "author": "thsrite", "level": 1, @@ -132,7 +131,7 @@ "name": "Emby视频类型检查", "description": "定期检查Emby媒体库中是否包含指定的视频类型，发送通知。", "labels": "Emby,媒体库", - "version": "1.0", + "version": "1.0.1", "icon": "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/extendtype.png", "author": "thsrite", "level": 1, @@ -144,7 +143,7 @@ "name": "Emby有声书整理", "description": "还在为Emby有声书整理烦恼吗？入库存在很多单集？", "labels": "Emby,媒体库", - "version": "1.1", + "version": "1.1.1", "icon": "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/audiobook.png", "author": "thsrite", "level": 1, @@ -157,7 +156,7 @@ "name": "Emby合集媒体排序", "description": "Emby保留按照加入时间倒序的前提下，把合集中的媒体按照发布日期排序，修改加入时间已到达顺序排列的目的。", "labels": "媒体库", - "version": "1.1", + "version": "1.1.1", "icon": "Element_A.png", "author": "thsrite", "level": 1, @@ -170,7 +169,7 @@ "name": "Emby剧集演员同步", "description": "同步剧演员信息到集演员信息。", "labels": "Emby,媒体库", - "version": "1.3", + "version": "1.3.1", "icon": "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/embyactorsync.png", "author": "thsrite", "level": 1, diff --git a/plugins.v2/embyactorsync/__init__.py b/plugins.v2/embyactorsync/__init__.py index 539e16f..44d98ec 100644 --- a/plugins.v2/embyactorsync/__init__.py +++ b/plugins.v2/embyactorsync/__init__.py @@ -24,7 +24,7 @@ class EmbyActorSync(_PluginBase): # 插件图标 plugin_icon = "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/embyactorsync.png" # 插件版本 - plugin_version = "1.3" + plugin_version = "1.3.1" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -53,7 +53,7 @@ class EmbyActorSync(_PluginBase): self._onlyonce = config.get("onlyonce") self._librarys = config.get("librarys") or [] - emby_server = self.mediaserver_helper.get_service(name="emby") + emby_server = self.mediaserver_helper.get_service(name="Emby") if not emby_server: logger.error("未配置Emby媒体服务器") return diff --git a/plugins.v2/embyaudiobook/__init__.py b/plugins.v2/embyaudiobook/__init__.py index 92fa5f4..8bc470f 100644 --- a/plugins.v2/embyaudiobook/__init__.py +++ b/plugins.v2/embyaudiobook/__init__.py @@ -14,7 +14,6 @@ from app.core.config import settings from app.core.event import eventmanager, Event from app.helper.mediaserver import MediaServerHelper from app.log import logger -from app.modules.emby import Emby from app.plugins import _PluginBase from app.schemas import NotificationType from app.schemas.types import EventType @@ -29,7 +28,7 @@ class EmbyAudioBook(_PluginBase): # 插件图标 plugin_icon = "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/audiobook.png" # 插件版本 - plugin_version = "1.1" + plugin_version = "1.1.1" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -72,7 +71,7 @@ class EmbyAudioBook(_PluginBase): self._rename = config.get("rename") self._msgtype = config.get("msgtype") - emby_server = self.mediaserver_helper.get_service(name="emby") + emby_server = self.mediaserver_helper.get_service(name="Emby") if not emby_server: logger.error("未配置Emby媒体服务器") return diff --git a/plugins.v2/embycollectionsort/__init__.py b/plugins.v2/embycollectionsort/__init__.py index ee33ac4..baa7598 100644 --- a/plugins.v2/embycollectionsort/__init__.py +++ b/plugins.v2/embycollectionsort/__init__.py @@ -13,7 +13,6 @@ from app.core.config import settings from app.helper.mediaserver import MediaServerHelper from app.log import logger from app.plugins import _PluginBase -from app.modules.emby import Emby from app.schemas.types import EventType from app.utils.http import RequestUtils @@ -28,7 +27,7 @@ class EmbyCollectionSort(_PluginBase): # 插件图标 plugin_icon = "Element_A.png" # 插件版本 - plugin_version = "1.1" + plugin_version = "1.1.1" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -64,7 +63,7 @@ class EmbyCollectionSort(_PluginBase): self._sort_type = config.get("sort_type") or "asc" self._collection_library_id = config.get("collection_library_id") - emby_server = self.mediaserver_helper.get_service(name="emby") + emby_server = self.mediaserver_helper.get_service(name="Emby") if not emby_server: logger.error("未配置Emby媒体服务器") return diff --git a/plugins.v2/embydanmu/__init__.py b/plugins.v2/embydanmu/__init__.py index 4a1c5c6..2cac05e 100644 --- a/plugins.v2/embydanmu/__init__.py +++ b/plugins.v2/embydanmu/__init__.py @@ -20,7 +20,7 @@ class EmbyDanmu(_PluginBase): # 插件图标 plugin_icon = "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/danmu.png" # 插件版本 - plugin_version = "1.2" + plugin_version = "1.2.1" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -50,7 +50,7 @@ class EmbyDanmu(_PluginBase): if config: self._enabled = config.get("enabled") - emby_server = self.mediaserver_helper.get_service(name="emby") + emby_server = self.mediaserver_helper.get_service(name="Emby") if not emby_server: logger.error("未配置Emby媒体服务器") return diff --git a/plugins.v2/embyextendtype/__init__.py b/plugins.v2/embyextendtype/__init__.py index 92d7a4c..02c82c4 100644 --- a/plugins.v2/embyextendtype/__init__.py +++ b/plugins.v2/embyextendtype/__init__.py @@ -25,7 +25,7 @@ class EmbyExtendType(_PluginBase): # 插件图标 plugin_icon = "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/extendtype.png" # 插件版本 - plugin_version = "1.0" + plugin_version = "1.0.1" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -67,7 +67,7 @@ class EmbyExtendType(_PluginBase): self._extend = config.get("extend") self._msgtype = config.get("msgtype") - emby_server = self.mediaserver_helper.get_service(name="emby") + emby_server = self.mediaserver_helper.get_service(name="Emby") if not emby_server: logger.error("未配置Emby媒体服务器") return diff --git a/plugins.v2/embymetarefresh/__init__.py b/plugins.v2/embymetarefresh/__init__.py index 8de717e..e1d7662 100644 --- a/plugins.v2/embymetarefresh/__init__.py +++ b/plugins.v2/embymetarefresh/__init__.py @@ -37,7 +37,7 @@ class EmbyMetaRefresh(_PluginBase): # 插件图标 plugin_icon = "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/emby-icon.png" # 插件版本 - plugin_version = "1.7.3" + plugin_version = "1.7.4" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -85,7 +85,7 @@ class EmbyMetaRefresh(_PluginBase): self._ReplaceAllMetadata = config.get("ReplaceAllMetadata") or "true" self._ReplaceAllImages = config.get("ReplaceAllImages") or "true" - emby_server = self.mediaserver_helper.get_service(name="emby") + emby_server = self.mediaserver_helper.get_service(name="Emby") if not emby_server: logger.error("未配置Emby媒体服务器") return diff --git a/plugins.v2/embymetatag/__init__.py b/plugins.v2/embymetatag/__init__.py index c5b152a..de072c3 100644 --- a/plugins.v2/embymetatag/__init__.py +++ b/plugins.v2/embymetatag/__init__.py @@ -23,7 +23,7 @@ class EmbyMetaTag(_PluginBase): # 插件图标 plugin_icon = "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/tag.png" # 插件版本 - plugin_version = "1.2" + plugin_version = "1.2.1" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -63,7 +63,7 @@ class EmbyMetaTag(_PluginBase): self._tag_confs = config.get("tag_confs") self._name_tag_confs = config.get("name_tag_confs") - emby_server = self.mediaserver_helper.get_service(name="emby") + emby_server = self.mediaserver_helper.get_service(name="Emby") if not emby_server: logger.error("未配置Emby媒体服务器") return diff --git a/plugins.v2/embyreporter/__init__.py b/plugins.v2/embyreporter/__init__.py index b6bf199..ee702dc 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 = "1.8" + plugin_version = "1.8.1" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -69,7 +69,7 @@ class EmbyReporter(_PluginBase): # 停止现有任务 self.stop_service() self.mediaserver_helper = MediaServerHelper() - emby_server = self.mediaserver_helper.get_service(name="emby") + emby_server = self.mediaserver_helper.get_service(name="Emby") if not emby_server: logger.error("未配置Emby媒体服务器") return