diff --git a/package.json b/package.json index 421e018..773ecb0 100644 --- a/package.json +++ b/package.json @@ -116,12 +116,13 @@ "name": "插件更新管理", "description": "监测已安装插件,推送更新提醒,可配置自动更新。", "labels": "自动更新,插件管理", - "version": "1.9.2", + "version": "2.0", "icon": "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/pluginupdate.png", "author": "thsrite", "level": 1, "v2": true, "history": { + "v2.0": "修复插件显示版本问题", "v1.9.2": "修复获取本地插件版本None,重新更新问题", "v1.9.1": "修复bug", "v1.9": "过滤相同ID插件,保留最新版本检查更新", @@ -140,12 +141,13 @@ "name": "插件强制重装", "description": "卸载当前插件,强制重装。", "labels": "插件管理", - "version": "1.7", + "version": "1.8", "icon": "refresh.png", "author": "thsrite", "level": 1, "v2": true, "history": { + "v1.8": "修复插件显示版本问题", "v1.7": "使用主程序GITHUB_PROXY代理", "v1.6": "插件API立即生效", "v1.5": "支持插件热重载", diff --git a/plugins/pluginautoupdate/__init__.py b/plugins/pluginautoupdate/__init__.py index 51729d7..0413256 100644 --- a/plugins/pluginautoupdate/__init__.py +++ b/plugins/pluginautoupdate/__init__.py @@ -30,7 +30,7 @@ class PluginAutoUpdate(_PluginBase): # 插件图标 plugin_icon = "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/pluginupdate.png" # 插件版本 - plugin_version = "1.9.2" + plugin_version = "2.0" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -291,41 +291,6 @@ class PluginAutoUpdate(_PluginBase): break router.add_api_route(**api) - @staticmethod - def get_local_plugins(): - """ - 获取本地插件 - """ - # 已安装插件 - install_plugins = SystemConfigOper().get(SystemConfigKey.UserInstalledPlugins) or [] - - local_plugins = {} - # 线上插件列表 - markets = settings.PLUGIN_MARKET.split(",") - for market in markets: - online_plugins = PluginHelper().get_plugins(market) or {} - for pid, plugin in online_plugins.items(): - if pid in install_plugins: - local_plugin = local_plugins.get(pid) - if local_plugin: - if StringUtils.compare_version(local_plugin.get("plugin_version"), - plugin.get("version")) < 0: - local_plugins[pid] = { - "id": pid, - "plugin_name": plugin.get("name"), - "repo_url": market, - "plugin_version": plugin.get("version") - } - else: - local_plugins[pid] = { - "id": pid, - "plugin_name": plugin.get("name"), - "repo_url": market, - "plugin_version": plugin.get("version") - } - - return local_plugins - def get_form(self) -> Tuple[List[dict], Dict[str, Any]]: """ 拼装插件配置页面,需要返回两块数据:1、页面配置;2、数据结构 @@ -339,15 +304,14 @@ class PluginAutoUpdate(_PluginBase): }) # 已安装插件 - local_plugins = self.get_local_plugins() + local_plugins = PluginManager().get_local_plugins() # 编历 local_plugins,生成插件类型选项 pluginOptions = [] - for plugin_id in list(local_plugins.keys()): - local_plugin = local_plugins.get(plugin_id) + for plugin in local_plugins: pluginOptions.append({ - "title": f"{local_plugin.get('plugin_name')} v{local_plugin.get('plugin_version')}", - "value": local_plugin.get("id") + "title": f"{plugin.plugin_name} v{plugin.plugin_version}", + "value": plugin.id }) return [ { diff --git a/plugins/pluginreinstall/__init__.py b/plugins/pluginreinstall/__init__.py index a6103d8..388553e 100644 --- a/plugins/pluginreinstall/__init__.py +++ b/plugins/pluginreinstall/__init__.py @@ -24,7 +24,7 @@ class PluginReInstall(_PluginBase): # 插件图标 plugin_icon = "refresh.png" # 插件版本 - plugin_version = "1.7" + plugin_version = "1.8" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -139,15 +139,14 @@ class PluginReInstall(_PluginBase): 拼装插件配置页面,需要返回两块数据:1、页面配置;2、数据结构 """ # 已安装插件 - local_plugins = self.get_local_plugins() + local_plugins = PluginManager().get_local_plugins() # 编历 local_plugins,生成插件类型选项 pluginOptions = [] - for plugin_id in list(local_plugins.keys()): - local_plugin = local_plugins.get(plugin_id) + for plugin in local_plugins: pluginOptions.append({ - "title": f"{local_plugin.get('plugin_name')} v{local_plugin.get('plugin_version')}", - "value": local_plugin.get("id") + "title": f"{plugin.plugin_name} v{plugin.plugin_version}", + "value": plugin.id }) return [ {