mirror of
https://github.com/thsrite/MoviePilot-Plugins.git
synced 2026-05-18 07:26:44 +00:00
Merge remote-tracking branch 'origin/main'
This commit is contained in:
thsrite
@@ -116,12 +116,13 @@
|
||||
"name": "插件更新管理",
|
||||
"description": "监测已安装插件，推送更新提醒，可配置自动更新。",
|
||||
"labels": "自动更新,插件管理",
|
||||
"version": "1.9.2",
|
||||
"version": "2.0",
|
||||
"icon": "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/pluginupdate.png",
|
||||
"author": "thsrite",
|
||||
"level": 1,
|
||||
"v2": true,
|
||||
"history": {
|
||||
"v2.0": "修复插件显示版本问题",
|
||||
"v1.9.2": "修复获取本地插件版本None，重新更新问题",
|
||||
"v1.9.1": "修复bug",
|
||||
"v1.9": "过滤相同ID插件，保留最新版本检查更新",
|
||||
@@ -140,12 +141,13 @@
|
||||
"name": "插件强制重装",
|
||||
"description": "卸载当前插件，强制重装。",
|
||||
"labels": "插件管理",
|
||||
"version": "1.7",
|
||||
"version": "1.8",
|
||||
"icon": "refresh.png",
|
||||
"author": "thsrite",
|
||||
"level": 1,
|
||||
"v2": true,
|
||||
"history": {
|
||||
"v1.8": "修复插件显示版本问题",
|
||||
"v1.7": "使用主程序GITHUB_PROXY代理",
|
||||
"v1.6": "插件API立即生效",
|
||||
"v1.5": "支持插件热重载",
|
||||
@@ -218,11 +220,12 @@
|
||||
"name": "Emby观影报告",
|
||||
"description": "推送Emby观影报告，需Emby安装Playback Report 插件。",
|
||||
"labels": "Emby",
|
||||
"version": "1.9",
|
||||
"version": "1.9.1",
|
||||
"icon": "Pydiocells_A.png",
|
||||
"author": "thsrite",
|
||||
"level": 1,
|
||||
"history": {
|
||||
"v1.9.1": "修复媒体库黑名单设置",
|
||||
"v1.9": "支持媒体库黑名单设置",
|
||||
"v1.8": "推送微信增加时间戳，防止使用缓存",
|
||||
"v1.7": "分块发送，兼容微信推送",
|
||||
|
||||
@@ -3,11 +3,12 @@
|
||||
"name": "Emby元数据刷新",
|
||||
"description": "定时刷新Emby媒体库元数据，演职人员中文。",
|
||||
"labels": "Emby",
|
||||
"version": "2.1.1",
|
||||
"version": "2.1.2",
|
||||
"icon": "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/emby-icon.png",
|
||||
"author": "thsrite",
|
||||
"level": 1,
|
||||
"history": {
|
||||
"v2.1.2": "增加自定义延迟",
|
||||
"v2.1.1": "优化刷新逻辑，过滤掉信息全的媒体",
|
||||
"v2.0.1": "获取tmdb图片时使用PROXY_HOST代理",
|
||||
"v2.0": "适配v2",
|
||||
@@ -44,11 +45,12 @@
|
||||
"name": "Emby观影报告",
|
||||
"description": "推送Emby观影报告，需Emby安装Playback Report 插件。",
|
||||
"labels": "Emby",
|
||||
"version": "2.1",
|
||||
"version": "2.1.1",
|
||||
"icon": "Pydiocells_A.png",
|
||||
"author": "thsrite",
|
||||
"level": 1,
|
||||
"history": {
|
||||
"v2.1.1": "修复媒体库黑名单设置",
|
||||
"v2.1": "支持媒体库黑名单设置",
|
||||
"v2.0": "修复获取媒体服务器配置",
|
||||
"v1.9": "适配v2多媒体服务器",
|
||||
@@ -95,11 +97,12 @@
|
||||
"name": "Emby弹幕下载",
|
||||
"description": "通知Emby Danmu插件下载弹幕。",
|
||||
"labels": "Emby,媒体库",
|
||||
"version": "1.5.1",
|
||||
"version": "1.6",
|
||||
"icon": "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/danmu.png",
|
||||
"author": "thsrite",
|
||||
"level": 1,
|
||||
"history": {
|
||||
"v1.6": "增加Emby、MoviePilot目录映射（相同可不填）",
|
||||
"v1.5.1": "Emby4.8.8 Items API修改",
|
||||
"v1.5": "修复获取弹幕源",
|
||||
"v1.4": "修复自定义参数",
|
||||
@@ -195,11 +198,12 @@
|
||||
"name": "媒体文件同步删除",
|
||||
"description": "同步删除历史记录、源文件和下载任务。",
|
||||
"labels": "媒体库，文件整理",
|
||||
"version": "1.8.3",
|
||||
"version": "1.8.4",
|
||||
"icon": "mediasyncdel.png",
|
||||
"author": "thsrite",
|
||||
"level": 1,
|
||||
"history": {
|
||||
"v1.8.4": "修复暂停种子失败",
|
||||
"v1.8.3": "修复源文件删除",
|
||||
"v1.8.1": "适配v2多媒体服务器，移除日志方式",
|
||||
"v1.7": "修复重新整理被一并删除问题",
|
||||
@@ -308,11 +312,12 @@
|
||||
"name": "订阅规则自动填充",
|
||||
"description": "电视剧下载后自动添加官组等信息到订阅；添加订阅后根据二级分类名称自定义订阅规则。",
|
||||
"labels": "订阅",
|
||||
"version": "2.8",
|
||||
"version": "2.8.1",
|
||||
"icon": "teamwork.png",
|
||||
"author": "thsrite",
|
||||
"level": 2,
|
||||
"history": {
|
||||
"v2.8.1": "修复种子下载自定义填充站点后订阅无法打开问题",
|
||||
"v2.8": "兼容v2",
|
||||
"v2.7": "下载填充判断当前站点是否在已选订阅站点范围内",
|
||||
"v2.6": "兼容属性值包含:号",
|
||||
@@ -365,11 +370,12 @@
|
||||
"name": "自动备份",
|
||||
"description": "自动备份数据和配置文件。",
|
||||
"labels": "系统设置",
|
||||
"version": "2.0",
|
||||
"version": "2.0.1",
|
||||
"icon": "Time_machine_B.png",
|
||||
"author": "thsrite",
|
||||
"level": 1,
|
||||
"history": {
|
||||
"v2.0.1": "修复cookies文件夹备份失败",
|
||||
"v2.0": "支持备份app.env及cookies,支持自定义保存路径",
|
||||
"v1.3": "去除已废弃的环境变量引用",
|
||||
"v1.2": "增强API安全性"
|
||||
|
||||
@@ -25,7 +25,7 @@ class AutoBackup(_PluginBase):
|
||||
# 插件图标
|
||||
plugin_icon = "Time_machine_B.png"
|
||||
# 插件版本
|
||||
plugin_version = "2.0"
|
||||
plugin_version = "2.0.1"
|
||||
# 插件作者
|
||||
plugin_author = "thsrite"
|
||||
# 作者主页
|
||||
@@ -169,7 +169,7 @@ class AutoBackup(_PluginBase):
|
||||
shutil.copy(app_file, backup_path)
|
||||
cookies_path = config_path / "cookies"
|
||||
if cookies_path.exists():
|
||||
shutil.copytree(cookies_path, backup_path)
|
||||
shutil.copytree(cookies_path, f'{backup_path}/cookies')
|
||||
|
||||
zip_file = str(backup_path) + '.zip'
|
||||
if os.path.exists(zip_file):
|
||||
|
||||
@@ -20,7 +20,7 @@ class EmbyDanmu(_PluginBase):
|
||||
# 插件图标
|
||||
plugin_icon = "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/danmu.png"
|
||||
# 插件版本
|
||||
plugin_version = "1.5.1"
|
||||
plugin_version = "1.6"
|
||||
# 插件作者
|
||||
plugin_author = "thsrite"
|
||||
# 作者主页
|
||||
@@ -37,11 +37,13 @@ class EmbyDanmu(_PluginBase):
|
||||
_library_task = {}
|
||||
_danmu_source = []
|
||||
_mediaservers = None
|
||||
_dirs = None
|
||||
|
||||
mediaserver_helper = None
|
||||
_EMBY_HOST = None
|
||||
_EMBY_USER = None
|
||||
_EMBY_APIKEY = None
|
||||
_paths = {}
|
||||
|
||||
def init_plugin(self, config: dict = None):
|
||||
self._library_task = {}
|
||||
@@ -50,8 +52,13 @@ class EmbyDanmu(_PluginBase):
|
||||
# 读取配置
|
||||
if config:
|
||||
self._enabled = config.get("enabled")
|
||||
self._dirs = config.get("dirs")
|
||||
self._mediaservers = config.get("mediaservers") or []
|
||||
|
||||
if self._dirs:
|
||||
for path in str(self._dirs).split("\n"):
|
||||
self._paths[path.split(":")[0]] = path.split(":")[1]
|
||||
|
||||
@eventmanager.register(EventType.PluginAction)
|
||||
def danmu(self, event: Event = None):
|
||||
if not self._enabled:
|
||||
@@ -161,7 +168,7 @@ class EmbyDanmu(_PluginBase):
|
||||
|
||||
try:
|
||||
# 获取媒体库媒体列表
|
||||
library_items = self.__get_items(library_id)
|
||||
library_items = self.__get_items(library_id, nameStartsWith=library_item_name)
|
||||
if not library_items:
|
||||
logger.error(f"{emby_name} 获取媒体库：{library_name}的媒体列表失败")
|
||||
self.post_message(channel=event.event_data.get("channel"),
|
||||
@@ -171,6 +178,8 @@ class EmbyDanmu(_PluginBase):
|
||||
found_item = False
|
||||
# 遍历媒体列表，获取媒体的ID和名称
|
||||
for item in library_items:
|
||||
logger.debug(
|
||||
f"服务器：{emby_name} 媒体库：{library_name} 媒体库类型：{library_type} 媒体：{item}")
|
||||
if library_type == "tvshows":
|
||||
if item.get("Name") == library_item_name:
|
||||
found_item = True
|
||||
@@ -341,77 +350,69 @@ class EmbyDanmu(_PluginBase):
|
||||
userid=event.event_data.get("user"))
|
||||
else:
|
||||
# 电影弹幕
|
||||
matches = re.findall(r'^(.+?)\s\(\d{4}\)', item.get("Name"), re.MULTILINE)
|
||||
matches = re.findall(r'^(.*?)(?= ?\(\d{4}\)?|$)', item.get("Name"), re.MULTILINE)
|
||||
if matches and str(matches[0]) == library_item_name:
|
||||
logger.info(f"{emby_name} 开始检查电影：{library_name} {library_item_name}")
|
||||
found_item = True
|
||||
movie_id = item.get("Id")
|
||||
movie_items = self.__get_items(movie_id)
|
||||
if not movie_items:
|
||||
logger.error(
|
||||
f"{emby_name} 获取 {library_name} {item.get('Name')}的媒体列表失败")
|
||||
# 获取媒体详情
|
||||
item_info = self.__get_item_info(movie_id)
|
||||
item_path = item_info.get("Path")
|
||||
parent_path = Path(self.__get_path(str(Path(item_path).parent)))
|
||||
logger.info(f"{emby_name} 开始检查MoviePilot路径 {parent_path} 下是是否有弹幕文件")
|
||||
# 检查是否有弹幕文件
|
||||
danmu_path_pattern = Path(item_path).stem + "*.xml"
|
||||
|
||||
if len(list(parent_path.glob(danmu_path_pattern))) >= 1:
|
||||
logger.info(
|
||||
f"{emby_name} {parent_path} 下已存在弹幕文件：{danmu_path_pattern}")
|
||||
self.post_message(channel=event.event_data.get("channel"),
|
||||
title=f"{emby_name} 获取电影：{library_name} {item.get('Name')}的媒体列表失败",
|
||||
title=f"{emby_name} {library_name} {item.get('Name')} 弹幕已存在",
|
||||
userid=event.event_data.get("user"))
|
||||
else:
|
||||
movie_id = movie_items[0].get("Id")
|
||||
# 获取媒体详情
|
||||
item_info = self.__get_item_info(movie_id)
|
||||
item_path = item_info.get("Path")
|
||||
parent_path = Path(item_path).parent
|
||||
logger.info(f"{emby_name} 开始检查路径 {parent_path} 下是是否有弹幕文件")
|
||||
# 检查是否有弹幕文件
|
||||
danmu_path_pattern = Path(item_path).stem + "*.xml"
|
||||
|
||||
if len(list(parent_path.glob(danmu_path_pattern))) >= 1:
|
||||
# 通知Danmu插件获取弹幕
|
||||
danmu_flag = self.__download_danmu(movie_id)
|
||||
if danmu_flag:
|
||||
logger.info(
|
||||
f"{emby_name} {parent_path} 下已存在弹幕文件：{danmu_path_pattern}")
|
||||
f"{emby_name} 已通知弹幕插件获取 {library_name} {item.get('Name')} {movie_id} 的弹幕")
|
||||
self.post_message(channel=event.event_data.get("channel"),
|
||||
title=f"{emby_name} {library_name} {item.get('Name')} 弹幕已存在",
|
||||
title=f"{emby_name} 开始通知Emby下载 {library_name} {item.get('Name')} 弹幕，异步执行，请耐心等候执行完成消息",
|
||||
userid=event.event_data.get("user"))
|
||||
else:
|
||||
# 通知Danmu插件获取弹幕
|
||||
danmu_flag = self.__download_danmu(movie_id)
|
||||
if danmu_flag:
|
||||
logger.info(
|
||||
f"{emby_name} 已通知弹幕插件获取 {library_name} {item.get('Name')} {movie_id} 的弹幕")
|
||||
self.post_message(channel=event.event_data.get("channel"),
|
||||
title=f"{emby_name} 开始通知Emby下载 {library_name} {item.get('Name')} 弹幕，异步执行，请耐心等候执行完成消息",
|
||||
userid=event.event_data.get("user"))
|
||||
retry_cnt = 3
|
||||
while len(
|
||||
list(parent_path.glob(
|
||||
danmu_path_pattern))) == 0 and retry_cnt > 0:
|
||||
# 解析日志判断是否全部失败
|
||||
if self.__check_all_failed_by_log(item_name=item_info.get("Name"),
|
||||
item_year=item_info.get(
|
||||
"ProductionYear")):
|
||||
logger.error(
|
||||
f"{emby_name} 解析日志判断已配置弹幕源全部匹配弹幕失败")
|
||||
retry_cnt = -1
|
||||
else:
|
||||
retry_cnt -= 1
|
||||
logger.warn(
|
||||
f"{emby_name} {parent_path} 下未找到弹幕文件：{danmu_path_pattern}，等待60秒后重试 ({retry_cnt}次)")
|
||||
time.sleep(60)
|
||||
|
||||
if len(list(parent_path.glob(danmu_path_pattern))) >= 1:
|
||||
logger.info(
|
||||
f"{emby_name} {parent_path} 下已找到弹幕文件：{danmu_path_pattern}")
|
||||
self.post_message(channel=event.event_data.get("channel"),
|
||||
title=f"{emby_name} {library_name} {item.get('Name')} 下载弹幕文件成功",
|
||||
userid=event.event_data.get("user"))
|
||||
else:
|
||||
retry_cnt = 3
|
||||
while len(
|
||||
list(parent_path.glob(
|
||||
danmu_path_pattern))) == 0 and retry_cnt > 0:
|
||||
# 解析日志判断是否全部失败
|
||||
if self.__check_all_failed_by_log(item_name=item_info.get("Name"),
|
||||
item_year=item_info.get(
|
||||
"ProductionYear")):
|
||||
logger.error(
|
||||
f"{emby_name} {parent_path} 下未找到弹幕文件：{danmu_path_pattern}")
|
||||
self.post_message(channel=event.event_data.get("channel"),
|
||||
title=f"{emby_name} {library_name} {item.get('Name')} 已配置弹幕源全部匹配弹幕失败",
|
||||
userid=event.event_data.get("user"))
|
||||
f"{emby_name} 解析日志判断已配置弹幕源全部匹配弹幕失败")
|
||||
retry_cnt = -1
|
||||
else:
|
||||
retry_cnt -= 1
|
||||
logger.warn(
|
||||
f"{emby_name} {parent_path} 下未找到弹幕文件：{danmu_path_pattern}，等待60秒后重试 ({retry_cnt}次)")
|
||||
time.sleep(60)
|
||||
|
||||
if len(list(parent_path.glob(danmu_path_pattern))) >= 1:
|
||||
logger.info(
|
||||
f"{emby_name} {parent_path} 下已找到弹幕文件：{danmu_path_pattern}")
|
||||
self.post_message(channel=event.event_data.get("channel"),
|
||||
title=f"{emby_name} {library_name} {item.get('Name')} 下载弹幕文件成功",
|
||||
userid=event.event_data.get("user"))
|
||||
else:
|
||||
logger.error(
|
||||
f"{emby_name} 通知弹幕插件获取 {library_name} {item.get('Name')} {movie_id} 的弹幕失败")
|
||||
f"{emby_name} {parent_path} 下未找到弹幕文件：{danmu_path_pattern}")
|
||||
self.post_message(channel=event.event_data.get("channel"),
|
||||
title=f"{emby_name} 通知弹幕插件获取 {library_name} 电影 {item.get('Name')} {movie_id} 的弹幕失败",
|
||||
title=f"{emby_name} {library_name} {item.get('Name')} 已配置弹幕源全部匹配弹幕失败",
|
||||
userid=event.event_data.get("user"))
|
||||
else:
|
||||
logger.error(
|
||||
f"{emby_name} 通知弹幕插件获取 {library_name} {item.get('Name')} {movie_id} 的弹幕失败")
|
||||
self.post_message(channel=event.event_data.get("channel"),
|
||||
title=f"{emby_name} 通知弹幕插件获取 {library_name} 电影 {item.get('Name')} {movie_id} 的弹幕失败",
|
||||
userid=event.event_data.get("user"))
|
||||
if not found_item:
|
||||
logger.error(
|
||||
f"{emby_name} 未找到媒体：{library_name} {library_item_name} {f'第{library_item_season}季 ' if library_item_season else ''}")
|
||||
@@ -462,6 +463,17 @@ class EmbyDanmu(_PluginBase):
|
||||
logger.error(f"连接媒体库emby/Library/VirtualFolders/Query出错：" + str(e))
|
||||
return []
|
||||
|
||||
def __get_path(self, file_path: str):
|
||||
"""
|
||||
路径转换
|
||||
"""
|
||||
if self._paths and self._paths.keys():
|
||||
for library_path in self._paths.keys():
|
||||
if str(file_path).startswith(str(library_path)):
|
||||
return str(file_path).replace(str(library_path), str(self._paths.get(str(library_path))))
|
||||
# 未匹配到路径，返回原路径
|
||||
return file_path
|
||||
|
||||
def __update_library(self, library_id, library_options) -> bool:
|
||||
"""
|
||||
获取媒体库信息
|
||||
@@ -480,14 +492,19 @@ class EmbyDanmu(_PluginBase):
|
||||
return True
|
||||
return False
|
||||
|
||||
def __get_items(self, parent_id) -> list:
|
||||
def __get_items(self, parent_id, nameStartsWith=None) -> list:
|
||||
"""
|
||||
获取媒体库媒体列表
|
||||
"""
|
||||
if not self._EMBY_HOST or not self._EMBY_APIKEY:
|
||||
return []
|
||||
req_url = f"%semby/Users/%s/Items?ParentId=%s&api_key=%s" % (
|
||||
self._EMBY_HOST, self._EMBY_USER, parent_id, self._EMBY_APIKEY)
|
||||
if nameStartsWith:
|
||||
req_url = f"%semby/Users/%s/Items?ParentId=%s&api_key=%s&NameStartsWith=%s" % (
|
||||
self._EMBY_HOST, self._EMBY_USER, parent_id, self._EMBY_APIKEY, nameStartsWith)
|
||||
else:
|
||||
req_url = f"%semby/Users/%s/Items?ParentId=%s&api_key=%s" % (
|
||||
self._EMBY_HOST, self._EMBY_USER, parent_id, self._EMBY_APIKEY)
|
||||
logger.debug(f"开始获取媒体列表：{req_url}")
|
||||
try:
|
||||
with RequestUtils().get_res(req_url) as res:
|
||||
if res:
|
||||
@@ -497,21 +514,25 @@ class EmbyDanmu(_PluginBase):
|
||||
else:
|
||||
return res.json().get("Items")
|
||||
else:
|
||||
logger.info(f"获取媒体库媒体列表失败，无法连接Emby！")
|
||||
return []
|
||||
return self.__get_items_488(parent_id)
|
||||
except Exception as e:
|
||||
logger.error(f"连接媒体库媒体列表Items出错：" + str(e))
|
||||
return []
|
||||
|
||||
def __get_items_488(self, parent_id) -> list:
|
||||
def __get_items_488(self, parent_id, nameStartsWith=None) -> list:
|
||||
"""
|
||||
获取媒体库媒体列表
|
||||
emby 4.8.8版本
|
||||
"""
|
||||
if not self._EMBY_HOST or not self._EMBY_APIKEY:
|
||||
return []
|
||||
req_url = f"%semby/Items?ParentId=%s&api_key=%s" % (
|
||||
self._EMBY_HOST, parent_id, self._EMBY_APIKEY)
|
||||
if nameStartsWith:
|
||||
req_url = f"%semby/Items?ParentId=%s&api_key=%s&NameStartsWith=%s" % (
|
||||
self._EMBY_HOST, parent_id, self._EMBY_APIKEY, nameStartsWith)
|
||||
else:
|
||||
req_url = f"%semby/Items?ParentId=%s&api_key=%s" % (
|
||||
self._EMBY_HOST, parent_id, self._EMBY_APIKEY)
|
||||
logger.debug(f"开始获取媒体列表488：{req_url}")
|
||||
try:
|
||||
with RequestUtils().get_res(req_url) as res:
|
||||
if res:
|
||||
@@ -564,7 +585,7 @@ class EmbyDanmu(_PluginBase):
|
||||
season_items = self.__get_items(season_id)
|
||||
item_info = self.__get_item_info(season_items[0].get("Id"))
|
||||
item_path = item_info.get("Path")
|
||||
parent_path = Path(item_path).parent
|
||||
parent_path = Path(self.__get_path(str(Path(item_path).parent)))
|
||||
logger.info(f"开始检查路径 {parent_path} 下是是否有弹幕文件")
|
||||
# 检查是否有弹幕文件
|
||||
danmu_path_pattern = "*.xml"
|
||||
@@ -769,6 +790,28 @@ class EmbyDanmu(_PluginBase):
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
'component': 'VRow',
|
||||
'content': [
|
||||
{
|
||||
'component': 'VCol',
|
||||
'props': {
|
||||
'cols': 12
|
||||
},
|
||||
'content': [
|
||||
{
|
||||
'component': 'VTextarea',
|
||||
'props': {
|
||||
'model': 'dirs',
|
||||
'label': '目录映射关系',
|
||||
'rows': 2,
|
||||
'placeholder': 'emby目录:mp目录（一行一个）'
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
'component': 'VRow',
|
||||
'content': [
|
||||
@@ -815,6 +858,7 @@ class EmbyDanmu(_PluginBase):
|
||||
}
|
||||
], {
|
||||
"enabled": False,
|
||||
"dirs": "",
|
||||
"mediaservers": [],
|
||||
}
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ class EmbyMetaRefresh(_PluginBase):
|
||||
# 插件图标
|
||||
plugin_icon = "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/emby-icon.png"
|
||||
# 插件版本
|
||||
plugin_version = "2.1.1"
|
||||
plugin_version = "2.1.2"
|
||||
# 插件作者
|
||||
plugin_author = "thsrite"
|
||||
# 作者主页
|
||||
@@ -62,6 +62,7 @@ class EmbyMetaRefresh(_PluginBase):
|
||||
_ReplaceAllImages = "true"
|
||||
_actor_path = None
|
||||
_mediaservers = None
|
||||
_interval = None
|
||||
mediaserver_helper = None
|
||||
_EMBY_HOST = None
|
||||
_EMBY_USER = None
|
||||
@@ -85,6 +86,7 @@ class EmbyMetaRefresh(_PluginBase):
|
||||
self._ReplaceAllMetadata = config.get("ReplaceAllMetadata") or "true"
|
||||
self._ReplaceAllImages = config.get("ReplaceAllImages") or "true"
|
||||
self._mediaservers = config.get("mediaservers") or []
|
||||
self._interval = config.get("interval") or 0
|
||||
|
||||
# 加载模块
|
||||
if self._enabled or self._onlyonce:
|
||||
@@ -174,6 +176,9 @@ class EmbyMetaRefresh(_PluginBase):
|
||||
# 刷新媒体库
|
||||
for transferinfo in transferhistorys:
|
||||
self.__refresh_emby(transferinfo, emby)
|
||||
if self._interval:
|
||||
logger.info(f"等待 {self._interval} 秒后继续刷新")
|
||||
time.sleep(self._interval)
|
||||
else:
|
||||
latest = self.__get_latest_media()
|
||||
if not latest:
|
||||
@@ -194,6 +199,9 @@ class EmbyMetaRefresh(_PluginBase):
|
||||
logger.info(
|
||||
f"开始刷新媒体库元数据，最新媒体：{'电视剧' if str(item.get('Type')) == 'Episode' else '电影'} {'%s S%02dE%02d %s' % (item.get('SeriesName'), item.get('ParentIndexNumber'), item.get('IndexNumber'), item.get('Name')) if str(item.get('Type')) == 'Episode' else item.get('Name')} {item.get('Id')}")
|
||||
self.__refresh_emby_library_by_id(item.get("Id"))
|
||||
if self._interval:
|
||||
logger.info(f"等待 {self._interval} 秒后继续刷新")
|
||||
time.sleep(self._interval)
|
||||
else:
|
||||
logger.info(
|
||||
f"最新媒体：{'电视剧' if str(item.get('Type')) == 'Episode' else '电影'} {'%s S%02dE%02d %s' % (item.get('SeriesName'), item.get('ParentIndexNumber'), item.get('IndexNumber'), item.get('Name')) if str(item.get('Type')) == 'Episode' else item.get('Name')} {item.get('Id')} 元数据完整，跳过处理")
|
||||
@@ -225,8 +233,6 @@ class EmbyMetaRefresh(_PluginBase):
|
||||
'actors': peoples or item_actors
|
||||
}
|
||||
|
||||
time.sleep(5)
|
||||
|
||||
# 处理剧集
|
||||
for key, value in handle_items.items():
|
||||
if value:
|
||||
@@ -1031,7 +1037,25 @@ class EmbyMetaRefresh(_PluginBase):
|
||||
{
|
||||
'component': 'VCol',
|
||||
'props': {
|
||||
'cols': 12
|
||||
'cols': 12,
|
||||
'md': 4
|
||||
},
|
||||
'content': [
|
||||
{
|
||||
'component': 'VTextField',
|
||||
'props': {
|
||||
'model': 'interval',
|
||||
'label': '刷新间隔(秒)',
|
||||
'placeholder': '留空默认0秒'
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
'component': 'VCol',
|
||||
'props': {
|
||||
'cols': 12,
|
||||
'md': 4
|
||||
},
|
||||
'content': [
|
||||
{
|
||||
@@ -1084,7 +1108,8 @@ class EmbyMetaRefresh(_PluginBase):
|
||||
"refresh_type": "历史记录",
|
||||
"actor_path": "",
|
||||
"mediaservers": [],
|
||||
"num": 5
|
||||
"num": 5,
|
||||
"interval": 0,
|
||||
}
|
||||
|
||||
def get_page(self) -> List[dict]:
|
||||
|
||||
@@ -34,7 +34,7 @@ class EmbyReporter(_PluginBase):
|
||||
# 插件图标
|
||||
plugin_icon = "Pydiocells_A.png"
|
||||
# 插件版本
|
||||
plugin_version = "2.1"
|
||||
plugin_version = "2.1.1"
|
||||
# 插件作者
|
||||
plugin_author = "thsrite"
|
||||
# 作者主页
|
||||
@@ -644,7 +644,8 @@ class EmbyReporter(_PluginBase):
|
||||
success, info = self.items(user_id, item_id)
|
||||
if success and info:
|
||||
success, parent_info = self.items(user_id, info["ParentId"])
|
||||
if success and parent_info and parent_info["ParentId"] in self._black_library:
|
||||
if (success and parent_info
|
||||
and str(parent_info["ParentId"]) in str(self._black_library).split(",")):
|
||||
logger.info(f"电影 {name} 已在媒体库黑名单 {self._black_library} 中，已过滤")
|
||||
continue
|
||||
exists_movies.append(i)
|
||||
@@ -675,7 +676,7 @@ class EmbyReporter(_PluginBase):
|
||||
# 过滤电视剧
|
||||
if self._black_library:
|
||||
success, parent_info = self.items(user_id, item_id)
|
||||
if success and parent_info and parent_info["ParentId"] in self._black_library:
|
||||
if success and parent_info and str(parent_info["ParentId"]) in str(self._black_library).split(","):
|
||||
logger.info(f"电视剧 {name} 已在媒体库黑名单 {self._black_library} 中，已过滤")
|
||||
continue
|
||||
# 封面图像获取
|
||||
|
||||
@@ -26,7 +26,7 @@ class MediaSyncDel(_PluginBase):
|
||||
# 插件图标
|
||||
plugin_icon = "mediasyncdel.png"
|
||||
# 插件版本
|
||||
plugin_version = "1.8.3"
|
||||
plugin_version = "1.8.4"
|
||||
# 插件作者
|
||||
plugin_author = "thsrite"
|
||||
# 作者主页
|
||||
@@ -1103,7 +1103,7 @@ class MediaSyncDel(_PluginBase):
|
||||
downloader=downloader)
|
||||
# 暂停辅种
|
||||
else:
|
||||
self.chain.stop_torrents(hashs=torrent, download=downloader)
|
||||
self.chain.stop_torrents(hashs=torrent, downloader=downloader)
|
||||
logger.info(f"辅种：{downloader} - {torrent} 暂停")
|
||||
|
||||
# 处理辅种的辅种
|
||||
|
||||
@@ -20,7 +20,7 @@ class SubscribeGroup(_PluginBase):
|
||||
# 插件图标
|
||||
plugin_icon = "teamwork.png"
|
||||
# 插件版本
|
||||
plugin_version = "2.8"
|
||||
plugin_version = "2.8.1"
|
||||
# 插件作者
|
||||
plugin_author = "thsrite"
|
||||
# 作者主页
|
||||
@@ -316,8 +316,7 @@ class SubscribeGroup(_PluginBase):
|
||||
# 站点 判断是否在订阅站点范围内
|
||||
rss_sites = self.systemconfig.get(SystemConfigKey.RssSites) or []
|
||||
if _torrent and _torrent.site and int(_torrent.site) in rss_sites:
|
||||
sites = json.dumps([_torrent.site])
|
||||
update_dict['sites'] = sites
|
||||
update_dict['sites'] = [_torrent.site]
|
||||
|
||||
if len(update_dict.keys()) == 0:
|
||||
logger.info(f"订阅记录:{subscribe.name} 无需填充")
|
||||
|
||||
@@ -33,7 +33,7 @@ class EmbyReporter(_PluginBase):
|
||||
# 插件图标
|
||||
plugin_icon = "Pydiocells_A.png"
|
||||
# 插件版本
|
||||
plugin_version = "1.9"
|
||||
plugin_version = "1.9.1"
|
||||
# 插件作者
|
||||
plugin_author = "thsrite"
|
||||
# 作者主页
|
||||
@@ -600,7 +600,8 @@ class EmbyReporter(_PluginBase):
|
||||
success, info = self.items(user_id, item_id)
|
||||
if success and info:
|
||||
success, parent_info = self.items(user_id, info["ParentId"])
|
||||
if success and parent_info and parent_info["ParentId"] in self._black_library:
|
||||
if (success and parent_info
|
||||
and str(parent_info["ParentId"]) in str(self._black_library).split(",")):
|
||||
logger.info(f"电影 {name} 已在媒体库黑名单 {self._black_library} 中，已过滤")
|
||||
continue
|
||||
exists_movies.append(i)
|
||||
@@ -630,7 +631,7 @@ class EmbyReporter(_PluginBase):
|
||||
# 过滤电视剧
|
||||
if self._black_library:
|
||||
success, parent_info = self.items(user_id, item_id)
|
||||
if success and parent_info and parent_info["ParentId"] in self._black_library:
|
||||
if success and parent_info and str(parent_info["ParentId"]) in str(self._black_library).split(","):
|
||||
logger.info(f"电视剧 {name} 已在媒体库黑名单 {self._black_library} 中，已过滤")
|
||||
continue
|
||||
# 封面图像获取
|
||||
|
||||
@@ -30,7 +30,7 @@ class PluginAutoUpdate(_PluginBase):
|
||||
# 插件图标
|
||||
plugin_icon = "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/pluginupdate.png"
|
||||
# 插件版本
|
||||
plugin_version = "1.9.2"
|
||||
plugin_version = "2.0"
|
||||
# 插件作者
|
||||
plugin_author = "thsrite"
|
||||
# 作者主页
|
||||
@@ -291,41 +291,6 @@ class PluginAutoUpdate(_PluginBase):
|
||||
break
|
||||
router.add_api_route(**api)
|
||||
|
||||
@staticmethod
|
||||
def get_local_plugins():
|
||||
"""
|
||||
获取本地插件
|
||||
"""
|
||||
# 已安装插件
|
||||
install_plugins = SystemConfigOper().get(SystemConfigKey.UserInstalledPlugins) or []
|
||||
|
||||
local_plugins = {}
|
||||
# 线上插件列表
|
||||
markets = settings.PLUGIN_MARKET.split(",")
|
||||
for market in markets:
|
||||
online_plugins = PluginHelper().get_plugins(market) or {}
|
||||
for pid, plugin in online_plugins.items():
|
||||
if pid in install_plugins:
|
||||
local_plugin = local_plugins.get(pid)
|
||||
if local_plugin:
|
||||
if StringUtils.compare_version(local_plugin.get("plugin_version"),
|
||||
plugin.get("version")) < 0:
|
||||
local_plugins[pid] = {
|
||||
"id": pid,
|
||||
"plugin_name": plugin.get("name"),
|
||||
"repo_url": market,
|
||||
"plugin_version": plugin.get("version")
|
||||
}
|
||||
else:
|
||||
local_plugins[pid] = {
|
||||
"id": pid,
|
||||
"plugin_name": plugin.get("name"),
|
||||
"repo_url": market,
|
||||
"plugin_version": plugin.get("version")
|
||||
}
|
||||
|
||||
return local_plugins
|
||||
|
||||
def get_form(self) -> Tuple[List[dict], Dict[str, Any]]:
|
||||
"""
|
||||
拼装插件配置页面，需要返回两块数据：1、页面配置；2、数据结构
|
||||
@@ -339,15 +304,14 @@ class PluginAutoUpdate(_PluginBase):
|
||||
})
|
||||
|
||||
# 已安装插件
|
||||
local_plugins = self.get_local_plugins()
|
||||
local_plugins = PluginManager().get_local_plugins()
|
||||
# 编历 local_plugins，生成插件类型选项
|
||||
pluginOptions = []
|
||||
|
||||
for plugin_id in list(local_plugins.keys()):
|
||||
local_plugin = local_plugins.get(plugin_id)
|
||||
for plugin in local_plugins:
|
||||
pluginOptions.append({
|
||||
"title": f"{local_plugin.get('plugin_name')} v{local_plugin.get('plugin_version')}",
|
||||
"value": local_plugin.get("id")
|
||||
"title": f"{plugin.plugin_name} v{plugin.plugin_version}",
|
||||
"value": plugin.id
|
||||
})
|
||||
return [
|
||||
{
|
||||
|
||||
@@ -24,7 +24,7 @@ class PluginReInstall(_PluginBase):
|
||||
# 插件图标
|
||||
plugin_icon = "refresh.png"
|
||||
# 插件版本
|
||||
plugin_version = "1.7"
|
||||
plugin_version = "1.8"
|
||||
# 插件作者
|
||||
plugin_author = "thsrite"
|
||||
# 作者主页
|
||||
@@ -72,28 +72,27 @@ class PluginReInstall(_PluginBase):
|
||||
self.__update_conifg()
|
||||
|
||||
# 本地插件
|
||||
local_plugins = self.get_local_plugins()
|
||||
local_plugins = PluginManager().get_local_plugins()
|
||||
|
||||
# 开始重载插件
|
||||
for plugin_id in list(local_plugins.keys()):
|
||||
local_plugin = local_plugins.get(plugin_id)
|
||||
if plugin_id in self._plugin_ids:
|
||||
for plugin in local_plugins:
|
||||
if plugin.id in self._plugin_ids:
|
||||
logger.info(
|
||||
f"开始重载插件 {local_plugin.get('plugin_name')} v{local_plugin.get('plugin_version')}")
|
||||
f"开始重载插件 {plugin.plugin_name} v{plugin.plugin_version}")
|
||||
|
||||
# 开始安装线上插件
|
||||
state, msg = PluginHelper().install(pid=plugin_id,
|
||||
repo_url=plugin_url or local_plugin.get("repo_url"))
|
||||
state, msg = PluginHelper().install(pid=plugin.id,
|
||||
repo_url=plugin_url or plugin.repo_url)
|
||||
# 安装失败
|
||||
if not state:
|
||||
logger.error(
|
||||
f"插件 {local_plugin.get('plugin_name')} 重装失败，当前版本 v{local_plugin.get('plugin_version')}")
|
||||
f"插件 {plugin.plugin_name} 重装失败，当前版本 v{plugin.plugin_version}")
|
||||
continue
|
||||
|
||||
logger.info(
|
||||
f"插件 {local_plugin.get('plugin_name')} 重装成功，当前版本 v{local_plugin.get('plugin_version')}")
|
||||
f"插件 {plugin.plugin_name} 重装成功，当前版本 v{plugin.plugin_version}")
|
||||
|
||||
self.__reload_plugin(plugin_id)
|
||||
self.__reload_plugin(plugin.id)
|
||||
|
||||
def __update_conifg(self):
|
||||
self.update_config({
|
||||
@@ -139,15 +138,14 @@ class PluginReInstall(_PluginBase):
|
||||
拼装插件配置页面，需要返回两块数据：1、页面配置；2、数据结构
|
||||
"""
|
||||
# 已安装插件
|
||||
local_plugins = self.get_local_plugins()
|
||||
local_plugins = PluginManager().get_local_plugins()
|
||||
# 编历 local_plugins，生成插件类型选项
|
||||
pluginOptions = []
|
||||
|
||||
for plugin_id in list(local_plugins.keys()):
|
||||
local_plugin = local_plugins.get(plugin_id)
|
||||
for plugin in local_plugins:
|
||||
pluginOptions.append({
|
||||
"title": f"{local_plugin.get('plugin_name')} v{local_plugin.get('plugin_version')}",
|
||||
"value": local_plugin.get("id")
|
||||
"title": f"{plugin.plugin_name} v{plugin.plugin_version}",
|
||||
"value": plugin.id
|
||||
})
|
||||
return [
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user