From fdd4aef3d312efe4acd0417894679f5899e24d64 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Mon, 11 Sep 2023 17:47:51 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E6=95=B4=E5=90=88RSS=E8=AE=A2=E9=98=85?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 + app/api/apiv1.py | 3 +- app/api/endpoints/rss.py | 135 ----------- app/chain/rss.py | 320 --------------------------- app/chain/torrents.py | 78 ++++++- app/core/config.py | 4 + app/db/models/rss.py | 66 ------ app/db/rss_oper.py | 57 ----- app/plugins/rsssubscribe/__init__.py | 2 +- app/scheduler.py | 24 +- app/schemas/__init__.py | 1 - app/schemas/rss.py | 54 ----- 12 files changed, 93 insertions(+), 653 deletions(-) delete mode 100644 app/api/endpoints/rss.py delete mode 100644 app/chain/rss.py delete mode 100644 app/db/models/rss.py delete mode 100644 app/db/rss_oper.py delete mode 100644 app/schemas/rss.py diff --git a/README.md b/README.md index d8b1e7d6..ad75461e 100644 --- a/README.md +++ b/README.md @@ -81,6 +81,8 @@ docker pull jxxghp/moviepilot:latest - **OCR_HOST：** OCR识别服务器地址，格式：`http(s)://ip:port`，用于识别站点二维码实现自动登录获取Cookie等，不配置默认使用内建服务器`https://movie-pilot.org`，可使用 [这个镜像](https://hub.docker.com/r/jxxghp/moviepilot-ocr) 自行搭建。 - **USER_AGENT：** CookieCloud对应的浏览器UA，可选，设置后可增加连接站点的成功率，同步站点后可以在管理界面中修改 - **AUTO_DOWNLOAD_USER：** 交互搜索自动下载用户ID，使用,分割 +- **SUBSCRIBE_MODE：** 订阅模式，`rss`/`spider`，默认`spider`，`rss`模式通过定时刷新RSS来匹配订阅，对站点压力小，同时可设置订阅刷新周期，24小时运行，推荐使用该模式。 +- **SUBSCRIBE_RSS_INTERVAL：** RSS订阅模式刷新时间间隔（分钟），默认`30`分钟，不能小于5分钟。 - **SUBSCRIBE_SEARCH：** 订阅搜索，`true`/`false`，默认`false`，开启后会每隔24小时对所有订阅进行全量搜索，以补齐缺失剧集（一般情况下正常订阅即可，订阅搜索只做为兜底，会增加站点压力，不建议开启）。 - **MESSAGER：** 消息通知渠道，支持 `telegram`/`wechat`/`slack`，开启多个渠道时使用`,`分隔。同时还需要配置对应渠道的环境变量，非对应渠道的变量可删除，推荐使用`telegram` diff --git a/app/api/apiv1.py b/app/api/apiv1.py index 3183c102..f0bcbd74 100644 --- a/app/api/apiv1.py +++ b/app/api/apiv1.py @@ -1,7 +1,7 @@ from fastapi import APIRouter from app.api.endpoints import login, user, site, message, webhook, subscribe, \ - media, douban, search, plugin, tmdb, history, system, download, dashboard, rss, filebrowser, transfer + media, douban, search, plugin, tmdb, history, system, download, dashboard, filebrowser, transfer api_router = APIRouter() api_router.include_router(login.router, prefix="/login", tags=["login"]) @@ -19,6 +19,5 @@ api_router.include_router(system.router, prefix="/system", tags=["system"]) api_router.include_router(plugin.router, prefix="/plugin", tags=["plugin"]) api_router.include_router(download.router, prefix="/download", tags=["download"]) api_router.include_router(dashboard.router, prefix="/dashboard", tags=["dashboard"]) -api_router.include_router(rss.router, prefix="/rss", tags=["rss"]) api_router.include_router(filebrowser.router, prefix="/filebrowser", tags=["filebrowser"]) api_router.include_router(transfer.router, prefix="/transfer", tags=["transfer"]) diff --git a/app/api/endpoints/rss.py b/app/api/endpoints/rss.py deleted file mode 100644 index 10674527..00000000 --- a/app/api/endpoints/rss.py +++ /dev/null @@ -1,135 +0,0 @@ -from typing import List, Any - -from fastapi import APIRouter, Depends -from sqlalchemy.orm import Session -from starlette.background import BackgroundTasks - -from app import schemas -from app.chain.rss import RssChain -from app.core.security import verify_token -from app.db import get_db -from app.db.models.rss import Rss -from app.helper.rss import RssHelper -from app.schemas import MediaType - -router = APIRouter() - - -def start_rss_refresh(db: Session, rssid: int = None): - """ - 启动自定义订阅刷新 - """ - RssChain(db).refresh(rssid=rssid, manual=True) - - -@router.get("/", summary="所有自定义订阅", response_model=List[schemas.Rss]) -def read_rsses( - db: Session = Depends(get_db), - _: schemas.TokenPayload = Depends(verify_token)) -> Any: - """ - 查询所有自定义订阅 - """ - return Rss.list(db) - - -@router.post("/", summary="新增自定义订阅", response_model=schemas.Response) -def create_rss( - *, - rss_in: schemas.Rss, - db: Session = Depends(get_db), - _: schemas.TokenPayload = Depends(verify_token) -) -> Any: - """ - 新增自定义订阅 - """ - if rss_in.type: - mtype = MediaType(rss_in.type) - else: - mtype = None - rssid, errormsg = RssChain(db).add( - mtype=mtype, - **rss_in.dict() - ) - if not rssid: - return schemas.Response(success=False, message=errormsg) - return schemas.Response(success=True, data={ - "id": rssid - }) - - -@router.put("/", summary="更新自定义订阅", response_model=schemas.Response) -def update_rss( - *, - rss_in: schemas.Rss, - db: Session = Depends(get_db), - _: schemas.TokenPayload = Depends(verify_token) -) -> Any: - """ - 更新自定义订阅信息 - """ - rss = Rss.get(db, rss_in.id) - if not rss: - return schemas.Response(success=False, message="自定义订阅不存在") - - rss.update(db, rss_in.dict()) - return schemas.Response(success=True) - - -@router.get("/preview/{rssid}", summary="预览自定义订阅", response_model=List[schemas.TorrentInfo]) -def preview_rss( - rssid: int, - db: Session = Depends(get_db), - _: schemas.TokenPayload = Depends(verify_token)) -> Any: - """ - 根据ID查询自定义订阅RSS报文 - """ - rssinfo: Rss = Rss.get(db, rssid) - if not rssinfo: - return [] - torrents = RssHelper.parse(rssinfo.url, proxy=True if rssinfo.proxy else False) or [] - return [schemas.TorrentInfo( - title=t.get("title"), - description=t.get("description"), - enclosure=t.get("enclosure"), - size=t.get("size"), - page_url=t.get("link"), - pubdate=t["pubdate"].strftime("%Y-%m-%d %H:%M:%S") if t.get("pubdate") else None, - ) for t in torrents] - - -@router.get("/refresh/{rssid}", summary="刷新自定义订阅", response_model=schemas.Response) -def refresh_rss( - rssid: int, - background_tasks: BackgroundTasks, - db: Session = Depends(get_db), - _: schemas.TokenPayload = Depends(verify_token)) -> Any: - """ - 根据ID刷新自定义订阅 - """ - background_tasks.add_task(start_rss_refresh, - db=db, - rssid=rssid) - return schemas.Response(success=True) - - -@router.get("/{rssid}", summary="查询自定义订阅详情", response_model=schemas.Rss) -def read_rss( - rssid: int, - db: Session = Depends(get_db), - _: schemas.TokenPayload = Depends(verify_token)) -> Any: - """ - 根据ID查询自定义订阅详情 - """ - return Rss.get(db, rssid) - - -@router.delete("/{rssid}", summary="删除自定义订阅", response_model=schemas.Response) -def read_rss( - rssid: int, - db: Session = Depends(get_db), - _: schemas.TokenPayload = Depends(verify_token)) -> Any: - """ - 根据ID删除自定义订阅 - """ - Rss.delete(db, rssid) - return schemas.Response(success=True) diff --git a/app/chain/rss.py b/app/chain/rss.py deleted file mode 100644 index 82f41fd3..00000000 --- a/app/chain/rss.py +++ /dev/null @@ -1,320 +0,0 @@ -import json -import re -from datetime import datetime -from typing import Tuple, Optional - -from sqlalchemy.orm import Session - -from app.chain import ChainBase -from app.chain.download import DownloadChain -from app.core.config import settings -from app.core.context import Context, TorrentInfo, MediaInfo -from app.core.metainfo import MetaInfo -from app.db.rss_oper import RssOper -from app.db.systemconfig_oper import SystemConfigOper -from app.helper.message import MessageHelper -from app.helper.rss import RssHelper -from app.helper.sites import SitesHelper -from app.log import logger -from app.schemas import Notification, NotExistMediaInfo -from app.schemas.types import SystemConfigKey, MediaType, NotificationType -from app.utils.string import StringUtils - - -class RssChain(ChainBase): - """ - RSS处理链 - """ - - def __init__(self, db: Session = None): - super().__init__(db) - self.rssoper = RssOper(self._db) - self.sites = SitesHelper() - self.systemconfig = SystemConfigOper() - self.downloadchain = DownloadChain(self._db) - self.message = MessageHelper() - - def add(self, title: str, year: str, - mtype: MediaType = None, - season: int = None, - **kwargs) -> Tuple[Optional[int], str]: - """ - 识别媒体信息并添加订阅 - """ - logger.info(f'开始添加自定义订阅，标题：{title} ...') - - # 识别元数据 - metainfo = MetaInfo(title) - if year: - metainfo.year = year - if mtype: - metainfo.type = mtype - if season: - metainfo.type = MediaType.TV - metainfo.begin_season = season - - # 识别媒体信息 - mediainfo: MediaInfo = self.recognize_media(meta=metainfo) - if not mediainfo: - logger.warn(f'{title} 未识别到媒体信息') - return None, "未识别到媒体信息" - - # 更新媒体图片 - self.obtain_images(mediainfo=mediainfo) - - # 总集数 - if mediainfo.type == MediaType.TV: - if not season: - season = 1 - # 总集数 - if not kwargs.get('total_episode'): - if not mediainfo.seasons: - # 补充媒体信息 - mediainfo: MediaInfo = self.recognize_media(mtype=mediainfo.type, - tmdbid=mediainfo.tmdb_id) - if not mediainfo: - logger.error(f"媒体信息识别失败！") - return None, "媒体信息识别失败" - if not mediainfo.seasons: - logger.error(f"{title} 媒体信息中没有季集信息") - return None, "媒体信息中没有季集信息" - total_episode = len(mediainfo.seasons.get(season) or []) - if not total_episode: - logger.error(f'{title} 未获取到总集数') - return None, "未获取到总集数" - 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=title, year=year, season=season, **kwargs) - if not sid: - logger.error(f'{mediainfo.title_year} 添加自定义订阅失败') - return None, "添加自定义订阅失败" - else: - logger.info(f'{mediainfo.title_year} {metainfo.season} 添加订阅成功') - - # 返回结果 - return sid, "" - - def refresh(self, rssid: int = None, manual: bool = False): - """ - 刷新RSS订阅数据 - """ - # 所有RSS订阅 - logger.info("开始刷新RSS订阅数据 ...") - rss_tasks = self.rssoper.list(rssid) or [] - for rss_task in rss_tasks: - if not rss_task: - continue - if not rss_task.url: - continue - - # 下载Rss报文 - items = RssHelper.parse(rss_task.url, True if rss_task.proxy else False) - if not items: - logger.error(f"RSS未下载到数据：{rss_task.url}") - logger.info(f"{rss_task.name} RSS下载到数据：{len(items)}") - - # 检查站点 - domain = StringUtils.get_url_domain(rss_task.url) - site_info = self.sites.get_indexer(domain) or {} - - # 过滤规则 - if rss_task.best_version: - filter_rule = self.systemconfig.get(SystemConfigKey.FilterRules2) - else: - filter_rule = self.systemconfig.get(SystemConfigKey.FilterRules) - - # 处理RSS条目 - matched_contexts = [] - - # 处理过的title - processed_data = json.loads(rss_task.note) if rss_task.note else { - "titles": [], - "season_episodes": [] - } - - for item in items: - if not item.get("title"): - continue - - # 标题是否已处理过 - if item.get("title") in processed_data.get('titles'): - logger.info(f"{item.get('title')} 已处理过") - continue - - # 基本要素匹配 - if rss_task.include \ - and not re.search(r"%s" % rss_task.include, item.get("title")): - logger.info(f"{item.get('title')} 未包含 {rss_task.include}") - continue - if rss_task.exclude \ - and re.search(r"%s" % rss_task.exclude, item.get("title")): - logger.info(f"{item.get('title')} 包含 {rss_task.exclude}") - continue - - # 识别媒体信息 - meta = MetaInfo(title=item.get("title"), subtitle=item.get("description")) - if not meta.name: - logger.error(f"{item.get('title')} 未识别到有效信息") - continue - mediainfo = self.recognize_media(meta=meta) - if not mediainfo: - logger.error(f"{item.get('title')} 未识别到TMDB媒体信息") - continue - if mediainfo.tmdb_id != rss_task.tmdbid: - logger.error(f"{item.get('title')} 不匹配") - continue - - # 季集是否已处理过 - if meta.season_episode in processed_data.get('season_episodes'): - logger.info(f"{meta.org_string} {meta.season_episode} 已处理过") - continue - - # 种子 - torrentinfo = TorrentInfo( - site=site_info.get("id"), - site_name=site_info.get("name"), - site_cookie=site_info.get("cookie"), - site_ua=site_info.get("cookie") or settings.USER_AGENT, - site_proxy=site_info.get("proxy") or rss_task.proxy, - site_order=site_info.get("pri"), - title=item.get("title"), - description=item.get("description"), - enclosure=item.get("enclosure"), - page_url=item.get("link"), - size=item.get("size"), - pubdate=item["pubdate"].strftime("%Y-%m-%d %H:%M:%S") if item.get("pubdate") else None, - ) - - # 过滤种子 - if rss_task.filter: - result = self.filter_torrents( - rule_string=filter_rule, - torrent_list=[torrentinfo] - ) - if not result: - logger.info(f"{rss_task.name} 不匹配过滤规则") - continue - - # 清除多余数据 - mediainfo.clear() - - # 匹配到的数据 - matched_contexts.append(Context( - meta_info=meta, - media_info=mediainfo, - torrent_info=torrentinfo - )) - - # 匹配结果 - if not matched_contexts: - logger.info(f"{rss_task.name} 未匹配到数据") - continue - - logger.info(f"{rss_task.name} 匹配到 {len(matched_contexts)} 条数据") - - # 查询本地存在情况 - if not rss_task.best_version: - # 查询缺失的媒体信息 - rss_meta = MetaInfo(title=rss_task.title) - rss_meta.year = rss_task.year - rss_meta.begin_season = rss_task.season - rss_meta.type = MediaType(rss_task.type) - - # 每季总集数 - totals = {} - if rss_task.season and rss_task.total_episode: - totals = { - rss_task.season: rss_task.total_episode - } - - # 检查缺失 - exist_flag, no_exists = self.downloadchain.get_no_exists_info( - meta=rss_meta, - mediainfo=MediaInfo( - title=rss_task.title, - year=rss_task.year, - tmdb_id=rss_task.tmdbid, - season=rss_task.season - ), - totals=totals - ) - if exist_flag: - logger.info(f'{rss_task.name} 媒体库中已存在，完成订阅') - self.rssoper.delete(rss_task.id) - # 发送通知 - self.post_message(Notification(mtype=NotificationType.Subscribe, - title=f'自定义订阅 {rss_task.name} 已完成', - image=rss_task.backdrop)) - continue - elif rss_meta.type == MediaType.TV.value: - # 打印缺失集信息 - if no_exists and no_exists.get(rss_task.tmdbid): - no_exists_info = no_exists.get(rss_task.tmdbid).get(rss_task.season) - if no_exists_info: - logger.info(f'订阅 {rss_task.name} 缺失集：{no_exists_info.episodes}') - else: - if rss_task.type == MediaType.TV.value: - no_exists = { - rss_task.season: NotExistMediaInfo( - season=rss_task.season, - episodes=[], - 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, - save_path=rss_task.save_path) - if downloads and not lefts: - if not rss_task.best_version: - # 非洗版结束订阅 - self.rssoper.delete(rss_task.id) - # 发送通知 - self.post_message(Notification(mtype=NotificationType.Subscribe, - title=f'自定义订阅 {rss_task.name} 已完成', - image=rss_task.backdrop)) - else: - # 未完成下载 - logger.info(f'{rss_task.name} 未下载未完整，继续订阅 ...') - - if downloads: - for download in downloads: - meta = download.meta_info - # 更新已处理数据 - processed_data['titles'].append(meta.org_string) - processed_data['season_episodes'].append(meta.season_episode) - # 更新已处理过的数据 - self.rssoper.update(rssid=rss_task.id, note=json.dumps(processed_data)) - # 更新最后更新时间和已处理数量 - 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订阅数据完成") - if manual: - if len(rss_tasks) == 1: - self.message.put(f"{rss_tasks[0].name} 自定义订阅刷新完成") - else: - self.message.put(f"自定义订阅刷新完成") diff --git a/app/chain/torrents.py b/app/chain/torrents.py index d9b561c4..77150dce 100644 --- a/app/chain/torrents.py +++ b/app/chain/torrents.py @@ -8,6 +8,7 @@ from app.core.context import TorrentInfo, Context, MediaInfo from app.core.metainfo import MetaInfo from app.db import SessionFactory from app.db.systemconfig_oper import SystemConfigOper +from app.helper.rss import RssHelper from app.helper.sites import SitesHelper from app.log import logger from app.schemas import Notification @@ -18,15 +19,17 @@ from app.utils.string import StringUtils class TorrentsChain(ChainBase, metaclass=Singleton): """ - 站点首页种子处理链，服务于订阅、刷流等 + 站点首页或RSS种子处理链，服务于订阅、刷流等 """ - _cache_file = "__torrents_cache__" + _spider_file = "__torrents_cache__" + _rss_file = "__rss_cache__" def __init__(self): self._db = SessionFactory() super().__init__(self._db) self.siteshelper = SitesHelper() + self.rsshelper = RssHelper() self.systemconfig = SystemConfigOper() def remote_refresh(self, channel: MessageChannel, userid: Union[str, int] = None): @@ -39,12 +42,20 @@ class TorrentsChain(ChainBase, metaclass=Singleton): self.post_message(Notification(channel=channel, title=f"种子刷新完成！", userid=userid)) - def get_torrents(self) -> Dict[str, List[Context]]: + def get_torrents(self, stype: str = None) -> Dict[str, List[Context]]: """ 获取当前缓存的种子 + :param stype: 强制指定缓存类型，spider:爬虫缓存，rss:rss缓存 """ + + if not stype: + stype = settings.SUBSCRIBE_MODE + # 读取缓存 - return self.load_cache(self._cache_file) or {} + if stype == 'spider': + return self.load_cache(self._spider_file) or {} + else: + return self.load_cache(self._rss_file) or {} @cached(cache=TTLCache(maxsize=128, ttl=600)) def browse(self, domain: str) -> List[TorrentInfo]: @@ -59,10 +70,55 @@ class TorrentsChain(ChainBase, metaclass=Singleton): return [] return self.refresh_torrents(site=site) - def refresh(self) -> Dict[str, List[Context]]: + @cached(cache=TTLCache(maxsize=128, ttl=300)) + def rss(self, domain: str) -> List[TorrentInfo]: + """ + 获取站点RSS内容，返回种子清单，TTL缓存5分钟 + :param domain: 站点域名 + """ + logger.info(f'开始获取站点 {domain} RSS ...') + site = self.siteshelper.get_indexer(domain) + if not site: + logger.error(f'站点 {domain} 不存在！') + return [] + if not site.get("rss"): + logger.error(f'站点 {domain} 未配置RSS地址！') + return [] + rss_items = self.rsshelper.parse(site.get("rss"), True if site.get("proxy") else False) + if not rss_items: + logger.error(f'站点 {domain} 未获取到RSS数据！') + return [] + # 组装种子 + ret_torrents: List[TorrentInfo] = [] + for item in rss_items: + if not item.get("title"): + continue + torrentinfo = TorrentInfo( + site=site.get("id"), + site_name=site.get("name"), + site_cookie=site.get("cookie"), + site_ua=site.get("ua") or settings.USER_AGENT, + site_proxy=site.get("proxy"), + site_order=site.get("pri"), + title=item.get("title"), + description=item.get("description"), + enclosure=item.get("enclosure"), + page_url=item.get("link"), + size=item.get("size"), + pubdate=item["pubdate"].strftime("%Y-%m-%d %H:%M:%S") if item.get("pubdate") else None, + ) + ret_torrents.append(torrentinfo) + + return ret_torrents + + def refresh(self, stype: str = None) -> Dict[str, List[Context]]: """ 刷新站点最新资源，识别并缓存起来 + :param stype: 强制指定缓存类型，spider:爬虫缓存，rss:rss缓存 """ + # 刷新类型 + if not stype: + stype = settings.SUBSCRIBE_MODE # 读取缓存 torrents_cache = self.get_torrents() @@ -77,7 +133,12 @@ class TorrentsChain(ChainBase, metaclass=Singleton): if config_indexers and str(indexer.get("id")) not in config_indexers: continue domain = StringUtils.get_url_domain(indexer.get("domain")) - torrents: List[TorrentInfo] = self.browse(domain=domain) + if stype == "spider": + # 刷新首页种子 + torrents: List[TorrentInfo] = self.browse(domain=domain) + else: + # 刷新RSS种子 + torrents: List[TorrentInfo] = self.rss(site=indexer) # 按pubdate降序排列 torrents.sort(key=lambda x: x.pubdate or '', reverse=True) # 取前N条 @@ -120,6 +181,9 @@ class TorrentsChain(ChainBase, metaclass=Singleton): else: logger.info(f'{indexer.get("name")} 没有获取到种子') # 保存缓存到本地 - self.save_cache(torrents_cache, self._cache_file) + if stype == "spider": + self.save_cache(torrents_cache, self._spider_file) + else: + self.save_cache(torrents_cache, self._rss_file) # 返回 return torrents_cache diff --git a/app/core/config.py b/app/core/config.py index e4bd1526..aec27d3c 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -66,6 +66,10 @@ class Settings(BaseSettings): RMT_AUDIO_TRACK_EXT: list = ['.mka'] # 索引器 INDEXER: str = "builtin" + # 订阅模式 + SUBSCRIBE_MODE: str = "spider" + # RSS订阅模式刷新时间间隔（分钟） + SUBSCRIBE_RSS_INTERVAL: int = 30 # 订阅搜索开关 SUBSCRIBE_SEARCH: bool = False # 用户认证站点 hhclub/audiences/hddolby/zmpt/freefarm/hdfans/wintersakura/leaves/1ptba/icc2022/iyuu diff --git a/app/db/models/rss.py b/app/db/models/rss.py deleted file mode 100644 index 3b9be240..00000000 --- a/app/db/models/rss.py +++ /dev/null @@ -1,66 +0,0 @@ -from sqlalchemy import Column, Integer, String, Sequence -from sqlalchemy.orm import Session - -from app.db.models import Base - - -class Rss(Base): - """ - RSS订阅 - """ - id = Column(Integer, Sequence('id'), primary_key=True, index=True) - # 名称 - name = Column(String, nullable=False) - # RSS地址 - url = Column(String, nullable=False) - # 类型 - type = Column(String) - # 标题 - title = Column(String) - # 年份 - year = Column(String) - # TMDBID - tmdbid = Column(Integer, index=True) - # 季号 - season = Column(Integer) - # 海报 - poster = Column(String) - # 背景图 - backdrop = Column(String) - # 评分 - vote = Column(Integer) - # 简介 - description = Column(String) - # 总集数 - total_episode = Column(Integer) - # 包含 - include = Column(String) - # 排除 - exclude = Column(String) - # 洗版 - best_version = Column(Integer) - # 是否使用代理服务器 - proxy = Column(Integer) - # 是否使用过滤规则 - filter = Column(Integer) - # 保存路径 - save_path = Column(String) - # 已处理数量 - processed = Column(Integer) - # 附加信息，已处理数据 - note = Column(String) - # 最后更新时间 - last_update = Column(String) - # 状态 0-停用，1-启用 - state = Column(Integer, default=1) - - @staticmethod - def get_by_tmdbid(db: Session, tmdbid: int, season: int = None): - if season: - return db.query(Rss).filter(Rss.tmdbid == tmdbid, - Rss.season == season).all() - return db.query(Rss).filter(Rss.tmdbid == tmdbid).all() - - @staticmethod - def get_by_title(db: Session, title: str): - return db.query(Rss).filter(Rss.title == title).first() diff --git a/app/db/rss_oper.py b/app/db/rss_oper.py deleted file mode 100644 index 2e649496..00000000 --- a/app/db/rss_oper.py +++ /dev/null @@ -1,57 +0,0 @@ -from typing import List - -from sqlalchemy.orm import Session - -from app.db import DbOper -from app.db.models.rss import Rss - - -class RssOper(DbOper): - """ - RSS订阅数据管理 - """ - - def __init__(self, db: Session = None): - super().__init__(db) - - def add(self, **kwargs) -> bool: - """ - 新增RSS订阅 - """ - item = Rss(**kwargs) - item.create(self._db) - return True - - def exists(self, tmdbid: int, season: int = None): - """ - 判断是否存在 - """ - return Rss.get_by_tmdbid(self._db, tmdbid, season) - - def list(self, rssid: int = None) -> List[Rss]: - """ - 查询所有RSS订阅 - """ - if rssid: - return [Rss.get(self._db, rssid)] - return Rss.list(self._db) - - def delete(self, rssid: int) -> bool: - """ - 删除RSS订阅 - """ - item = Rss.get(self._db, rssid) - if item: - item.delete(self._db) - return True - return False - - def update(self, rssid: int, **kwargs) -> bool: - """ - 更新RSS订阅 - """ - item = Rss.get(self._db, rssid) - if item: - item.update(self._db, kwargs) - return True - return False diff --git a/app/plugins/rsssubscribe/__init__.py b/app/plugins/rsssubscribe/__init__.py index 93bf6253..08c6f4b7 100644 --- a/app/plugins/rsssubscribe/__init__.py +++ b/app/plugins/rsssubscribe/__init__.py @@ -24,7 +24,7 @@ lock = Lock() class RssSubscribe(_PluginBase): # 插件名称 - plugin_name = "RSS订阅" + plugin_name = "自定义订阅" # 插件描述 plugin_desc = "定时刷新RSS报文，识别内容后添加订阅或直接下载。" # 插件图标 diff --git a/app/scheduler.py b/app/scheduler.py index 4feac033..6e49916a 100644 --- a/app/scheduler.py +++ b/app/scheduler.py @@ -8,7 +8,6 @@ from apscheduler.schedulers.background import BackgroundScheduler from app.chain import ChainBase from app.chain.cookiecloud import CookieCloudChain from app.chain.mediaserver import MediaServerChain -from app.chain.rss import RssChain from app.chain.subscribe import SubscribeChain from app.chain.transfer import TransferChain from app.core.config import settings @@ -71,15 +70,20 @@ class Scheduler(metaclass=Singleton): self._scheduler.add_job(SubscribeChain(self._db).search, "interval", hours=24, kwargs={'state': 'R'}, name="订阅搜索") - # 站点首页种子定时刷新缓存并匹配订阅 - triggers = TimerUtils.random_scheduler(num_executions=30) - for trigger in triggers: - self._scheduler.add_job(SubscribeChain(self._db).refresh, "cron", - hour=trigger.hour, minute=trigger.minute, name="订阅刷新") - - # 自定义订阅 - self._scheduler.add_job(RssChain(self._db).refresh, "interval", - minutes=30, name="自定义订阅刷新") + if settings.SUBSCRIBE_MODE == "spider": + # 站点首页种子定时刷新模式 + triggers = TimerUtils.random_scheduler(num_executions=30) + for trigger in triggers: + self._scheduler.add_job(SubscribeChain(self._db).refresh, "cron", + hour=trigger.hour, minute=trigger.minute, name="订阅刷新") + else: + # RSS订阅模式 + if not settings.SUBSCRIBE_RSS_INTERVAL: + settings.SUBSCRIBE_RSS_INTERVAL = 30 + elif settings.SUBSCRIBE_RSS_INTERVAL < 5: + settings.SUBSCRIBE_RSS_INTERVAL = 5 + self._scheduler.add_job(SubscribeChain(self._db).refresh, "interval", + minutes=settings.SUBSCRIBE_RSS_INTERVAL, name="订阅刷新") # 下载器文件转移（每5分钟） if settings.DOWNLOADER_MONITOR: diff --git a/app/schemas/__init__.py b/app/schemas/__init__.py index a88ca0cd..e38903b6 100644 --- a/app/schemas/__init__.py +++ b/app/schemas/__init__.py @@ -12,5 +12,4 @@ from .mediaserver import * from .message import * from .tmdb import * from .transfer import * -from .rss import * from .file import * diff --git a/app/schemas/rss.py b/app/schemas/rss.py deleted file mode 100644 index cb739c9c..00000000 --- a/app/schemas/rss.py +++ /dev/null @@ -1,54 +0,0 @@ -from typing import Optional - -from pydantic import BaseModel - - -class Rss(BaseModel): - id: Optional[int] - # 名称 - name: Optional[str] - # RSS地址 - url: Optional[str] - # 类型 - type: Optional[str] - # 标题 - title: Optional[str] - # 年份 - year: Optional[str] - # TMDBID - tmdbid: Optional[int] - # 季号 - season: Optional[int] - # 海报 - poster: Optional[str] - # 背景图 - backdrop: Optional[str] - # 评分 - vote: Optional[float] - # 简介 - description: Optional[str] - # 总集数 - total_episode: Optional[int] - # 包含 - include: Optional[str] - # 排除 - exclude: Optional[str] - # 洗版 - best_version: Optional[int] - # 是否使用代理服务器 - proxy: Optional[int] - # 是否使用过滤规则 - filter: Optional[int] - # 保存路径 - save_path: Optional[str] - # 附加信息 - note: Optional[str] - # 已处理数量 - processed: Optional[int] - # 最后更新时间 - last_update: Optional[str] - # 状态 0-停用，1-启用 - state: Optional[int] - - class Config: - orm_mode = True