Merge pull request #987 from thsrite/main

app/modules/qbittorrent/__init__.py

@@ -166,7 +166,8 @@ class QbittorrentModule(_ModuleBase):
                     dlspeed=StringUtils.str_filesize(torrent.get('dlspeed')),
                     upspeed=StringUtils.str_filesize(torrent.get('upspeed')),
                     left_time=StringUtils.str_secends(
-                        (torrent.get('total_size') - torrent.get('completed')) / torrent.get('dlspeed'))
+                        (torrent.get('total_size') - torrent.get('completed')) / torrent.get('dlspeed')) if torrent.get(
+                        'dlspeed') > 0 else ''
                 ))
         else:
             return None

app/modules/transmission/__init__.py

@@ -151,7 +151,7 @@ class TransmissionModule(_ModuleBase):
                     state="paused" if torrent.status == "stopped" else "downloading",
                     dlspeed=StringUtils.str_filesize(dlspeed),
                     upspeed=StringUtils.str_filesize(upspeed),
-                    left_time=StringUtils.str_secends(torrent.left_until_done / dlspeed)
+                    left_time=StringUtils.str_secends(torrent.left_until_done / dlspeed) if dlspeed > 0 else ''
                 ))
         else:
             return None

app/plugins/autobackup/__init__.py

@@ -67,7 +67,7 @@ class AutoBackup(_PluginBase):
 
             if self._cron:
                 try:
-                    self._scheduler.add_job(func=self.__backup,
+                    self._scheduler.add_job(func=self.backup,
                                             trigger=CronTrigger.from_crontab(self._cron),
                                             name="自动备份")
                 except Exception as err:
@@ -75,7 +75,7 @@ class AutoBackup(_PluginBase):
 
             if self._onlyonce:
                 logger.info(f"自动备份服务启动，立即运行一次")
-                self._scheduler.add_job(func=self.__backup, trigger='date',
+                self._scheduler.add_job(func=self.backup, trigger='date',
                                         run_date=datetime.now(tz=pytz.timezone(settings.TZ)) + timedelta(seconds=3),
                                         name="自动备份")
                 # 关闭一次性开关
@@ -93,7 +93,7 @@ class AutoBackup(_PluginBase):
                 self._scheduler.print_jobs()
                 self._scheduler.start()
 
-    def __backup(self):
+    def backup(self):
         """
         自动备份、删除备份
         """
@@ -173,7 +173,13 @@ class AutoBackup(_PluginBase):
         pass
 
     def get_api(self) -> List[Dict[str, Any]]:
-        pass
+        return [{
+            "path": "/backup",
+            "endpoint": self.backup,
+            "methods": ["GET"],
+            "summary": "MoviePilot备份",
+            "description": "MoviePilot备份",
+        }]
 
     def get_form(self) -> Tuple[List[dict], Dict[str, Any]]:
         """

app/plugins/cloudflarespeedtest/__init__.py

@@ -88,13 +88,13 @@ class CloudflareSpeedTest(_PluginBase):
             try:
                 if self.get_state() and self._cron:
                     logger.info(f"Cloudflare CDN优选服务启动，周期：{self._cron}")
-                    self._scheduler.add_job(func=self.__cloudflareSpeedTest,
+                    self._scheduler.add_job(func=self.cloudflareSpeedTest,
                                             trigger=CronTrigger.from_crontab(self._cron),
                                             name="Cloudflare优选")
 
                 if self._onlyonce:
                     logger.info(f"Cloudflare CDN优选服务启动，立即运行一次")
-                    self._scheduler.add_job(func=self.__cloudflareSpeedTest, trigger='date',
+                    self._scheduler.add_job(func=self.cloudflareSpeedTest, trigger='date',
                                             run_date=datetime.now(tz=pytz.timezone(settings.TZ)) + timedelta(seconds=3),
                                             name="Cloudflare优选")
                     # 关闭一次性开关
@@ -111,7 +111,7 @@ class CloudflareSpeedTest(_PluginBase):
                 self._scheduler.start()
 
     @eventmanager.register(EventType.CloudFlareSpeedTest)
-    def __cloudflareSpeedTest(self, event: Event = None):
+    def cloudflareSpeedTest(self, event: Event = None):
         """
         CloudflareSpeedTest优选
         """
@@ -489,7 +489,13 @@ class CloudflareSpeedTest(_PluginBase):
         }]
 
     def get_api(self) -> List[Dict[str, Any]]:
-        pass
+        return [{
+            "path": "/cloudflare_speedtest",
+            "endpoint": self.cloudflareSpeedTest,
+            "methods": ["GET"],
+            "summary": "Cloudflare IP优选",
+            "description": "Cloudflare IP优选",
+        }]
 
     def get_form(self) -> Tuple[List[dict], Dict[str, Any]]:
         """

app/plugins/dirmonitor/__init__.py

@@ -600,7 +600,13 @@ class DirMonitor(_PluginBase):
         }]
 
     def get_api(self) -> List[Dict[str, Any]]:
-        pass
+        return [{
+            "path": "/directory_sync",
+            "endpoint": self.sync_all,
+            "methods": ["GET"],
+            "summary": "目录监控同步",
+            "description": "目录监控同步",
+        }]
 
     def get_form(self) -> Tuple[List[dict], Dict[str, Any]]:
         return [