From 41e290716866cb9ee99cc60f6d12baf4ea8c3b97 Mon Sep 17 00:00:00 2001 From: InfinityPacer <160988576+InfinityPacer@users.noreply.github.com> Date: Sun, 7 Jul 2024 16:32:37 +0800 Subject: [PATCH] fix jxxghp/MoviePilot-Plugins#38 --- app/modules/plex/plex.py | 56 +++++++++++++++++++++++++------- app/modules/telegram/telegram.py | 16 +++++---- app/utils/http.py | 35 +++++++++++++++++++- 3 files changed, 89 insertions(+), 18 deletions(-) diff --git a/app/modules/plex/plex.py b/app/modules/plex/plex.py index d7a7f7b5..8b2f17eb 100644 --- a/app/modules/plex/plex.py +++ b/app/modules/plex/plex.py @@ -265,25 +265,59 @@ class Plex: season_episodes[episode.seasonNumber].append(episode.index) return videos.key, season_episodes - def get_remote_image_by_id(self, item_id: str, image_type: str) -> Optional[str]: + def get_remote_image_by_id(self, item_id: str, image_type: str, depth: int = 0) -> Optional[str]: """ 根据ItemId从Plex查询图片地址 - :param item_id: 在Emby中的ID + :param item_id: 在Plex中的ID :param image_type: 图片的类型，Poster或者Backdrop等 + :param depth: 当前递归深度，默认为0 :return: 图片对应在TMDB中的URL """ - if not self._plex: + if not self._plex or depth > 2 or not item_id: return None try: - if image_type == "Poster": - images = self._plex.fetchItems('/library/metadata/%s/posters' % item_id, - cls=media.Poster) + image_url = None + ekey = f"/library/metadata/{item_id}" + item = self._plex.fetchItem(ekey=ekey) + if not item: + return None + # 如果配置了外网播放地址以及Token，则默认从Plex媒体服务器获取图片，否则返回有外网地址的图片资源 + if settings.PLEX_PLAY_HOST and settings.PLEX_TOKEN: + query = {"X-Plex-Token": settings.PLEX_TOKEN} + if image_type == "Poster": + if item.thumb: + image_url = RequestUtils.combine_url(host=settings.PLEX_PLAY_HOST, path=item.thumb, query=query) + else: + # 这里对episode进行特殊处理，实际上episode的Backdrop是Poster + if item.TYPE == "episode" and item.thumb: + image_url = RequestUtils.combine_url(host=settings.PLEX_PLAY_HOST, path=item.thumb, query=query) + # 默认使用art也就是Backdrop进行处理 + if not image_url and item.art: + image_url = RequestUtils.combine_url(host=settings.PLEX_PLAY_HOST, path=item.art, query=query) else: - images = self._plex.fetchItems('/library/metadata/%s/arts' % item_id, - cls=media.Art) - for image in images: - if hasattr(image, 'key') and image.key.startswith('http'): - return image.key + if image_type == "Poster": + images = self._plex.fetchItems(ekey=f"{ekey}/posters", + cls=media.Poster) + else: + # 这里对episode进行特殊处理，实际上episode的Backdrop是Poster + images = None + if item.TYPE == "episode": + images = self._plex.fetchItems(ekey=f"{ekey}/posters", + cls=media.Poster) + # 默认使用art也就是Backdrop进行处理 + if not images: + images = self._plex.fetchItems(ekey=f"{ekey}/arts", + cls=media.Art) + for image in images: + if hasattr(image, "key") and image.key.startswith("http"): + image_url = image.key + break + # 如果最后还是找不到，则递归父级进行查找 + if not image_url and hasattr(item, "parentRatingKey"): + return self.get_remote_image_by_id(item_id=item.parentRatingKey, + image_type=image_type, + depth=depth + 1) + return image_url except Exception as e: logger.error(f"获取封面出错：" + str(e)) return None diff --git a/app/modules/telegram/telegram.py b/app/modules/telegram/telegram.py index 9979f42e..2bddd1ba 100644 --- a/app/modules/telegram/telegram.py +++ b/app/modules/telegram/telegram.py @@ -1,5 +1,6 @@ import re import threading +import uuid from pathlib import Path from threading import Event from typing import Optional, List, Dict @@ -199,14 +200,17 @@ class Telegram: """ if image: - req = RequestUtils(proxies=settings.PROXY).get_res(image) - if req is None: + res = RequestUtils(proxies=settings.PROXY).get_res(image) + if res is None: raise Exception("获取图片失败") - if req.content: - image_file = Path(settings.TEMP_PATH) / Path(image).name - image_file.write_bytes(req.content) + if res.content: + # 使用随机标识构建图片文件的完整路径，并写入图片内容到文件 + image_file = Path(settings.TEMP_PATH) / str(uuid.uuid4()) + image_file.write_bytes(res.content) photo = InputFile(image_file) - caption = re.sub(r'([_`])', r'\\\1', caption) + # 对caption进行Markdown特殊字符转义 + caption = re.sub(r"([_`])", r"\\\1", caption) + # 发送图片到Telegram ret = self._bot.send_photo(chat_id=userid or self._telegram_chat_id, photo=photo, caption=caption, diff --git a/app/utils/http.py b/app/utils/http.py index 6f76082f..b2512cd5 100644 --- a/app/utils/http.py +++ b/app/utils/http.py @@ -1,5 +1,5 @@ from typing import Union, Any, Optional -from urllib.parse import urljoin +from urllib.parse import urljoin, urlparse, parse_qs, urlencode, urlunparse import requests import urllib3 @@ -255,3 +255,36 @@ class RequestUtils: return endpoint host = RequestUtils.standardize_base_url(host) return urljoin(host, endpoint) if host else endpoint + + @staticmethod + def combine_url(host: str, path: Optional[str] = None, query: Optional[dict] = None) -> Optional[str]: + """ + 使用给定的主机头、路径和查询参数组合生成完整的URL。 + :param host: str, 主机头，例如 https://example.com + :param path: Optional[str], 包含路径和可能已经包含的查询参数的端点，例如 /path/to/resource?current=1 + :param query: Optional[dict], 可选，额外的查询参数，例如 {"key": "value"} + :return: str, 完整的请求URL字符串 + """ + try: + # 如果路径为空，则默认为 '/' + if path is None: + path = '/' + # 使用 urljoin 合并 host 和 path + url = urljoin(host, path) + # 解析当前 URL 的组成部分 + url_parts = urlparse(url) + # 解析已存在的查询参数，并与额外的查询参数合并 + query_params = parse_qs(url_parts.query) + if query: + for key, value in query.items(): + query_params[key] = value + + # 重新构建查询字符串 + query_string = urlencode(query_params, doseq=True) + # 构建完整的 URL + new_url_parts = url_parts._replace(query=query_string) + complete_url = urlunparse(new_url_parts) + return str(complete_url) + except Exception as e: + logger.debug(f"Error combining URL: {e}") + return None