From 9a1ebe0894b70969544523664aecaec5ec1864a1 Mon Sep 17 00:00:00 2001 From: Cp0204 Date: Wed, 13 Nov 2024 01:28:37 +0800 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E5=AA=92=E4=BD=93=E5=BA=93=E4=BB=A3=E7=A0=81=EF=BC=8C=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=8C=96=E4=BB=A5=E4=BE=BF=E6=89=A9=E5=B1=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 通过load_media_servers函数动态加载媒体库模块 - 动态加载媒体库配置，提高扩展性 - 修改部分配置字段，并添加兼容升级代码 --- media_servers/emby.py | 76 +++++++++++++++++++++++++ quark_auto_save.py | 127 ++++++++++++++---------------------------- 2 files changed, 117 insertions(+), 86 deletions(-) create mode 100644 media_servers/emby.py diff --git a/media_servers/emby.py b/media_servers/emby.py new file mode 100644 index 0000000..c4afdd6 --- /dev/null +++ b/media_servers/emby.py @@ -0,0 +1,76 @@ +import requests + + +class Emby: + def __init__(self, **kwargs): + self.is_active = False + if kwargs.get("url") and kwargs.get("apikey"): + self.emby_url = kwargs.get("url") + self.emby_apikey = kwargs.get("apikey") + if self.get_info(): + self.is_active = True + + def get_info(self): + url = f"{self.emby_url}/emby/System/Info" + headers = {"X-Emby-Token": self.emby_apikey} + querystring = {} + response = requests.request("GET", url, headers=headers, params=querystring) + if "application/json" in response.headers["Content-Type"]: + response = response.json() + print( + f"Emby媒体库: {response.get('ServerName','')} v{response.get('Version','')}" + ) + return True + else: + print(f"Emby媒体库: 连接失败❌ {response.text}") + return False + + def refresh(self, emby_id): + if emby_id: + url = f"{self.emby_url}/emby/Items/{emby_id}/Refresh" + headers = {"X-Emby-Token": self.emby_apikey} + querystring = { + "Recursive": "true", + "MetadataRefreshMode": "FullRefresh", + "ImageRefreshMode": "FullRefresh", + "ReplaceAllMetadata": "false", + "ReplaceAllImages": "false", + } + response = requests.request( + "POST", url, headers=headers, params=querystring + ) + if response.text == "": + print(f"🎞 刷新Emby媒体库：成功✅") + return True + else: + print(f"🎞 刷新Emby媒体库：{response.text}❌") + return False + + def search(self, media_name): + if media_name: + url = f"{self.emby_url}/emby/Items" + headers = {"X-Emby-Token": self.emby_apikey} + querystring = { + "IncludeItemTypes": "Series", + "StartIndex": 0, + "SortBy": "SortName", + "SortOrder": "Ascending", + "ImageTypeLimit": 0, + "Recursive": "true", + "SearchTerm": media_name, + "Limit": 10, + "IncludeSearchTypes": "false", + } + response = requests.request("GET", url, headers=headers, params=querystring) + if "application/json" in response.headers["Content-Type"]: + response = response.json() + if response.get("Items"): + for item in response["Items"]: + if item["IsFolder"]: + print( + f"🎞 《{item['Name']}》匹配到Emby媒体库ID：{item['Id']}" + ) + return item["Id"] + else: + print(f"🎞 搜索Emby媒体库：{response.text}❌") + return False diff --git a/quark_auto_save.py b/quark_auto_save.py index 8224a8b..435749f 100644 --- a/quark_auto_save.py +++ b/quark_auto_save.py @@ -1,6 +1,6 @@ # !/usr/bin/env python3 # -*- coding: utf-8 -*- -# Modify: 2024-04-03 +# Modify: 2024-11-13 # Repo: https://github.com/Cp0204/quark_auto_save # ConfigFile: quark_config.json """ @@ -14,6 +14,7 @@ import json import time import random import requests +import importlib from datetime import datetime # 兼容青龙 @@ -686,79 +687,19 @@ class Quark: return is_rename_count > 0 -class Emby: - def __init__(self, emby_url, emby_apikey): - self.is_active = False - if emby_url and emby_apikey: - self.emby_url = emby_url - self.emby_apikey = emby_apikey - if self.get_info(): - self.is_active = True - - def get_info(self): - url = f"{self.emby_url}/emby/System/Info" - headers = {"X-Emby-Token": self.emby_apikey} - querystring = {} - response = requests.request("GET", url, headers=headers, params=querystring) - if "application/json" in response.headers["Content-Type"]: - response = response.json() - print( - f"Emby媒体库: {response.get('ServerName','')} v{response.get('Version','')}" - ) - return True - else: - print(f"Emby媒体库: 连接失败❌ {response.text}") - return False - - def refresh(self, emby_id): - if emby_id: - url = f"{self.emby_url}/emby/Items/{emby_id}/Refresh" - headers = {"X-Emby-Token": self.emby_apikey} - querystring = { - "Recursive": "true", - "MetadataRefreshMode": "FullRefresh", - "ImageRefreshMode": "FullRefresh", - "ReplaceAllMetadata": "false", - "ReplaceAllImages": "false", - } - response = requests.request( - "POST", url, headers=headers, params=querystring - ) - if response.text == "": - print(f"🎞 刷新Emby媒体库：成功✅") - return True - else: - print(f"🎞 刷新Emby媒体库：{response.text}❌") - return False - - def search(self, media_name): - if media_name: - url = f"{self.emby_url}/emby/Items" - headers = {"X-Emby-Token": self.emby_apikey} - querystring = { - "IncludeItemTypes": "Series", - "StartIndex": 0, - "SortBy": "SortName", - "SortOrder": "Ascending", - "ImageTypeLimit": 0, - "Recursive": "true", - "SearchTerm": media_name, - "Limit": 10, - "IncludeSearchTypes": "false", - } - response = requests.request("GET", url, headers=headers, params=querystring) - if "application/json" in response.headers["Content-Type"]: - response = response.json() - if response.get("Items"): - for item in response["Items"]: - if item["IsFolder"]: - print( - f"🎞 《{item['Name']}》匹配到Emby媒体库ID：{item['Id']}" - ) - return item["Id"] - else: - print(f"🎞 搜索Emby媒体库：{response.text}❌") - return False +def load_media_servers(media_servers_config): + media_servers = {} + for server_name, server_config in media_servers_config.items(): + try: + module = importlib.import_module(f"media_servers.{server_name}") + ServerClass = getattr(module, server_name.capitalize()) + # 复制配置，避免修改原始配置 + server_args = server_config.copy() + # 动态传递参数 + media_servers[server_name] = ServerClass(**server_args) + except (ImportError, AttributeError): + print(f"加载媒体服务器模块 {server_name} 失败。") + return media_servers def verify_account(account): @@ -818,10 +759,7 @@ def do_sign(account): def do_save(account, tasklist=[]): - emby = Emby( - CONFIG_DATA.get("emby", {}).get("url", ""), - CONFIG_DATA.get("emby", {}).get("apikey", ""), - ) + media_servers = load_media_servers(CONFIG_DATA.get("media_servers", {})) print(f"转存账号: {account.nickname}") # 获取全部保存目录fid account.update_savepath_fid(tasklist) @@ -862,17 +800,33 @@ def do_save(account, tasklist=[]): is_new = account.do_save_task(task) is_rename = account.do_rename_task(task) # 刷新媒体库 - if emby.is_active and (is_new or is_rename) and task.get("emby_id") != "0": - if task.get("emby_id"): - emby.refresh(task["emby_id"]) - else: - match_emby_id = emby.search(task["taskname"]) - if match_emby_id: - task["emby_id"] = match_emby_id - emby.refresh(match_emby_id) + for server_name, media_server in media_servers.items(): + if ( + media_server.is_active + and (is_new or is_rename) + and task.get("media_id") != "0" + ): + if task.get("media_id"): + media_server.refresh(task["media_id"]) + else: + match_media_id = media_server.search(task["taskname"]) + if match_media_id: + task["media_id"] = match_media_id + media_server.refresh(match_media_id) print() +def reaking_change_update(): + global CONFIG_DATA + # print("Update config v0.3.6.1 to 0.3.7") + if CONFIG_DATA.get("emby"): + CONFIG_DATA.setdefault("media_servers", {})["emby"] = CONFIG_DATA["emby"] + del CONFIG_DATA["emby"] + for task in CONFIG_DATA.get("tasklist", {}): + task["media_id"] = task.get("emby_id", "") + del task["emby_id"] + + def main(): global CONFIG_DATA start_time = datetime.now() @@ -900,6 +854,7 @@ def main(): print(f"⚙️ 正从 {config_path} 文件中读取配置") with open(config_path, "r", encoding="utf-8") as file: CONFIG_DATA = json.load(file) + reaking_change_update() cookie_val = CONFIG_DATA.get("cookie") if not CONFIG_DATA.get("magic_regex"): CONFIG_DATA["magic_regex"] = MAGIC_REGEX