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

fix 自定义订阅 Api

Browse Source
This commit is contained in:
jxxghp
2023-08-10 12:41:38 +08:00
parent eea508b05a
commit eb9ec11153
16 changed files with 141 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
app/chain/download.py
View File

@ -89,6 +89,7 @@ class DownloadChain(ChainBase):
def download_single(self, context: Context, torrent_file: Path = None,
episodes: Set[int] = None,
channel: MessageChannel = None,
save_path: str = None,
userid: Union[str, int] = None) -> Optional[str]:
"""
下载及发送通知
@ -103,18 +104,21 @@ class DownloadChain(ChainBase):
if not torrent_file:
return
# 下载目录
if settings.DOWNLOAD_CATEGORY and _media and _media.category:
if _media.type == MediaType.MOVIE:
download_dir = Path(settings.DOWNLOAD_MOVIE_PATH or settings.DOWNLOAD_PATH) / _media.category
if not save_path:
if settings.DOWNLOAD_CATEGORY and _media and _media.category:
if _media.type == MediaType.MOVIE:
download_dir = Path(settings.DOWNLOAD_MOVIE_PATH or settings.DOWNLOAD_PATH) / _media.category
else:
download_dir = Path(settings.DOWNLOAD_TV_PATH or settings.DOWNLOAD_PATH) / _media.category
elif _media:
if _media.type == MediaType.MOVIE:
download_dir = Path(settings.DOWNLOAD_MOVIE_PATH or settings.DOWNLOAD_PATH)
else:
download_dir = Path(settings.DOWNLOAD_TV_PATH or settings.DOWNLOAD_PATH)
else:
download_dir = Path(settings.DOWNLOAD_TV_PATH or settings.DOWNLOAD_PATH) / _media.category
elif _media:
if _media.type == MediaType.MOVIE:
download_dir = Path(settings.DOWNLOAD_MOVIE_PATH or settings.DOWNLOAD_PATH)
else:
download_dir = Path(settings.DOWNLOAD_TV_PATH or settings.DOWNLOAD_PATH)
download_dir = Path(settings.DOWNLOAD_PATH)
else:
download_dir = Path(settings.DOWNLOAD_PATH)
download_dir = Path(save_path)
# 添加下载
result: Optional[tuple] = self.download(torrent_path=torrent_file,
cookie=_torrent.site_cookie,
@ -174,11 +178,13 @@ class DownloadChain(ChainBase):
def batch_download(self,
contexts: List[Context],
no_exists: Dict[int, Dict[int, NotExistMediaInfo]] = None,
save_path: str = None,
userid: str = None) -> Tuple[List[Context], Dict[int, Dict[int, NotExistMediaInfo]]]:
"""
根据缺失数据，自动种子列表中组合择优下载
:param contexts: 资源上下文列表
:param no_exists: 缺失的剧集信息
:param save_path: 保存路径
:param userid: 用户ID
:return: 已经下载的资源列表、剩余未下载到的剧集 no_exists[tmdb_id] = {season: NotExistMediaInfo}
"""
@ -217,7 +223,7 @@ class DownloadChain(ChainBase):
no_exists[_tmdbid][_sea] = NotExistMediaInfo(
season=not_exist.season,
episodes=need,
total_episodes=not_exist.total_episodes,
total_episode=not_exist.total_episode,
start_episode=not_exist.start_episode
)
else:
@ -235,7 +241,7 @@ class DownloadChain(ChainBase):
no_exist = no_exists.get(tmdbid)
if not no_exist.get(season):
return 0
return no_exist[season].total_episodes
return no_exist[season].total_episode
# 分组排序
contexts = TorrentHelper().sort_group_torrents(contexts)
@ -243,7 +249,7 @@ class DownloadChain(ChainBase):
# 如果是电影，直接下载
for context in contexts:
if context.media_info.type == MediaType.MOVIE:
if self.download_single(context, userid=userid):
if self.download_single(context, save_path=save_path, userid=userid):
# 下载成功
downloaded_list.append(context)
@ -294,6 +300,7 @@ class DownloadChain(ChainBase):
# 下载
download_id = self.download_single(context=context,
torrent_file=torrent_path,
save_path=save_path,
userid=userid)
else:
logger.info(
@ -301,7 +308,7 @@ class DownloadChain(ChainBase):
continue
else:
# 下载
download_id = self.download_single(context, userid=userid)
download_id = self.download_single(context, save_path=save_path, userid=userid)
if download_id:
# 下载成功
@ -326,12 +333,12 @@ class DownloadChain(ChainBase):
# 当前需要集
need_episodes = tv.episodes
# TMDB总集数
total_episodes = tv.total_episodes
total_episode = tv.total_episode
# 需要开始集
start_episode = tv.start_episode or 1
# 缺失整季的转化为缺失集进行比较
if not need_episodes:
need_episodes = list(range(start_episode, total_episodes))
need_episodes = list(range(start_episode, total_episode))
# 循环种子
for context in contexts:
# 媒体信息
@ -359,7 +366,7 @@ class DownloadChain(ChainBase):
# 为需要集的子集则下载
if torrent_episodes.issubset(set(need_episodes)):
# 下载
download_id = self.download_single(context, userid=userid)
download_id = self.download_single(context, save_path=save_path, userid=userid)
if download_id:
# 下载成功
downloaded_list.append(context)
@ -429,6 +436,7 @@ class DownloadChain(ChainBase):
download_id = self.download_single(context=context,
torrent_file=torrent_path,
episodes=selected_episodes,
save_path=save_path,
userid=userid)
if not download_id:
continue
@ -464,7 +472,7 @@ class DownloadChain(ChainBase):
{tmdbid: [
"season": int,
"episodes": list,
"total_episodes": int,
"total_episode": int,
"start_episode": int
]}
"""
@ -473,7 +481,7 @@ class DownloadChain(ChainBase):
_season: NotExistMediaInfo(
season=_season,
episodes=_episodes,
total_episodes=_total,
total_episode=_total,
start_episode=_start
)
}
@ -481,7 +489,7 @@ class DownloadChain(ChainBase):
no_exists[mediainfo.tmdb_id][_season] = NotExistMediaInfo(
season=_season,
episodes=_episodes,
total_episodes=_total,
total_episode=_total,
start_episode=_start
)

2
app/chain/message.py
View File

@ -108,7 +108,7 @@ class MessageChain(ChainBase):
if no_exists:
# 发送消息
messages = [
f"第 {sea} 季缺失 {StringUtils.str_series(no_exist.episodes) if no_exist.episodes else no_exist.total_episodes} 集"
f"第 {sea} 季缺失 {StringUtils.str_series(no_exist.episodes) if no_exist.episodes else no_exist.total_episode} 集"
for sea, no_exist in no_exists.get(mediainfo.tmdb_id).items()]
self.post_message(Notification(channel=channel,
title=f"{mediainfo.title_year}：\n" + "\n".join(messages)))

38
app/chain/rss.py
View File

@ -1,6 +1,7 @@
import json
import re
import time
from datetime import datetime
from typing import Tuple, Optional
from app.chain import ChainBase
@ -77,17 +78,23 @@ class RssChain(ChainBase):
kwargs.update({
'total_episode': total_episode
})
# 检查是否存在
if self.rssoper.exists(tmdbid=mediainfo.tmdb_id, season=season):
logger.warn(f'{mediainfo.title} 已存在')
return None, f'{mediainfo.title} 自定义订阅已存在'
if not kwargs.get("name"):
kwargs.update({
"name": mediainfo.title
})
kwargs.update({
"tmdbid": mediainfo.tmdb_id,
"poster": mediainfo.get_poster_image(),
"backdrop": mediainfo.get_backdrop_image(),
"vote": mediainfo.vote_average,
"description": mediainfo.overview,
})
# 添加订阅
sid = self.rssoper.add(title=mediainfo.title,
year=mediainfo.year,
mtype=mediainfo.type.value,
season=season,
tmdbid=mediainfo.tmdb_id,
poster=mediainfo.get_poster_image(),
backdrop=mediainfo.get_backdrop_image(),
vote=mediainfo.vote_average,
description=mediainfo.overview,
**kwargs)
sid = self.rssoper.add(title=title, year=year, season=season, **kwargs)
if not sid:
logger.error(f'{mediainfo.title_year} 添加自定义订阅失败')
return None, "添加自定义订阅失败"
@ -235,14 +242,15 @@ class RssChain(ChainBase):
rss_task.season: NotExistMediaInfo(
season=rss_task.season,
episodes=[],
total_episodes=rss_task.total_episode,
total_episode=rss_task.total_episode,
start_episode=1)
}
else:
no_exists = {}
# 开始下载
downloads, lefts = self.downloadchain.batch_download(contexts=matched_contexts,
no_exists=no_exists)
no_exists=no_exists,
save_path=rss_task.save_path)
if downloads and not lefts:
if not rss_task.best_version:
self.rssoper.delete(rss_task.id)
@ -252,5 +260,9 @@ class RssChain(ChainBase):
image=rss_task.backdrop))
# 未完成下载
logger.info(f'{rss_task.name} 未下载未完整，继续订阅 ...')
if downloads:
# 更新最后更新时间和已处理数量
self.rssoper.update(rssid=rss_task.id,
processed=(rss_task.processed or 0) + len(downloads),
last_update=datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
logger.info("刷新RSS订阅数据完成")

8
app/chain/subscribe.py
View File

@ -227,7 +227,7 @@ class SubscribeChain(ChainBase):
subscribe.season: NotExistMediaInfo(
season=subscribe.season,
episodes=[],
total_episodes=subscribe.total_episode,
total_episode=subscribe.total_episode,
start_episode=subscribe.start_episode or 1)
}
else:
@ -475,7 +475,7 @@ class SubscribeChain(ChainBase):
subscribe.season: NotExistMediaInfo(
season=subscribe.season,
episodes=[],
total_episodes=subscribe.total_episode,
total_episode=subscribe.total_episode,
start_episode=subscribe.start_episode or 1)
}
else:
@ -726,7 +726,7 @@ class SubscribeChain(ChainBase):
# 原季集列表
episode_list = no_exist_season.episodes
# 原总集数
total = no_exist_season.total_episodes
total = no_exist_season.total_episode
if total_episode and start_episode:
# 有开始集和总集数
episodes = list(range(start_episode, total_episode + 1))
@ -747,7 +747,7 @@ class SubscribeChain(ChainBase):
no_exists[tmdb_id][begin_season] = NotExistMediaInfo(
season=begin_season,
episodes=episodes,
total_episodes=total_episode,
total_episode=total_episode,
start_episode=start_episode
)
return no_exists