codfrm/MoviePilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #987 from thsrite/main

Browse Source
This commit is contained in:
jxxghp 2023-10-28 11:04:21 +08:00 committed by GitHub
commit 534ad0bad6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/modules/qbittorrent/__init__.py
View File

@ -166,7 +166,8 @@ class QbittorrentModule(_ModuleBase):
dlspeed=StringUtils.str_filesize(torrent.get('dlspeed')), dlspeed=StringUtils.str_filesize(torrent.get('dlspeed')),
upspeed=StringUtils.str_filesize(torrent.get('upspeed')), upspeed=StringUtils.str_filesize(torrent.get('upspeed')),
left_time=StringUtils.str_secends( 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: else:
return None return None

2
app/modules/transmission/__init__.py
View File

@ -151,7 +151,7 @@ class TransmissionModule(_ModuleBase):
state="paused" if torrent.status == "stopped" else "downloading", state="paused" if torrent.status == "stopped" else "downloading",
dlspeed=StringUtils.str_filesize(dlspeed), dlspeed=StringUtils.str_filesize(dlspeed),
upspeed=StringUtils.str_filesize(upspeed), 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: else:
return None return None

14
app/plugins/autobackup/__init__.py
View File

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

14
app/plugins/cloudflarespeedtest/__init__.py
View File

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

8
app/plugins/dirmonitor/__init__.py
View File

@ -600,7 +600,13 @@ class DirMonitor(_PluginBase):
}] }]
def get_api(self) -> List[Dict[str, Any]]: 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]]: def get_form(self) -> Tuple[List[dict], Dict[str, Any]]:
return [ return [