fix merge

package.json

@@ -421,7 +421,6 @@
     "icon": "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/uninstall.png",
     "author": "thsrite",
     "level": 1,
-    "v2": true,
     "history": {
       "v1.2.1": "fix update_config",
       "v1.2": "卸载时先停止注册服务",

package.v2.json

@@ -503,11 +503,12 @@
     "name": "插件重装重载",
     "description": "强制重载、强制重装已安装插件。",
     "labels": "插件管理",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "icon": "refresh.png",
     "author": "thsrite",
     "level": 1,
     "history": {
+      "v2.0.2": "修改compare_version方法",
       "v2.0.1": "仅可选择已安装插件",
       "v2.0": "支持交互命令重载、重装插件",
       "v1.8": "修复插件显示版本问题",
@@ -535,5 +536,21 @@
       "v3.1": "支持自定义转移方式",
       "v3.0": "默认从tmdb刮削，刮削失败则从pt站刮削"
     }
+  },
+  "PluginUnInstall": {
+    "name": "插件彻底卸载",
+    "description": "删除数据库中已安装插件记录、清理插件文件。",
+    "labels": "插件管理",
+    "version": "2.1",
+    "icon": "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/uninstall.png",
+    "author": "thsrite",
+    "level": 1,
+    "history": {
+      "v2.1": "适配MP V2新的代码方法",
+      "v1.2.1": "fix update_config",
+      "v1.2": "卸载时先停止注册服务",
+      "v1.1": "可选删除插件配置及数据",
+      "v1.0": "init"
+    }
   }
 }

plugins.v2/pluginreinstall/__init__.py

@@ -1,4 +1,5 @@
 import re
+from typing import Any, List, Dict, Tuple
 
 from fastapi import APIRouter
 
@@ -7,12 +8,11 @@ from app.core.event import eventmanager, Event
 from app.core.plugin import PluginManager
 from app.db.systemconfig_oper import SystemConfigOper
 from app.helper.plugin import PluginHelper
-from app.plugins import _PluginBase
-from typing import Any, List, Dict, Tuple
 from app.log import logger
+from app.plugins import _PluginBase
+from app.scheduler import Scheduler
 from app.schemas.types import SystemConfigKey, EventType
 from app.utils.string import StringUtils
-from app.scheduler import Scheduler
 
 router = APIRouter()
 
@@ -25,7 +25,7 @@ class PluginReInstall(_PluginBase):
     # 插件图标
     plugin_icon = "refresh.png"
     # 插件版本
-    plugin_version = "2.0.1"
+    plugin_version = "2.0.2"
     # 插件作者
     plugin_author = "thsrite"
     # 作者主页
@@ -430,7 +430,7 @@ class PluginReInstall(_PluginBase):
                 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:
+                        if StringUtils.compare_version(local_plugin.get("plugin_version"), ">", plugin.get("version")):
                             local_plugins[pid] = {
                                 "id": pid,
                                 "plugin_name": plugin.get("name"),