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

Merge pull request #1004 from thsrite/main

Browse Source 
fix 下载进度推送username
This commit is contained in:
jxxghp 2023-10-28 20:19:12 +08:00 committed by GitHub
commit 0091e462fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/plugins/downloadingmsg/__init__.py
View File

@ -90,8 +90,8 @@ class DownloadingMsg(_PluginBase):
logger.error("未配置管理员用户") logger.error("未配置管理员用户")
return return
for userid in str(self._adminuser).split(","): for username in str(self._adminuser).split(","):
self.__send_msg(torrents=torrents, userid=userid) self.__send_msg(torrents=torrents, username=username)
if self._type == "user" or self._type == "both": if self._type == "user" or self._type == "both":
user_torrents = {} user_torrents = {}
@ -101,38 +101,38 @@ class DownloadingMsg(_PluginBase):
if not downloadhis: if not downloadhis:
logger.warn(f"种子 {torrent.hash} 未获取到MoviePilot下载历史，无法推送下载进度") logger.warn(f"种子 {torrent.hash} 未获取到MoviePilot下载历史，无法推送下载进度")
continue continue
if not downloadhis.userid: if not downloadhis.username:
logger.debug(f"种子 {torrent.hash} 未获取到下载用户记录，无法推送下载进度") logger.debug(f"种子 {torrent.hash} 未获取到下载用户记录，无法推送下载进度")
continue continue
user_torrent = user_torrents.get(downloadhis.userid) or [] user_torrent = user_torrents.get(downloadhis.username) or []
user_torrent.append(torrent) user_torrent.append(torrent)
user_torrents[downloadhis.userid] = user_torrent user_torrents[downloadhis.username] = user_torrent
if not user_torrents or not user_torrents.keys(): if not user_torrents or not user_torrents.keys():
logger.warn("未获取到用户下载记录，无法推送下载进度") logger.warn("未获取到用户下载记录，无法推送下载进度")
return return
# 推送用户下载任务进度 # 推送用户下载任务进度
for userid in list(user_torrents.keys()): for username in list(user_torrents.keys()):
if not userid: if not username:
continue continue
# 如果用户是管理员，无需重复推送 # 如果用户是管理员，无需重复推送
if (self._type == "admin" or self._type == "both") and self._adminuser and userid in str( if (self._type == "admin" or self._type == "both") and self._adminuser and username in str(
self._adminuser).split(","): self._adminuser).split(","):
logger.debug("管理员已推送") logger.debug("管理员已推送")
continue continue
user_torrent = user_torrents.get(userid) user_torrent = user_torrents.get(username)
if not user_torrent: if not user_torrent:
logger.warn(f"未获取到用户 {userid} 下载任务") logger.warn(f"未获取到用户 {username} 下载任务")
continue continue
self.__send_msg(torrents=user_torrent, self.__send_msg(torrents=user_torrent,
userid=userid) username=username)
if self._type == "all": if self._type == "all":
self.__send_msg(torrents=torrents) self.__send_msg(torrents=torrents)
def __send_msg(self, torrents: Optional[List[Union[TransferTorrent, DownloadingTorrent]]], userid: str = None): def __send_msg(self, torrents: Optional[List[Union[TransferTorrent, DownloadingTorrent]]], username: str = None):
""" """
发送消息 发送消息
""" """
@ -177,7 +177,7 @@ class DownloadingMsg(_PluginBase):
else: else:
media_name = torrent.title media_name = torrent.title
if not self._adminuser or userid not in str(self._adminuser).split(","): if not self._adminuser or username not in str(self._adminuser).split(","):
# 下载用户发送精简消息 # 下载用户发送精简消息
messages.append(f"{index}. {media_name} {round(torrent.progress, 1)}%") messages.append(f"{index}. {media_name} {round(torrent.progress, 1)}%")
else: else:
@ -197,7 +197,7 @@ class DownloadingMsg(_PluginBase):
channel=channel, channel=channel,
title=title, title=title,
text="\n".join(messages), text="\n".join(messages),
userid=userid) userid=username)
def get_state(self) -> bool: def get_state(self) -> bool:
return self._enabled return self._enabled