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

fix 下载任务userid登记

Browse Source
This commit is contained in:
jxxghp 2024-03-08 14:40:00 +08:00
parent de4a7becc2
commit 0dad6860c4
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/endpoints/download.py
View File

@ -45,7 +45,7 @@ def add_downloading(
media_info=mediainfo, media_info=mediainfo,
torrent_info=torrentinfo torrent_info=torrentinfo
) )
did = DownloadChain().download_single(context=context, username=current_user.name) did = DownloadChain().download_single(context=context, userid=current_user.name, username=current_user.name)
return schemas.Response(success=True if did else False, data={ return schemas.Response(success=True if did else False, data={
"download_id": did "download_id": did
}) })

14
app/chain/download.py
View File

@ -408,8 +408,8 @@ class DownloadChain(ChainBase):
# 如果是电影，直接下载 # 如果是电影，直接下载
for context in contexts: for context in contexts:
if context.media_info.type == MediaType.MOVIE: if context.media_info.type == MediaType.MOVIE:
if self.download_single(context, save_path=save_path, if self.download_single(context, save_path=save_path, channel=channel,
channel=channel, userid=userid, username=username): userid=userid, username=username):
# 下载成功 # 下载成功
downloaded_list.append(context) downloaded_list.append(context)
@ -482,8 +482,9 @@ class DownloadChain(ChainBase):
) )
else: else:
# 下载 # 下载
download_id = self.download_single(context, save_path=save_path, download_id = self.download_single(context,
channel=channel, userid=userid, username=username) save_path=save_path, channel=channel,
userid=userid, username=username)
if download_id: if download_id:
# 下载成功 # 下载成功
@ -545,8 +546,9 @@ class DownloadChain(ChainBase):
# 为需要集的子集则下载 # 为需要集的子集则下载
if torrent_episodes.issubset(set(need_episodes)): if torrent_episodes.issubset(set(need_episodes)):
# 下载 # 下载
download_id = self.download_single(context, save_path=save_path, download_id = self.download_single(context,
channel=channel, userid=userid, username=username) save_path=save_path, channel=channel,
userid=userid, username=username)
if download_id: if download_id:
# 下载成功 # 下载成功
downloaded_list.append(context) downloaded_list.append(context)

2
app/chain/subscribe.py
View File

@ -323,6 +323,7 @@ class SubscribeChain(ChainBase):
downloads, lefts = self.downloadchain.batch_download( downloads, lefts = self.downloadchain.batch_download(
contexts=matched_contexts, contexts=matched_contexts,
no_exists=no_exists, no_exists=no_exists,
userid=subscribe.username,
username=subscribe.username, username=subscribe.username,
save_path=subscribe.save_path save_path=subscribe.save_path
) )
@ -708,6 +709,7 @@ class SubscribeChain(ChainBase):
logger.info(f'{mediainfo.title_year} 匹配完成，共匹配到{len(_match_context)}个资源') logger.info(f'{mediainfo.title_year} 匹配完成，共匹配到{len(_match_context)}个资源')
downloads, lefts = self.downloadchain.batch_download(contexts=_match_context, downloads, lefts = self.downloadchain.batch_download(contexts=_match_context,
no_exists=no_exists, no_exists=no_exists,
userid=subscribe.username,
username=subscribe.username, username=subscribe.username,
save_path=subscribe.save_path) save_path=subscribe.save_path)
# 判断是否要完成订阅 # 判断是否要完成订阅