From 20b145c679d914b5aeb453101bbde7d51c534afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=AF=E5=A4=A7=E4=BE=A0?= Date: Sun, 30 Mar 2025 02:38:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E4=BF=AE=E5=A4=8D=E5=AA=92?= =?UTF-8?q?=E4=BD=93=E7=BC=BA=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/modules/jellyfin/__init__.py | 2 +- app/modules/plex/__init__.py | 2 +- app/modules/trimemedia/__init__.py | 2 +- app/modules/trimemedia/api.py | 8 ++++++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/modules/jellyfin/__init__.py b/app/modules/jellyfin/__init__.py index d517eef1..7268f1c8 100644 --- a/app/modules/jellyfin/__init__.py +++ b/app/modules/jellyfin/__init__.py @@ -150,7 +150,7 @@ class JellyfinModule(_ModuleBase, _MediaServerBase[Jellyfin]): else: servers = self.get_instances().items() for name, s in servers: - if not server: + if not s: continue if mediainfo.type == MediaType.MOVIE: if itemid: diff --git a/app/modules/plex/__init__.py b/app/modules/plex/__init__.py index b786a42a..1047fc2d 100644 --- a/app/modules/plex/__init__.py +++ b/app/modules/plex/__init__.py @@ -153,7 +153,7 @@ class PlexModule(_ModuleBase, _MediaServerBase[Plex]): else: servers = self.get_instances().items() for name, s in servers: - if not server: + if not s: continue if mediainfo.type == MediaType.MOVIE: if itemid: diff --git a/app/modules/trimemedia/__init__.py b/app/modules/trimemedia/__init__.py index a376131f..99670e7b 100644 --- a/app/modules/trimemedia/__init__.py +++ b/app/modules/trimemedia/__init__.py @@ -172,7 +172,7 @@ class TrimeMediaModule(_ModuleBase, _MediaServerBase[TrimeMedia]): else: servers = self.get_instances().items() for name, s in servers: - if not server: + if not s: continue if mediainfo.type == MediaType.MOVIE: if itemid: diff --git a/app/modules/trimemedia/api.py b/app/modules/trimemedia/api.py index 43defaff..42c47df4 100644 --- a/app/modules/trimemedia/api.py +++ b/app/modules/trimemedia/api.py @@ -403,10 +403,14 @@ class Api: ) else: json_body = None + if params: + queries_unquoted = "&".join([f"{k}={v}" for k, v in params.items()]) + else: + queries_unquoted = None headers = { "User-Agent": settings.USER_AGENT, "Authorization": self._token, - "authx": self.__get_authx(api_path, json_body), + "authx": self.__get_authx(api_path, json_body or queries_unquoted), } if json_body is not None: headers["Content-Type"] = "application/json" @@ -425,4 +429,4 @@ class Api: logger.error(f"请求接口 {api_path} 失败") except Exception as e: logger.error(f"请求接口 {api_path} 异常:" + str(e)) - return None \ No newline at end of file + return None