diff --git a/app/api/endpoints/subscribe.py b/app/api/endpoints/subscribe.py index a34cb328..e5cd278e 100644 --- a/app/api/endpoints/subscribe.py +++ b/app/api/endpoints/subscribe.py @@ -15,10 +15,11 @@ from app.db import get_db from app.db.models.subscribe import Subscribe from app.db.models.subscribehistory import SubscribeHistory from app.db.models.user import User +from app.db.systemconfig_oper import SystemConfigOper from app.db.user_oper import get_current_active_user from app.helper.subscribe import SubscribeHelper from app.scheduler import Scheduler -from app.schemas.types import MediaType, EventType +from app.schemas.types import MediaType, EventType, SystemConfigKey router = APIRouter() @@ -497,6 +498,42 @@ def subscribe_fork( return result +@router.get("/follow", summary="查询已Follow的订阅分享人", response_model=List[str]) +def followed_subscribers(_: schemas.TokenPayload = Depends(verify_token)) -> Any: + """ + 查询已Follow的订阅分享人 + """ + return SystemConfigOper().get(SystemConfigKey.FollowSubscribers) or [] + + +@router.post("/follow", summary="Follow订阅分享人", response_model=schemas.Response) +def follow_subscriber( + share_uid: str = None, + _: schemas.TokenPayload = Depends(verify_token)) -> Any: + """ + Follow订阅分享人 + """ + subscribers = SystemConfigOper().get(SystemConfigKey.FollowSubscribers) or [] + if share_uid and share_uid not in subscribers: + subscribers.append(share_uid) + SystemConfigOper().set(SystemConfigKey.FollowSubscribers, subscribers) + return schemas.Response(success=True) + + +@router.delete("/follow", summary="取消Follow订阅分享人", response_model=schemas.Response) +def unfollow_subscriber( + share_uid: str = None, + _: schemas.TokenPayload = Depends(verify_token)) -> Any: + """ + 取消Follow订阅分享人 + """ + subscribers = SystemConfigOper().get(SystemConfigKey.FollowSubscribers) or [] + if share_uid and share_uid in subscribers: + subscribers.remove(share_uid) + SystemConfigOper().set(SystemConfigKey.FollowSubscribers, subscribers) + return schemas.Response(success=True) + + @router.get("/shares", summary="查询分享的订阅", response_model=List[schemas.SubscribeShare]) def popular_subscribes( name: str = None, diff --git a/app/chain/subscribe.py b/app/chain/subscribe.py index 2461a43d..2be6da33 100644 --- a/app/chain/subscribe.py +++ b/app/chain/subscribe.py @@ -6,6 +6,7 @@ import time from datetime import datetime from typing import Dict, List, Optional, Union, Tuple +from app import schemas from app.chain import ChainBase from app.chain.download import DownloadChain from app.chain.media import MediaChain @@ -27,8 +28,6 @@ from app.helper.message import MessageHelper from app.helper.subscribe import SubscribeHelper from app.helper.torrent import TorrentHelper from app.log import logger -from app.schemas import NotExistMediaInfo, Notification, SubscrbieInfo, SubscribeEpisodeInfo, SubscribeDownloadFileInfo, \ - SubscribeLibraryFileInfo from app.schemas.types import MediaType, SystemConfigKey, MessageChannel, NotificationType, EventType from app.utils.singleton import Singleton @@ -173,14 +172,14 @@ class SubscribeChain(ChainBase, metaclass=Singleton): logger.error(f'{mediainfo.title_year} {err_msg}') if not exist_ok and message: # 失败发回原用户 - self.post_message(Notification(channel=channel, - source=source, - mtype=NotificationType.Subscribe, - title=f"{mediainfo.title_year} {metainfo.season} " - f"添加订阅失败！", - text=f"{err_msg}", - image=mediainfo.get_message_image(), - userid=userid)) + self.post_message(schemas.Notification(channel=channel, + source=source, + mtype=NotificationType.Subscribe, + title=f"{mediainfo.title_year} {metainfo.season} " + f"添加订阅失败！", + text=f"{err_msg}", + image=mediainfo.get_message_image(), + userid=userid)) return None, err_msg elif message: logger.info(f'{mediainfo.title_year} {metainfo.season} 添加订阅成功') @@ -193,12 +192,12 @@ class SubscribeChain(ChainBase, metaclass=Singleton): else: link = settings.MP_DOMAIN('#/subscribe/movie?tab=mysub') # 订阅成功按规则发送消息 - self.post_message(Notification(mtype=NotificationType.Subscribe, - title=f"{mediainfo.title_year} {metainfo.season} 已添加订阅", - text=text, - image=mediainfo.get_message_image(), - link=link, - username=username)) + self.post_message(schemas.Notification(mtype=NotificationType.Subscribe, + title=f"{mediainfo.title_year} {metainfo.season} 已添加订阅", + text=text, + image=mediainfo.get_message_image(), + link=link, + username=username)) # 发送事件 EventManager().send_event(EventType.SubscribeAdded, { "subscribe_id": sid, @@ -409,7 +408,7 @@ class SubscribeChain(ChainBase, metaclass=Singleton): def finish_subscribe_or_not(self, subscribe: Subscribe, meta: MetaBase, mediainfo: MediaInfo, downloads: List[Context] = None, - lefts: Dict[Union[int | str], Dict[int, NotExistMediaInfo]] = None, + lefts: Dict[Union[int | str], Dict[int, schemas.NotExistMediaInfo]] = None, force: bool = False): """ 判断是否应完成订阅 @@ -784,6 +783,63 @@ class SubscribeChain(ChainBase, metaclass=Singleton): }) logger.info(f'{subscribe.name} 订阅元数据更新完成') + def follow(self): + """ + 刷新follow的用户分享，并自动添加订阅 + """ + follow_users: List[str] = self.systemconfig.get(SystemConfigKey.FollowSubscribers) + if not follow_users: + return + share_subs = self.subscribehelper.get_shares() + logger.info(f'开始刷新follow用户分享订阅 ...') + success_count = 0 + for share_sub in share_subs: + uid = share_sub.get("share_uid") + if uid and uid in follow_users: + # 订阅已存在则跳过 + if self.subscribeoper.exists(tmdbid=share_sub.get("tmdbid"), + doubanid=share_sub.get("doubanid"), + season=share_sub.get("season")): + continue + # 去除无效属性 + for key in list(share_sub.keys()): + if not hasattr(schemas.Subscribe(), key): + share_sub.pop(key) + # 类型转换 + subscribe_in = schemas.Subscribe(**share_sub) + mtype = MediaType(subscribe_in.type) + # 豆瓣标题处理 + if subscribe_in.doubanid or subscribe_in.bangumiid: + meta = MetaInfo(subscribe_in.name) + subscribe_in.name = meta.name + subscribe_in.season = meta.begin_season + # 标题转换 + if subscribe_in.name: + title = subscribe_in.name + else: + title = None + sid, message = SubscribeChain().add(mtype=mtype, + title=title, + year=subscribe_in.year, + tmdbid=subscribe_in.tmdbid, + season=subscribe_in.season, + doubanid=subscribe_in.doubanid, + bangumiid=subscribe_in.bangumiid, + username=settings.SUPERUSER, + best_version=subscribe_in.best_version, + save_path=subscribe_in.save_path, + search_imdbid=subscribe_in.search_imdbid, + custom_words=subscribe_in.custom_words, + media_category=subscribe_in.media_category, + filter_groups=subscribe_in.filter_groups, + exist_ok=True) + if sid: + success_count += 1 + logger.info(f'follow用户分享订阅 {title} 添加成功') + else: + logger.error(f'follow用户分享订阅 {title} 添加失败：{message}') + logger.info(f'follow用户分享订阅刷新完成，共添加 {success_count} 个订阅') + def __update_subscribe_note(self, subscribe: Subscribe, downloads: List[Context]): """ 更新已下载信息到note字段 @@ -840,7 +896,7 @@ class SubscribeChain(ChainBase, metaclass=Singleton): return note return [] - def __update_lack_episodes(self, lefts: Dict[Union[int, str], Dict[int, NotExistMediaInfo]], + def __update_lack_episodes(self, lefts: Dict[Union[int, str], Dict[int, schemas.NotExistMediaInfo]], subscribe: Subscribe, mediainfo: MediaInfo, update_date: bool = False): @@ -895,11 +951,11 @@ class SubscribeChain(ChainBase, metaclass=Singleton): else: link = settings.MP_DOMAIN('#/subscribe/movie?tab=mysub') # 完成订阅按规则发送消息 - self.post_message(Notification(mtype=NotificationType.Subscribe, - title=f'{mediainfo.title_year} {meta.season} 已完成{msgstr}', - image=mediainfo.get_message_image(), - link=link, - username=subscribe.username)) + self.post_message(schemas.Notification(mtype=NotificationType.Subscribe, + title=f'{mediainfo.title_year} {meta.season} 已完成{msgstr}', + image=mediainfo.get_message_image(), + link=link, + username=subscribe.username)) # 发送事件 EventManager().send_event(EventType.SubscribeComplete, { "subscribe_id": subscribe.id, @@ -919,9 +975,9 @@ class SubscribeChain(ChainBase, metaclass=Singleton): """ subscribes = self.subscribeoper.list() if not subscribes: - self.post_message(Notification(channel=channel, - source=source, - title='没有任何订阅！', userid=userid)) + self.post_message(schemas.Notification(channel=channel, + source=source, + title='没有任何订阅！', userid=userid)) return title = f"共有 {len(subscribes)} 个订阅，回复对应指令操作： " \ f"\n- 删除订阅：/subscribe_delete [id]" \ @@ -937,8 +993,8 @@ class SubscribeChain(ChainBase, metaclass=Singleton): f"[{subscribe.total_episode - (subscribe.lack_episode or subscribe.total_episode)}" f"/{subscribe.total_episode}]") # 发送列表 - self.post_message(Notification(channel=channel, source=source, - title=title, text='\n'.join(messages), userid=userid)) + self.post_message(schemas.Notification(channel=channel, source=source, + title=title, text='\n'.join(messages), userid=userid)) def remote_delete(self, arg_str: str, channel: MessageChannel, userid: Union[str, int] = None, source: str = None): @@ -946,9 +1002,9 @@ class SubscribeChain(ChainBase, metaclass=Singleton): 删除订阅 """ if not arg_str: - self.post_message(Notification(channel=channel, source=source, - title="请输入正确的命令格式：/subscribe_delete [id]，" - "[id]为订阅编号", userid=userid)) + self.post_message(schemas.Notification(channel=channel, source=source, + title="请输入正确的命令格式：/subscribe_delete [id]，" + "[id]为订阅编号", userid=userid)) return arg_strs = str(arg_str).split() for arg_str in arg_strs: @@ -958,8 +1014,8 @@ class SubscribeChain(ChainBase, metaclass=Singleton): subscribe_id = int(arg_str) subscribe = self.subscribeoper.get(subscribe_id) if not subscribe: - self.post_message(Notification(channel=channel, source=source, - title=f"订阅编号 {subscribe_id} 不存在！", userid=userid)) + self.post_message(schemas.Notification(channel=channel, source=source, + title=f"订阅编号 {subscribe_id} 不存在！", userid=userid)) return # 删除订阅 self.subscribeoper.delete(subscribe_id) @@ -973,13 +1029,13 @@ class SubscribeChain(ChainBase, metaclass=Singleton): @staticmethod def __get_subscribe_no_exits(subscribe_name: str, - no_exists: Dict[Union[int, str], Dict[int, NotExistMediaInfo]], + no_exists: Dict[Union[int, str], Dict[int, schemas.NotExistMediaInfo]], mediakey: Union[str, int], begin_season: int, total_episode: int, start_episode: int, downloaded_episodes: List[int] = None - ) -> Tuple[bool, Dict[Union[int, str], Dict[int, NotExistMediaInfo]]]: + ) -> Tuple[bool, Dict[Union[int, str], Dict[int, schemas.NotExistMediaInfo]]]: """ 根据订阅开始集数和总集数，结合TMDB信息计算当前订阅的缺失集数 :param subscribe_name: 订阅名称 @@ -1029,7 +1085,7 @@ class SubscribeChain(ChainBase, metaclass=Singleton): # 与原集列表取交集 episodes = list(set(episode_list).intersection(set(new_episodes))) # 更新集合 - no_exists[mediakey][begin_season] = NotExistMediaInfo( + no_exists[mediakey][begin_season] = schemas.NotExistMediaInfo( season=begin_season, episodes=episodes, total_episode=total_episode, @@ -1056,7 +1112,7 @@ class SubscribeChain(ChainBase, metaclass=Singleton): if not episodes: return True, {} # 更新集合 - no_exists[mediakey][begin_season] = NotExistMediaInfo( + no_exists[mediakey][begin_season] = schemas.NotExistMediaInfo( season=begin_season, episodes=episodes, total_episode=total, @@ -1070,7 +1126,7 @@ class SubscribeChain(ChainBase, metaclass=Singleton): # 如果存在已下载剧集，则差集为空时，说明所有均已存在 if not episodes: return True, {} - no_exists[mediakey][begin_season] = NotExistMediaInfo( + no_exists[mediakey][begin_season] = schemas.NotExistMediaInfo( season=begin_season, episodes=episodes, total_episode=total_episode, @@ -1157,7 +1213,7 @@ class SubscribeChain(ChainBase, metaclass=Singleton): "min_seeders_time": default_rule.get("min_seeders_time"), }.items() if value is not None} - def subscribe_files_info(self, subscribe: Subscribe) -> Optional[SubscrbieInfo]: + def subscribe_files_info(self, subscribe: Subscribe) -> Optional[schemas.SubscrbieInfo]: """ 订阅相关的下载和文件信息 """ @@ -1165,10 +1221,10 @@ class SubscribeChain(ChainBase, metaclass=Singleton): return # 返回订阅数据 - subscribe_info = SubscrbieInfo() + subscribe_info = schemas.SubscrbieInfo() # 所有集的数据 - episodes: Dict[int, SubscribeEpisodeInfo] = {} + episodes: Dict[int, schemas.SubscribeEpisodeInfo] = {} if subscribe.tmdbid and subscribe.type == MediaType.TV.value: # 查询TMDB中的集信息 tmdb_episodes = self.tmdbchain.tmdb_episodes( @@ -1177,7 +1233,7 @@ class SubscribeChain(ChainBase, metaclass=Singleton): ) if tmdb_episodes: for episode in tmdb_episodes: - info = SubscribeEpisodeInfo() + info = schemas.SubscribeEpisodeInfo() info.title = episode.name info.description = episode.overview info.backdrop = f"https://{settings.TMDB_IMAGE_DOMAIN}/t/p/w500${episode.still_path}" @@ -1185,12 +1241,12 @@ class SubscribeChain(ChainBase, metaclass=Singleton): elif subscribe.type == MediaType.TV.value: # 根据开始结束集计算集信息 for i in range(subscribe.start_episode or 1, subscribe.total_episode + 1): - info = SubscribeEpisodeInfo() + info = schemas.SubscribeEpisodeInfo() info.title = f'第 {i} 集' episodes[i] = info else: # 电影 - info = SubscribeEpisodeInfo() + info = schemas.SubscribeEpisodeInfo() info.title = subscribe.name episodes[0] = info @@ -1205,7 +1261,7 @@ class SubscribeChain(ChainBase, metaclass=Singleton): # 识别文件名 file_meta = MetaInfo(file.filepath) # 下载文件信息 - file_info = SubscribeDownloadFileInfo( + file_info = schemas.SubscribeDownloadFileInfo( torrent_title=his.torrent_name, site_name=his.torrent_site, downloader=file.downloader, @@ -1248,7 +1304,7 @@ class SubscribeChain(ChainBase, metaclass=Singleton): # 识别文件名 file_meta = MetaInfo(fileitem.path) # 媒体库文件信息 - file_info = SubscribeLibraryFileInfo( + file_info = schemas.SubscribeLibraryFileInfo( storage=fileitem.storage, file_path=fileitem.path, ) @@ -1308,7 +1364,7 @@ class SubscribeChain(ChainBase, metaclass=Singleton): # 对于电视剧，构造缺失的媒体信息 no_exists = { mediakey: { - subscribe.season: NotExistMediaInfo( + subscribe.season: schemas.NotExistMediaInfo( season=subscribe.season, episodes=[], total_episode=subscribe.total_episode, diff --git a/app/helper/subscribe.py b/app/helper/subscribe.py index 4942712e..b2231136 100644 --- a/app/helper/subscribe.py +++ b/app/helper/subscribe.py @@ -182,7 +182,7 @@ class SubscribeHelper(metaclass=Singleton): return False, res.json().get("message") @cached(region=_shares_cache_region) - def get_shares(self, name: str, page: int = 1, count: int = 30) -> List[dict]: + def get_shares(self, name: str = None, page: int = 1, count: int = 30) -> List[dict]: """ 获取订阅分享数据 """ diff --git a/app/scheduler.py b/app/scheduler.py index 5e118d0b..380b372f 100644 --- a/app/scheduler.py +++ b/app/scheduler.py @@ -92,6 +92,11 @@ class Scheduler(metaclass=Singleton): "func": SubscribeChain().refresh, "running": False, }, + "subscribe_follow": { + "name": "Follow分享订阅", + "func": SubscribeChain().follow, + "running": False, + }, "transfer": { "name": "下载文件整理", "func": TransferChain().process, @@ -241,6 +246,18 @@ class Scheduler(metaclass=Singleton): } ) + # Follow分享订阅（每6小时） + self._scheduler.add_job( + self.start, + "interval", + id="subscribe_follow", + name="Follow分享订阅", + hours=6, + kwargs={ + 'job_id': 'subscribe_follow' + } + ) + # 下载器文件转移（每5分钟） self._scheduler.add_job( self.start, diff --git a/app/schemas/types.py b/app/schemas/types.py index a2395c59..84f59631 100644 --- a/app/schemas/types.py +++ b/app/schemas/types.py @@ -135,6 +135,8 @@ class SystemConfigKey(Enum): DefaultTvSubscribeConfig = "DefaultTvSubscribeConfig" # 用户站点认证参数 UserSiteAuthParams = "UserSiteAuthParams" + # Follow订阅分享者 + FollowSubscribers = "FollowSubscribers" # 处理进度Key字典