From 185c78b05c94cce57df6de5479b94d90ebebcb6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=AE=E5=8F=AE=E5=BD=93?= <604054726@qq.com>
Date: Fri, 23 Feb 2024 22:25:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BD=9C=E4=B8=9A=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=8F=90=E4=BE=9B=E8=80=85=E6=9D=A1=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/core/plugin.py       | 10 ++++++++++
 app/scheduler.py         | 27 ++++++++++++++++-----------
 app/schemas/dashboard.py |  2 ++
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/app/core/plugin.py b/app/core/plugin.py
index ad04d549..8e4aa2d3 100644
--- a/app/core/plugin.py
+++ b/app/core/plugin.py
@@ -246,6 +246,16 @@ class PluginManager(metaclass=Singleton):
                     ret_services.extend(services)
         return ret_services
 
+    def get_plugin_attr(self, pid: str, attr: str) -> Any:
+        """
+        获取插件属性
+        """
+        if not self._running_plugins.get(pid):
+            return None
+        if not hasattr(self._running_plugins[pid], attr):
+            return None
+        return getattr(self._running_plugins[pid], attr)
+
     def run_plugin_method(self, pid: str, method: str, *args, **kwargs) -> Any:
         """
         运行插件方法
diff --git a/app/scheduler.py b/app/scheduler.py
index d279b4f9..2e27d0fc 100644
--- a/app/scheduler.py
+++ b/app/scheduler.py
@@ -284,6 +284,8 @@ class Scheduler(metaclass=Singleton):
                 plugin_services = PluginManager().run_plugin_method(pid, "get_service") or []
             except:
                 return
+            # 获取插件名称
+            plugin_name = PluginManager().get_plugin_attr(pid, "plugin_name")
             # 开始注册插件服务
             for service in plugin_services:
                 try:
@@ -292,6 +294,7 @@ class Scheduler(metaclass=Singleton):
                         "func": service["func"],
                         "name": service["name"],
                         "pid": pid,
+                        "plugin_name": plugin_name,
                         "running": False,
                     }
                     self._scheduler.add_job(
@@ -304,7 +307,7 @@ class Scheduler(metaclass=Singleton):
                             'job_id': sid
                         }
                     )
-                    logger.info(f"注册插件服务({pid})：{service['name']}")
+                    logger.info(f"注册插件服务({plugin_name})：{service['name']}")
                 except Exception as e:
                     logger.error(f"注册插件服务失败：{str(e)} - {service}")
 
@@ -313,6 +316,8 @@ class Scheduler(metaclass=Singleton):
         移除插件定时服务
         """
         with self._lock:
+            # 获取插件名称
+            plugin_name = PluginManager().get_plugin_attr(pid, "plugin_name")
             for job_id, service in self._jobs.copy().items():
                 try:
                     if service.get("pid") == pid:
@@ -321,7 +326,7 @@ class Scheduler(metaclass=Singleton):
                             self._scheduler.remove_job(job_id)
                         except:
                             pass
-                        logger.info(f"移除插件服务({pid})：{service.get('name')}")
+                        logger.info(f"移除插件服务({plugin_name})：{service.get('name')}")
                 except Exception as e:
                     logger.error(f"移除插件服务失败：{str(e)} - {job_id}: {service}")
 
@@ -338,16 +343,14 @@ class Scheduler(metaclass=Singleton):
             # 按照下次运行时间排序
             jobs.sort(key=lambda x: x.next_run_time)
             # 将正在运行的任务提取出来 (保障一次性任务正常显示)
-            for job_id, value in self._jobs.items():
-                name = value.get("name")
-                if value.get("running") and name:
-                    if name not in added:
-                        added.append(name)
-                    else:
-                        continue
+            for job_id, service in self._jobs.items():
+                name = service.get("name")
+                plugin_name = service.get("plugin_name")
+                if service.get("running") and name and plugin_name:
                     schedulers.append(schemas.ScheduleInfo(
                         id=job_id,
                         name=name,
+                        provider=plugin_name,
                         status="正在运行",
                         next_run="~"
                     ))
@@ -358,15 +361,17 @@ class Scheduler(metaclass=Singleton):
                 else:
                     continue
                 job_id = job.id.split("|")[0]
-                if not self._jobs.get(job_id):
+                service = self._jobs.get(job_id)
+                if not service:
                     continue
                 # 任务状态
-                status = "正在运行" if self._jobs[job_id].get("running") else "等待"
+                status = "正在运行" if service.get("running") else "等待"
                 # 下次运行时间
                 next_run = TimerUtils.time_difference(job.next_run_time)
                 schedulers.append(schemas.ScheduleInfo(
                     id=job_id,
                     name=job.name,
+                    provider=service.get("plugin_name", "MoviePilot"),
                     status=status,
                     next_run=next_run
                 ))
diff --git a/app/schemas/dashboard.py b/app/schemas/dashboard.py
index 02dbbd23..33e83883 100644
--- a/app/schemas/dashboard.py
+++ b/app/schemas/dashboard.py
@@ -56,6 +56,8 @@ class ScheduleInfo(BaseModel):
     id: Optional[str] = None
     # 名称
     name: Optional[str] = None
+    # 提供者
+    provider: Optional[str] = None
     # 状态
     status: Optional[str] = None
     # 下次执行时间