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

Merge pull request #819 from thsrite/main

Browse Source
This commit is contained in:
jxxghp 2023-10-13 11:52:33 +08:00 committed by GitHub
commit b6c3c03748
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 105 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
app/plugins/mediasyncdel/__init__.py
View File

@ -1013,40 +1013,42 @@ class MediaSyncDel(_PluginBase):
if not isinstance(torrents, list): if not isinstance(torrents, list):
torrents = [torrents] torrents = [torrents]
# 删除辅种历史中与本下载器相同的辅种记录 # 删除辅种历史
if str(downloader) == str(download): for torrent in torrents:
for torrent in torrents: handle_cnt += 1
handle_cnt += 1 if str(download) == "qbittorrent":
if str(download) == "qbittorrent": # 删除辅种
# 删除辅种 if action_flag == "del":
if action_flag == "del": logger.info(f"删除辅种：{downloader} - {torrent}")
logger.info(f"删除辅种：{downloader} - {torrent}") self.qb.delete_torrents(delete_file=True,
self.qb.delete_torrents(delete_file=True, ids=torrent)
ids=torrent) # 暂停辅种
# 暂停辅种 if action_flag == "stop":
if action_flag == "stop": self.qb.stop_torrents(torrent)
self.qb.stop_torrents(torrent) logger.info(f"辅种：{downloader} - {torrent} 暂停")
logger.info(f"辅种：{downloader} - {torrent} 暂停") else:
else: # 删除辅种
# 删除辅种 if action_flag == "del":
if action_flag == "del": logger.info(f"删除辅种：{downloader} - {torrent}")
logger.info(f"删除辅种：{downloader} - {torrent}") self.tr.delete_torrents(delete_file=True,
self.tr.delete_torrents(delete_file=True, ids=torrent)
ids=torrent) # 暂停辅种
# 暂停辅种 if action_flag == "stop":
if action_flag == "stop": self.tr.stop_torrents(torrent)
self.tr.stop_torrents(torrent) logger.info(f"辅种：{downloader} - {torrent} 暂停")
logger.info(f"辅种：{downloader} - {torrent} 暂停") # 删除本下载器辅种历史
# 删除本下载器辅种历史 if action_flag == "del":
if action_flag == "del": del history
del history break
break
# 更新辅种历史 # 更新辅种历史
self.save_data(key=history_key, if seed_history:
value=seed_history, self.save_data(key=history_key,
plugin_id=plugin_id) value=seed_history,
plugin_id=plugin_id)
else:
self.del_data(key=history_key,
plugin_id=plugin_id)
return handle_cnt return handle_cnt
@staticmethod @staticmethod
@ -1276,8 +1278,6 @@ class MediaSyncDel(_PluginBase):
""" """
下载文件删除处理事件 下载文件删除处理事件
""" """
if not self._enabled:
return
if not event: if not event:
return return
event_data = event.event_data event_data = event.event_data

106
app/plugins/nastoolsync/__init__.py
View File

@ -139,43 +139,61 @@ class NAStoolSync(_PluginBase):
plugin_key = history[2] plugin_key = history[2]
plugin_value = history[3] plugin_value = history[3]
# 处理下载器映射 # 替换转种记录
if self._downloader: if str(plugin_id) == "TorrentTransfer":
downloaders = self._downloader.split("\n") keys = str(plugin_key).split("-")
for downloader in downloaders:
if not downloader:
continue
sub_downloaders = downloader.split(":")
if not str(sub_downloaders[0]).isdigit():
logger.error(f"下载器映射配置错误：NAStool下载器id 应为数字！")
continue
# 替换转种记录
if str(plugin_id) == "TorrentTransfer":
keys = str(plugin_key).split("-")
if keys[0].isdigit() and int(keys[0]) == int(sub_downloaders[0]):
# 替换key
plugin_key = plugin_key.replace(keys[0], sub_downloaders[1])
# 替换value # 1-2cd5d6fe32dca4e39a3e9f10961bfbdb00437e91
if isinstance(plugin_value, str): if len(keys) == 2 and keys[0].isdigit():
_value: dict = json.loads(plugin_value) mp_downloader = self.__get_target_downloader(int(keys[0]))
elif isinstance(plugin_value, dict): # 替换key
if str(plugin_value.get("to_download")).isdigit() and int( plugin_key = mp_downloader + "-" + keys[1]
plugin_value.get("to_download")) == int(sub_downloaders[0]):
plugin_value["to_download"] = sub_downloaders[1]
# 替换辅种记录 # 替换value
if str(plugin_id) == "IYUUAutoSeed": """
if isinstance(plugin_value, str): {
plugin_value: list = json.loads(plugin_value) "to_download":2,
if not isinstance(plugin_value, list): "to_download_id":"2cd5d6fe32dca4e39a3e9f10961bfbdb00437e91",
plugin_value = [plugin_value] "delete_source":true
for value in plugin_value: }
if not str(value.get("downloader")).isdigit(): """
continue if isinstance(plugin_value, str):
if str(value.get("downloader")).isdigit() and int(value.get("downloader")) == int( plugin_value: dict = json.loads(plugin_value)
sub_downloaders[0]): if isinstance(plugin_value, dict):
value["downloader"] = sub_downloaders[1] if str(plugin_value.get("to_download")).isdigit():
to_downloader = self.__get_target_downloader(int(plugin_value.get("to_download")))
plugin_value["to_download"] = to_downloader
# 替换辅种记录
elif str(plugin_id) == "IYUUAutoSeed":
"""
[
{
"downloader":"2",
"torrents":[
"a18aa62abab42613edba15e7dbad0d729d8500da",
"e494f372316bbfd8572da80138a6ef4c491d5991",
"cc2bbc1e654d8fc0f83297f6cd36a38805aa2864",
"68aec0db3aa7fe28a887e5e41a0d0d5bc284910f",
"f02962474287e11441e34e40b8326ddf28d034f6"
]
},
{
"downloader":"2",
"torrents":[
"4f042003ce90519e1aadd02b76f51c0c0711adb3"
]
}
]
"""
if isinstance(plugin_value, str):
plugin_value: list = json.loads(plugin_value)
if not isinstance(plugin_value, list):
plugin_value = [plugin_value]
for value in plugin_value:
if str(value.get("downloader")).isdigit():
downloader = self.__get_target_downloader(int(value.get("downloader")))
value["downloader"] = downloader
self._plugindata.save(plugin_id=plugin_id, self._plugindata.save(plugin_id=plugin_id,
key=plugin_key, key=plugin_key,
@ -189,6 +207,24 @@ class NAStoolSync(_PluginBase):
logger.info(f"插件记录已同步完成。总耗时 {(end_time - start_time).seconds} 秒") logger.info(f"插件记录已同步完成。总耗时 {(end_time - start_time).seconds} 秒")
def __get_target_downloader(self, download_id: int):
"""
获取NAStool下载器id对应的Moviepilot下载器
"""
# 处理下载器映射
if self._downloader:
downloaders = self._downloader.split("\n")
for downloader in downloaders:
if not downloader:
continue
sub_downloaders = downloader.split(":")
if not str(sub_downloaders[0]).isdigit():
logger.error(f"下载器映射配置错误：NAStool下载器id 应为数字！")
continue
if int(sub_downloaders[0]) == download_id:
return str(sub_downloaders[1])
return download_id
def sync_download_history(self, download_history): def sync_download_history(self, download_history):
""" """
导入下载记录 导入下载记录