From ee790860a35c8252170796d1cbbfff0b7b5d632c Mon Sep 17 00:00:00 2001 From: jxxghp Date: Sat, 19 Aug 2023 10:47:42 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=98=E5=8C=96=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E8=BD=AC=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/chain/transfer.py | 351 ++++++++++++++++++++++++++---------------- app/command.py | 5 + 2 files changed, 221 insertions(+), 135 deletions(-) diff --git a/app/chain/transfer.py b/app/chain/transfer.py index 82e8dbff..455ab420 100644 --- a/app/chain/transfer.py +++ b/app/chain/transfer.py @@ -1,9 +1,8 @@ import json -import re import shutil import threading from pathlib import Path -from typing import List, Optional, Union, Tuple +from typing import List, Optional, Tuple, Union from sqlalchemy.orm import Session @@ -19,7 +18,7 @@ from app.db.transferhistory_oper import TransferHistoryOper from app.helper.progress import ProgressHelper from app.log import logger from app.schemas import TransferInfo, TransferTorrent, Notification -from app.schemas.types import TorrentStatus, EventType, MediaType, ProgressKey, MessageChannel, NotificationType +from app.schemas.types import TorrentStatus, EventType, MediaType, ProgressKey, NotificationType, MessageChannel from app.utils.string import StringUtils from app.utils.system import SystemUtils @@ -37,59 +36,19 @@ class TransferChain(ChainBase): self.transferhis = TransferHistoryOper(self._db) self.progress = ProgressHelper() - def process(self, arg_str: str = None, - channel: MessageChannel = None, userid: Union[str, int] = None) -> bool: + def process(self) -> bool: """ 获取下载器中的种子列表，并执行转移 - :param arg_str: 传入的参数 (种子hash和TMDBID|类型) - :param channel: 消息通道 - :param userid: 用户ID """ - def extract_hash_and_number(string: str): - """ - 从字符串中提取种子hash和编号 - """ - pattern = r'([a-fA-F0-9]+) (\d+)' - match = re.search(pattern, string) - if match: - hash_value = match.group(1) - number = match.group(2) - return hash_value, int(number) - else: - return None, None - # 全局锁，避免重复处理 with lock: - if arg_str: - logger.info(f"开始转移下载器文件，参数：{arg_str}") - # 解析中附带的类型 - args = arg_str.split('|') - if len(args) > 1: - mtype = MediaType(args[-1]) - arg_str = args[0] - else: - mtype = None - # 解析中种子hash，TMDB ID - torrent_hash, tmdbid = extract_hash_and_number(arg_str) - if not hash or not tmdbid: - logger.error(f"参数错误，参数：{arg_str}") - return False - # 获取种子 - torrents: Optional[List[TransferTorrent]] = self.list_torrents(hashs=torrent_hash) - if not torrents: - logger.error(f"没有获取到种子，参数：{torrent_hash}") - return False - # 查询媒体信息 - arg_mediainfo = self.recognize_media(mtype=mtype, tmdbid=tmdbid) - else: - arg_mediainfo = None - logger.info("开始执行下载器文件转移 ...") - # 从下载器获取种子列表 - torrents: Optional[List[TransferTorrent]] = self.list_torrents(status=TorrentStatus.TRANSFER) - if not torrents: - logger.info("没有获取到已完成的下载任务") - return False + logger.info("开始执行下载器文件转移 ...") + # 从下载器获取种子列表 + torrents: Optional[List[TransferTorrent]] = self.list_torrents(status=TorrentStatus.TRANSFER) + if not torrents: + logger.info("没有获取到已完成的下载任务") + return False logger.info(f"获取到 {len(torrents)} 个已完成的下载任务") # 开始进度 @@ -111,49 +70,44 @@ class TransferChain(ChainBase): if not meta.name: logger.error(f'未识别到元数据，标题：{torrent.title}') continue - if not arg_mediainfo: - # 查询下载记录识别情况 - downloadhis: DownloadHistory = self.downloadhis.get_by_hash(torrent.hash) - if downloadhis: - # 类型 - mtype = MediaType(downloadhis.type) - # 补充剧集信息 - if mtype == MediaType.TV \ - and ((not meta.season_list and downloadhis.seasons) - or (not meta.episode_list and downloadhis.episodes)): - meta = MetaInfo(f"{torrent.title} {downloadhis.seasons} {downloadhis.episodes}") - # 按TMDBID识别 - mediainfo = self.recognize_media(mtype=mtype, - tmdbid=downloadhis.tmdbid) - else: - # 使用标题识别媒体信息 - mediainfo: MediaInfo = self.recognize_media(meta=meta) - if not mediainfo: - logger.warn(f'未识别到媒体信息，标题：{torrent.title}') - self.post_message(Notification( - channel=channel, - mtype=NotificationType.Manual, - title=f"{torrent.title} 未识别到媒体信息，无法入库！\n" - f"回复：```\n/transfer {torrent.hash} [tmdbid]|[类型]\n``` 手动识别转移。", - userid=userid)) - # 新增转移失败历史记录 - self.transferhis.add( - src=str(torrent.path), - mode=settings.TRANSFER_TYPE, - seasons=meta.season, - episodes=meta.episode, - download_hash=torrent.hash, - status=0, - errmsg="未识别到媒体信息" - ) - # 设置种子状态，避免一直报错 - self.transfer_completed(hashs=torrent.hash, transinfo=transferinfo) - continue + + # 查询下载记录识别情况 + downloadhis: DownloadHistory = self.downloadhis.get_by_hash(torrent.hash) + if downloadhis: + # 类型 + mtype = MediaType(downloadhis.type) + # 补充剧集信息 + if mtype == MediaType.TV \ + and ((not meta.season_list and downloadhis.seasons) + or (not meta.episode_list and downloadhis.episodes)): + meta = MetaInfo(f"{torrent.title} {downloadhis.seasons} {downloadhis.episodes}") + # 按TMDBID识别 + mediainfo = self.recognize_media(mtype=mtype, + tmdbid=downloadhis.tmdbid) else: - mediainfo = arg_mediainfo + mediainfo = self.recognize_media(meta=meta) + + if not mediainfo: + logger.warn(f'未识别到媒体信息，标题：{torrent.title}') + # 新增转移失败历史记录 + his = self.__insert_fail_history( + src_path=torrent.path, + download_hash=torrent.hash, + meta=meta + ) + self.post_message(Notification( + mtype=NotificationType.Manual, + title=f"{torrent.title} 未识别到媒体信息，无法入库！\n" + f"回复：```\n/redo {his.id} [tmdbid]|[类型]\n``` 手动识别转移。" + )) + # 设置种子状态，避免一直报错 + self.transfer_completed(hashs=torrent.hash, transinfo=transferinfo) + continue + logger.info(f"{torrent.title} 识别为：{mediainfo.type.value} {mediainfo.title_year}") # 更新媒体图片 self.obtain_images(mediainfo=mediainfo) + # 转移 transferinfo: TransferInfo = self.transfer(mediainfo=mediainfo, path=torrent.path, @@ -164,56 +118,31 @@ class TransferChain(ChainBase): if not transferinfo.target_path: # 转移失败 logger.warn(f"{torrent.title} 入库失败：{transferinfo.message}") - self.post_message(Notification( - channel=channel, - title=f"{mediainfo.title_year}{meta.season_episode} 入库失败！", - text=f"原因：{transferinfo.message or '未知'}", - image=mediainfo.get_message_image(), - userid=userid - )) # 新增转移失败历史记录 - self.transferhis.add( - src=str(torrent.path), - dest=str(transferinfo.target_path) if transferinfo else None, - mode=settings.TRANSFER_TYPE, - type=mediainfo.type.value, - category=mediainfo.category, - title=mediainfo.title, - year=mediainfo.year, - tmdbid=mediainfo.tmdb_id, - imdbid=mediainfo.imdb_id, - tvdbid=mediainfo.tvdb_id, - doubanid=mediainfo.douban_id, - seasons=meta.season, - episodes=meta.episode, - image=mediainfo.get_poster_image(), + self.__insert_fail_history( + src_path=torrent.path, download_hash=torrent.hash, - status=0, - errmsg=transferinfo.message if transferinfo else '未知错误', - files=json.dumps(transferinfo.file_list) if transferinfo else None + meta=meta, + mediainfo=mediainfo, + transferinfo=transferinfo ) + # 发送消息 + self.post_message(Notification( + title=f"{mediainfo.title_year} {meta.season_episode} 入库失败！", + text=f"原因：{transferinfo.message or '未知'}", + image=mediainfo.get_message_image() + )) # 设置种子状态，避免一直报错 self.transfer_completed(hashs=torrent.hash, transinfo=transferinfo) continue + # 新增转移成功历史记录 - self.transferhis.add( - src=str(torrent.path), - dest=str(transferinfo.target_path), - mode=settings.TRANSFER_TYPE, - type=mediainfo.type.value, - category=mediainfo.category, - title=mediainfo.title, - year=mediainfo.year, - tmdbid=mediainfo.tmdb_id, - imdbid=mediainfo.imdb_id, - tvdbid=mediainfo.tvdb_id, - doubanid=mediainfo.douban_id, - seasons=meta.season, - episodes=meta.episode, - image=mediainfo.get_poster_image(), + self.__insert_sucess_history( + src_path=torrent.path, download_hash=torrent.hash, - status=1, - files=json.dumps(transferinfo.file_list) + meta=meta, + mediainfo=mediainfo, + transferinfo=transferinfo ) # 转移完成 self.transfer_completed(hashs=torrent.hash, transinfo=transferinfo) @@ -240,6 +169,45 @@ class TransferChain(ChainBase): logger.info("下载器文件转移执行完成") return True + def remote_transfer(self, arg_str: str, channel: MessageChannel, userid: Union[str, int] = None): + """ + 远程重新转移，参数 历史记录ID TMDBID|类型 + """ + def args_error(): + self.post_message(Notification(channel=channel, + title="请输入正确的命令格式：/redo [id] [tmdbid]|[类型]，" + "[id]历史记录编号", userid=userid)) + + if not arg_str: + args_error() + return + arg_strs = str(arg_str).split() + if len(arg_strs) != 2: + args_error() + return + # 历史记录ID + logid = arg_strs[0] + if not logid.isdigit(): + args_error() + return + # TMDB ID + tmdb_strs = arg_strs[1].split('|') + tmdbid = tmdb_strs[0] + if not logid.isdigit(): + args_error() + return + # 类型 + type_str = tmdb_strs[1] if len(tmdb_strs) > 1 else None + if not type_str or type_str not in [MediaType.MOVIE.value, MediaType.TV.value]: + args_error() + return + state, errmsg = self.re_transfer(logid=int(logid), + mtype=MediaType(type_str), tmdbid=int(tmdbid)) + if not state: + self.post_message(Notification(channel=channel, title="手动整理失败", + text=errmsg, userid=userid)) + return + def re_transfer(self, logid: int, mtype: MediaType, tmdbid: int) -> Tuple[bool, str]: """ 根据历史记录，重新识别转移 @@ -257,17 +225,130 @@ class TransferChain(ChainBase): torrents: Optional[List[TransferTorrent]] = self.list_torrents(hashs=history.download_hash) if not torrents: return False, f"没有获取到种子，hash：{history.download_hash}" + # 源目录 + src_path = Path(torrents[0].path) else: # 没有下载记录，按源目录路径重新转移 src_path = Path(history.src) if not src_path.exists(): return False, f"源目录不存在：{src_path}" - meta = MetaInfo(title=src_path.stem) - if not meta.name: - return False, f"未识别到元数据，标题：{src_path.stem}" + # 识别元数据 + meta = MetaInfo(title=src_path.stem) + if not meta.name: + return False, f"未识别到元数据，标题：{src_path.stem}" # 查询媒体信息 mediainfo = self.recognize_media(mtype=mtype, tmdbid=tmdbid) - # TODO 重新执行转移 + if not mediainfo: + return False, f"未识别到媒体信息，类型：{mtype.value}，tmdbid：{tmdbid}" + # 重新执行转移 + logger.info(f"{mtype.value} {tmdbid} 识别为：{mediainfo.title_year}") + # 更新媒体图片 + self.obtain_images(mediainfo=mediainfo) + + # 转移 + transferinfo: TransferInfo = self.transfer(mediainfo=mediainfo, + path=src_path, + transfer_type=settings.TRANSFER_TYPE) + if not transferinfo: + logger.error("文件转移模块运行失败") + return False, "文件转移模块运行失败" + if not transferinfo.target_path: + # 转移失败 + logger.warn(f"{src_path.name} 入库失败：{transferinfo.message}") + # 新增转移失败历史记录 + self.__insert_fail_history( + src_path=src_path, + download_hash=history.download_hash, + meta=meta, + mediainfo=mediainfo, + transferinfo=transferinfo + ) + return False, transferinfo.message + + # 新增转移成功历史记录 + self.__insert_sucess_history( + src_path=src_path, + download_hash=history.download_hash, + meta=meta, + mediainfo=mediainfo, + transferinfo=transferinfo + ) + # 刮削元数据 + self.scrape_metadata(path=transferinfo.target_path, mediainfo=mediainfo) + # 刷新媒体库 + self.refresh_mediaserver(mediainfo=mediainfo, file_path=transferinfo.target_path) + # 发送通知 + self.send_transfer_message(meta=meta, mediainfo=mediainfo, transferinfo=transferinfo) + # 广播事件 + self.eventmanager.send_event(EventType.TransferComplete, { + 'meta': meta, + 'mediainfo': mediainfo, + 'transferinfo': transferinfo + }) + return True, "" + + def __insert_sucess_history(self, src_path: Path, download_hash: str, meta: MetaBase, + mediainfo: MediaInfo, transferinfo: TransferInfo): + """ + 新增转移成功历史记录 + """ + self.transferhis.add( + src=str(src_path), + dest=str(transferinfo.target_path), + mode=settings.TRANSFER_TYPE, + type=mediainfo.type.value, + category=mediainfo.category, + title=mediainfo.title, + year=mediainfo.year, + tmdbid=mediainfo.tmdb_id, + imdbid=mediainfo.imdb_id, + tvdbid=mediainfo.tvdb_id, + doubanid=mediainfo.douban_id, + seasons=meta.season, + episodes=meta.episode, + image=mediainfo.get_poster_image(), + download_hash=download_hash, + status=1, + files=json.dumps(transferinfo.file_list) + ) + + def __insert_fail_history(self, src_path: Path, download_hash: str, meta: MetaBase, + transferinfo: TransferInfo = None, mediainfo: MediaInfo = None): + """ + 新增转移失败历史记录 + """ + if mediainfo and transferinfo: + his = self.transferhis.add( + src=str(src_path), + dest=str(transferinfo.target_path), + mode=settings.TRANSFER_TYPE, + type=mediainfo.type.value, + category=mediainfo.category, + title=mediainfo.title, + year=mediainfo.year, + tmdbid=mediainfo.tmdb_id, + imdbid=mediainfo.imdb_id, + tvdbid=mediainfo.tvdb_id, + doubanid=mediainfo.douban_id, + seasons=meta.season, + episodes=meta.episode, + image=mediainfo.get_poster_image(), + download_hash=download_hash, + status=0, + errmsg=transferinfo.message or '未知错误', + files=json.dumps(transferinfo.file_list) + ) + else: + his = self.transferhis.add( + src=str(src_path), + mode=settings.TRANSFER_TYPE, + seasons=meta.season, + episodes=meta.episode, + download_hash=download_hash, + status=0, + errmsg="未识别到媒体信息" + ) + return his def send_transfer_message(self, meta: MetaBase, mediainfo: MediaInfo, transferinfo: TransferInfo): """ diff --git a/app/command.py b/app/command.py index 61067bec..fa4e4586 100644 --- a/app/command.py +++ b/app/command.py @@ -103,6 +103,11 @@ class Command(metaclass=Singleton): "func": TransferChain().process, "description": "下载文件整理", "data": {} + }, + "/redo": { + "func": TransferChain().remote_transfer, + "description": "手动整理", + "data": {} } } # 汇总插件命令