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

fix

Browse Source
This commit is contained in:
jxxghp
2023-06-13 07:14:29 +08:00
parent 5a4c6c8a74
commit 99440d18d2
6 changed files with 44 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/chain/__init__.py
View File

@ -106,14 +106,11 @@ class ChainBase(AbstractSingleton, metaclass=Singleton):
def list_torrents(self, status: TorrentStatus = None, hashs: Union[list, str] = None) -> Optional[List[dict]]:
return self.run_module("list_torrents", status=status, hashs=hashs)
def remove_torrents(self, hashs: Union[str, list]) -> bool:
return self.run_module("remove_torrents", hashs=hashs)
def transfer(self, path: str, mediainfo: MediaInfo) -> Optional[dict]:
return self.run_module("transfer", path=path, mediainfo=mediainfo)
def transfer_completed(self, hashs: Union[str, list]) -> bool:
return self.run_module("transfer_completed", hashs=hashs)
def transfer_completed(self, hashs: Union[str, list], transinfo: dict) -> None:
return self.run_module("transfer_completed", hashs=hashs, transinfo=transinfo)
def media_exists(self, mediainfo: MediaInfo) -> Optional[dict]:
return self.run_module("media_exists", mediainfo=mediainfo)
@ -121,8 +118,8 @@ class ChainBase(AbstractSingleton, metaclass=Singleton):
def refresh_mediaserver(self, mediainfo: MediaInfo, file_path: str) -> Optional[bool]:
return self.run_module("refresh_mediaserver", mediainfo=mediainfo, file_path=file_path)
def post_message(self, title: str,
text: str = None, image: str = None, userid: Union[str, int] = None) -> Optional[bool]:
def post_message(self, title: str, text: str = None,
image: str = None, userid: Union[str, int] = None) -> Optional[bool]:
return self.run_module("post_message", title=title, text=text, image=image, userid=userid)
def post_medias_message(self, title: str, items: List[MediaInfo],
@ -138,5 +135,5 @@ class ChainBase(AbstractSingleton, metaclass=Singleton):
def scrape_metadata(self, path: Path, mediainfo: MediaInfo) -> None:
return self.run_module("scrape_metadata", path=path, mediainfo=mediainfo)
def register_commands(self, commands: dict):
def register_commands(self, commands: dict) -> None:
return self.run_module("register_commands", commands=commands)

7
app/chain/transfer.py
View File

@ -104,14 +104,9 @@ class TransferChain(ChainBase):
),
continue
# 转移完成
self.transfer_completed(hashs=torrent.get("hash"))
self.transfer_completed(hashs=torrent.get("hash"), transinfo=transferinfo)
# 刮剥
self.scrape_metadata(path=transferinfo.get('target_path'), mediainfo=mediainfo)
# 移动模式删除种子
if settings.TRANSFER_TYPE == "move":
result2 = self.remove_torrents(hashs=torrent.get("hash"))
if result2:
logger.info(f"移动模式删除种子成功：{torrent.get('title')} ")
# 刷新媒体库
self.refresh_mediaserver(mediainfo=mediainfo, file_path=transferinfo.get('target_path'))
# 发送通知