diff --git a/app/modules/jellyfin/jellyfin.py b/app/modules/jellyfin/jellyfin.py index 841f63705..cdf201ff2 100644 --- a/app/modules/jellyfin/jellyfin.py +++ b/app/modules/jellyfin/jellyfin.py @@ -23,6 +23,24 @@ from app.schemas.mediaserver import WebhookEventInfo as _SchemaWebhookEventInfo from app.schemas.types import MediaSource, MediaType +def _optional_text(value: object) -> Optional[str]: + """ + 读取服务端可空文本字段，拒绝非文本值而不隐式转换标识或路径。 + """ + if value is None or isinstance(value, str): + return value + raise TypeError("Jellyfin 文本字段格式错误") + + +def _user_id(value: object) -> Optional[Union[str, int]]: + """ + 读取兼容字符串或整数的服务端用户标识，保留空值。 + """ + if value is None or isinstance(value, (str, int)): + return value + raise TypeError("Jellyfin 用户标识格式错误") + + class Jellyfin: """ 适配 Jellyfin 的媒体库查询、同步和播放接口。 @@ -38,7 +56,7 @@ class Jellyfin: _webhook_path_region = "jellyfin.webhook.paths" def __init__(self, host: Optional[str] = None, apikey: Optional[str] = None, play_host: Optional[str] = None, - sync_libraries: list = None, **kwargs): + sync_libraries: Optional[list[str]] = None, **kwargs: object) -> None: """ 保存服务配置，并查询用户、服务器身份及必要的媒体库路径。 @@ -72,14 +90,14 @@ class Jellyfin: return False return True if not self.user else False - def reconnect(self): + def reconnect(self) -> None: """ 重新查询用户并更新服务器标识。 """ self.user = self.get_user() self.serverid = self.get_server_id() - def _request(self, headers: Optional[dict] = None, **kwargs: Any) -> RequestUtils: + def _request(self, headers: Optional[dict[str, str]] = None, **kwargs: Any) -> RequestUtils: """ 创建兼容不同 Jellyfin 版本鉴权方式的请求工具。 """ @@ -92,7 +110,7 @@ class Jellyfin: request_headers["Content-Type"] = kwargs["content_type"] return RequestUtils(headers=request_headers, **kwargs) - def get_jellyfin_folders(self) -> List[dict]: + def get_jellyfin_folders(self) -> List[dict[str, Any]]: """ 读取服务端可选媒体库及其目录信息。 @@ -107,7 +125,10 @@ class Jellyfin: try: res = self._request().get_res(url, params) if res: - return res.json() + folders: object = res.json() + if not isinstance(folders, list) or not all(isinstance(folder, dict) for folder in folders): + raise TypeError("Jellyfin 媒体库目录响应格式错误") + return folders else: logger.error("Library/SelectableMediaFolders 未获取到返回数据") return [] @@ -115,7 +136,7 @@ class Jellyfin: logger.error("连接Library/SelectableMediaFolders 出错：" + str(e)) return [] - def get_jellyfin_virtual_folders(self) -> List[dict]: + def get_jellyfin_virtual_folders(self) -> List[dict[str, Any]]: """ 读取虚拟媒体库及其全部目录，优先使用共享路径。 @@ -158,7 +179,7 @@ class Jellyfin: logger.error("连接Library/VirtualFolders 出错：" + str(e)) return [] - def __get_jellyfin_librarys(self, username: Optional[str] = None) -> Optional[List[dict]]: + def __get_jellyfin_librarys(self, username: Optional[str] = None) -> Optional[List[dict[str, Any]]]: """ 获取Jellyfin媒体库的信息。 """ @@ -289,7 +310,7 @@ class Jellyfin: if user_name: for user in users: if user.get("Name") == user_name: - return user.get("Id") + return _user_id(user.get("Id")) if user_name: logger.warning( f"未找到指定的 Jellyfin 用户账号 {user_name}，" @@ -305,12 +326,12 @@ class Jellyfin: if not policy.get("IsAdministrator"): continue if policy.get("EnableAllFolders"): - return user.get("Id") + return _user_id(user.get("Id")) else: enabled_folders = policy.get('EnabledFolders') or [] current_count = len(enabled_folders) if best_admin_id is None or current_count > best_admin_library_count: - best_admin_id = user.get("Id") + best_admin_id = _user_id(user.get("Id")) best_admin_name = user.get("Name") best_admin_library_count = current_count if best_admin_id is None: @@ -359,7 +380,7 @@ class Jellyfin: auth_token = res.json().get("AccessToken") if auth_token: logger.info(f"用户 {username} Jellyfin认证成功") - return auth_token + return _optional_text(auth_token) else: logger.error("Users/AuthenticateByName 未获取到返回数据") except Exception as e: @@ -381,7 +402,7 @@ class Jellyfin: try: res = self._request().get_res(url, params) if res: - return res.json().get("Id") + return _optional_text(res.json().get("Id")) else: logger.error("System/Info 未获取到返回数据") except Exception as e: @@ -440,7 +461,7 @@ class Jellyfin: librarys = self.__get_jellyfin_librarys() if not librarys: return None - stat = _SchemaStatistic() + movie_count = tv_count = episode_count = music_count = 0 has_known_library = False for library in librarys: library_id = library.get("Id") @@ -449,17 +470,20 @@ class Jellyfin: collection_type = library.get("CollectionType") if collection_type == "movies": has_known_library = True - stat.movie_count += self.get_items_count(library_id, include_item_types="Movie") or 0 + movie_count += self.get_items_count(library_id, include_item_types="Movie") or 0 elif collection_type == "tvshows": has_known_library = True - stat.tv_count += self.get_items_count(library_id, include_item_types="Series") or 0 - stat.episode_count += self.get_items_count(library_id, include_item_types="Episode") or 0 + tv_count += self.get_items_count(library_id, include_item_types="Series") or 0 + episode_count += self.get_items_count(library_id, include_item_types="Episode") or 0 elif collection_type in ("music", "musicvideos"): has_known_library = True - stat.music_count += self.get_items_count(library_id, include_item_types="MusicAlbum") or 0 - return stat if has_known_library else None + music_count += self.get_items_count(library_id, include_item_types="MusicAlbum") or 0 + return _SchemaStatistic( + movie_count=movie_count, tv_count=tv_count, + episode_count=episode_count, music_count=music_count, + ) if has_known_library else None - def __get_jellyfin_series_id_by_name(self, name: str, year: str) -> Optional[str]: + def __get_jellyfin_series_id_by_name(self, name: Optional[str], year: Optional[str]) -> Optional[str]: """ 根据名称查询Jellyfin中剧集的SeriesId。 """ @@ -481,7 +505,7 @@ class Jellyfin: for res_item in res_items: if res_item.get('Name') == name and ( not year or str(res_item.get('ProductionYear')) == str(year)): - return res_item.get('Id') + return _optional_text(res_item.get('Id')) except Exception as e: logger.error("连接Items出错：" + str(e)) return None @@ -583,7 +607,7 @@ class Jellyfin: year: Optional[str] = None, media_source: Optional[MediaSource] = None, media_id: Optional[str] = None, - season: Optional[int] = None) -> Tuple[Optional[str], Optional[Dict[int, list]]]: + season: Optional[int] = None) -> Tuple[Optional[str], Optional[Dict[int, list[int]]]]: """ 查询电视剧身份及各季已经存在的集号。 @@ -636,7 +660,7 @@ class Jellyfin: if res_json: tv_info = res_json.json() res_items = tv_info.get("Items") - season_episodes = {} + season_episodes: dict[int, list[int]] = {} for res_item in res_items: season_index = res_item.get("ParentIndexNumber") if season_index is None: @@ -708,7 +732,7 @@ class Jellyfin: images = res.json().get("Images") or [] for image in images: if image.get("ProviderName") == "TheMovieDb" and image.get("Type") == image_type: - return image.get("Url") + return _optional_text(image.get("Url")) # TMDB 无匹配时回退本地图片 logger.info(f"未找到 TMDB {image_type}，回退本地图片") else: @@ -733,7 +757,7 @@ class Jellyfin: if res: media_sources = res.json().get("MediaSources") if media_sources: - return media_sources[0].get("Path") + return _optional_text(media_sources[0].get("Path")) else: logger.error("Items/Id/PlaybackInfo 未获取到返回数据，不设置 Path") return None @@ -782,18 +806,17 @@ class Jellyfin: logger.error("Jellyfin外网播放地址未能获取或为空") return None _parent_id = self.get_itemId_ancestors(item_id, 0, "ParentBackdropItemId") - if _parent_id: - item_id = _parent_id + image_item_id = _parent_id or item_id _host = self._host if host_type: _host = self._playhost - url = f"{_host}Items/{item_id}/Images/{image_type}" + url = f"{_host}Items/{image_item_id}/Images/{image_type}" try: res = self._request().get_res(url) if res and res.status_code != 404: logger.info(f"影片图片链接:{res.url}") - return res.url + return _optional_text(res.url) else: logger.error("Items/Id/Images 未获取到返回数据或无该影片{}图片".format(image_type)) return None @@ -801,7 +824,7 @@ class Jellyfin: logger.error("连接Items/Id/Images出错：" + str(e)) return None - def get_itemId_ancestors(self, item_id: str, index: int, key: str) -> Optional[Union[str, list, int, dict, bool]]: + def get_itemId_ancestors(self, item_id: str, index: int, key: str) -> object: """ 读取指定祖先记录中的字段。 @@ -817,7 +840,8 @@ class Jellyfin: try: res = self._request().get_res(url, params) if res: - return res.json()[index].get(key) + value: object = res.json()[index].get(key) + return value else: logger.error("Items/Id/Ancestors 未获取到返回数据") return None @@ -846,6 +870,7 @@ class Jellyfin: except Exception as e: logger.error("连接Library/Refresh出错：" + str(e)) return False + return None def get_webhook_message(self, body: Any) -> Optional[_SchemaWebhookEventInfo]: """ @@ -925,7 +950,7 @@ class Jellyfin: return eventItem @staticmethod - def __format_item_info(item) -> Optional[_SchemaMediaServerItem]: + def __format_item_info(item: dict[str, Any]) -> Optional[_SchemaMediaServerItem]: """ 通过统一 Emby 系转换契约生成 Jellyfin 条目。 """ @@ -954,7 +979,7 @@ class Jellyfin: logger.error(f"连接Users/{self.user}/Items/{itemid}：" + str(e)) return None - def get_items_count(self, parent: Union[str, int], + def get_items_count(self, parent: Optional[Union[str, int]], include_item_types: str = "Movie,Series") -> Optional[int]: """ 递归统计指定媒体库内的可同步条目。 @@ -985,7 +1010,7 @@ class Jellyfin: return None def get_items(self, parent: Union[str, int], start_index: Optional[int] = 0, limit: Optional[int] = -1) \ - -> Generator[MediaServerItem | None | Any, Any, None]: + -> Generator[Optional[MediaServerItem], None, None]: """ 读取媒体库条目并递归展开目录。 @@ -1004,7 +1029,7 @@ class Jellyfin: if not self._host or not self._apikey: raise ConnectionError("Jellyfin 服务器未连接") url = f"{self._host}Users/{self.user}/Items" - params = { + params: dict[str, Union[str, int, None]] = { "ParentId": parent, "api_key": self._apikey, "Fields": "Album,AlbumArtist,AlbumArtists,Artists,ArtistItems,ChildCount," @@ -1046,14 +1071,14 @@ class Jellyfin: return None url = url.replace("[HOST]", self._host or '') \ .replace("[APIKEY]", self._apikey or '') \ - .replace("[USER]", self.user or '') + .replace("[USER]", _optional_text(self.user or '') or '') try: return self._request(accept_type="application/json").get_res(url=url) except Exception as e: logger.error("连接Jellyfin出错：" + str(e)) return None - def post_data(self, url: str, data: Optional[str] = None, headers: dict = None) -> Optional[Response]: + def post_data(self, url: str, data: Optional[str] = None, headers: Optional[dict[str, str]] = None) -> Optional[Response]: """ 替换服务配置占位符后发送自定义 POST 请求。 @@ -1066,7 +1091,7 @@ class Jellyfin: return None url = url.replace("[HOST]", self._host or '') \ .replace("[APIKEY]", self._apikey or '') \ - .replace("[USER]", self.user or '') + .replace("[USER]", _optional_text(self.user or '') or '') try: return self._request( headers=headers @@ -1085,7 +1110,7 @@ class Jellyfin: return f"{self._playhost or self._host}web/index.html#!" \ f"/details?id={item_id}&serverId={self.serverid}" - def __get_local_image_by_id(self, item_id: str) -> str: + def __get_local_image_by_id(self, item_id: Optional[Union[str, int]]) -> str: """ 构造服务内网的主封面图片地址。 @@ -1144,7 +1169,7 @@ class Jellyfin: res = self._request().get_res(url, params) if res: result = res.json().get("Items") or [] - ret_resume = [] + ret_resume: list[_SchemaMediaServerPlayItem] = [] # 用户媒体库文件夹列表（排除黑名单） library_folders = self.get_user_library_folders() for item in result: @@ -1158,6 +1183,7 @@ class Jellyfin: continue item_type = MediaType.MOVIE.value if item.get("Type") == "Movie" else MediaType.TV.value link = self.get_play_url(item.get("Id")) + image: Optional[str] if item.get("BackdropImageTags"): image = self.get_backdrop_url(item_id=item.get("Id"), image_tag=item.get("BackdropImageTags")[0]) @@ -1190,7 +1216,7 @@ class Jellyfin: logger.error("连接Users/Items/Resume出错：" + str(e)) return None - def get_latest(self, num=20, username: Optional[str] = None) -> Optional[List[_SchemaMediaServerPlayItem]]: + def get_latest(self, num: Optional[int] = 20, username: Optional[str] = None) -> Optional[List[_SchemaMediaServerPlayItem]]: """ 查询用户最近入库的媒体条目。 @@ -1217,7 +1243,7 @@ class Jellyfin: res = self._request().get_res(url, params) if res: result = res.json() or [] - ret_latest = [] + ret_latest: list[_SchemaMediaServerPlayItem] = [] # 用户媒体库文件夹列表（排除黑名单） library_folders = self.get_user_library_folders() for item in result: @@ -1249,7 +1275,7 @@ class Jellyfin: logger.error("连接Users/Items/Latest出错：" + str(e)) return None - def get_user_library_folders(self): + def get_user_library_folders(self) -> list[str]: """ 收集允许同步的媒体库目录路径。 @@ -1261,5 +1287,8 @@ class Jellyfin: for library in self.get_jellyfin_virtual_folders() or []: if self._sync_libraries and library.get("Id") not in self._sync_libraries: continue - library_folders += [folder for folder in library.get("Path")] + paths = library.get("Path") + if paths is None: + raise TypeError("Jellyfin 媒体库路径列表为空") + library_folders += [folder for folder in paths] return library_folders diff --git a/docs/refactor/optimization-checklist.md b/docs/refactor/optimization-checklist.md index dfd078ab1..fa12d1e59 100644 --- a/docs/refactor/optimization-checklist.md +++ b/docs/refactor/optimization-checklist.md @@ -108,7 +108,7 @@ ARCH-201 至 ARCH-204 均达到实现、验证、提交、推送和远端门禁 | Event Contract | 53 | 均已有 payload model，但当前全部是 diagnostic enforcement | | Python 源码量 | 373,625 行 | 本次重新扫描物理行数，排除 `app/plugins/**`；74 个文件超过 1,000 行，12 个超过 2,000 行；源码尺寸仅作观察 | | 长方法 | 309 个超过 80 行 | 本次 AST 扫描排除 `app/plugins/**`；61 个超过 150 行，17 个超过 250 行；新增函数仍受 C901/嵌套深度门禁约束 | -| 全量 mypy 历史债务 | 4,396 / 251 文件 | 本分支为 Pydantic 字段补充描述并保留默认值，减少 3 项 assignment 错误；本次 NFO 返回类型与契约对齐，减少 2 项历史类型错误；本轮在消息、站点、诊断、备份、用户配置、订阅、AcoustID、TMDB、仪表板和命令生命周期边界补齐类型，历史债务再减少 53 项；TMDB v3 API 显式导出并保留集合 parts 的列表合同，逐文件逐错误码无增长；此前工作流筛选、动态插件路由和 stdio 流补齐边界类型，历史债务减少 3 项；Bitpt 与 CookieCloud 补齐边界类型，历史债务减少 16 项；知行站点解析器补齐数值属性与基类合同，历史债务减少 18 项；通知排版补齐 Slack 消息块类型，历史债务减少 2 项；工作流资源过滤改用领域对象调用过滤链，恢复的节点输出在消费前归一化，并收紧可空资源列表的类型低水位；消息媒体交互类型债务已清零，canonical Facade 与 endpoint 类型边界已补齐，低水位只允许继续下降；微信 ClawBot 入站 item_list 媒体解析改为按子项键名分派后，类型错误减少 4 项；站点解析器分享率改用浮点初值，类型错误减少 20 项；本次下载与文件安全修复再减少 3 项；Transmission 进度回退值归一化再减少 2 项；本批清理 Servarr、认证、存储、订阅策略和搜索/规则/通知 Schema 的 18 项类型错误，并修复系统配置中的 Python 2 异常语法；本批再清理订阅元数据、订阅写入、交互宿主、整理路径、删除统计和工作流动作的 14 项类型错误，逐文件逐错误码无增长；本批补齐 OCR 请求参数、工具 Schema 摘要和宿主模块配置快照的 5 项边界类型，逐文件逐错误码无增长；本批为 Rousi 用户消息分页解析补齐返回类型与数据结构兜底，减少 2 项类型错误；本批优先处理 TMDB v3 电影与电视剧对象模型，补齐 98 个同步/异步方法注解并减少 122 项历史类型错误；随后补齐剧集、季度、人物、搜索和趋势对象的 142 个方法注解，再减少 142 项类型错误；绿联 API 响应边界补齐具体泛型与运行时字典收窄，减少 31 项类型错误；运行时限流器补齐状态方法、装饰器边界和时间队列类型，减少 31 项类型错误；QQ Bot API 响应边界补齐具体泛型与 JSON 形状校验，减少 17 项类型错误；rTorrent 客户端清理 182 项错误，调用端同步明确字典合同，累计再减少 190 项错误；豆瓣 API、中心服务接口及订阅消费端补齐返回边界和参数收窄，结合 Context 方法签名与缓存代理类型清理，累计再减少 455 项错误；共享 HTTP 客户端清理 110 项错误，TMDB API 清理 84 项错误，索引器爬虫清理 87 项错误，并补充 U115、AliPan、OpenList 对可空流响应的防守；U115 其余存储基类契约债务暂留待测试完备后处理；缓存同步/异步继承冲突保留为设计债务，未纳入严格门禁 | +| 全量 mypy 历史债务 | 4,348 / 250 文件 | 本分支为 Pydantic 字段补充描述并保留默认值，减少 3 项 assignment 错误；本次 NFO 返回类型与契约对齐，减少 2 项历史类型错误；本轮在消息、站点、诊断、备份、用户配置、订阅、AcoustID、TMDB、仪表板和命令生命周期边界补齐类型，历史债务再减少 53 项；TMDB v3 API 显式导出并保留集合 parts 的列表合同，逐文件逐错误码无增长；此前工作流筛选、动态插件路由和 stdio 流补齐边界类型，历史债务减少 3 项；Bitpt 与 CookieCloud 补齐边界类型，历史债务减少 16 项；知行站点解析器补齐数值属性与基类合同，历史债务减少 18 项；通知排版补齐 Slack 消息块类型，历史债务减少 2 项；工作流资源过滤改用领域对象调用过滤链，恢复的节点输出在消费前归一化，并收紧可空资源列表的类型低水位；消息媒体交互类型债务已清零，canonical Facade 与 endpoint 类型边界已补齐，低水位只允许继续下降；微信 ClawBot 入站 item_list 媒体解析改为按子项键名分派后，类型错误减少 4 项；站点解析器分享率改用浮点初值，类型错误减少 20 项；本次下载与文件安全修复再减少 3 项；Transmission 进度回退值归一化再减少 2 项；本批清理 Servarr、认证、存储、订阅策略和搜索/规则/通知 Schema 的 18 项类型错误，并修复系统配置中的 Python 2 异常语法；本批再清理订阅元数据、订阅写入、交互宿主、整理路径、删除统计和工作流动作的 14 项类型错误，逐文件逐错误码无增长；本批补齐 OCR 请求参数、工具 Schema 摘要和宿主模块配置快照的 5 项边界类型，逐文件逐错误码无增长；本批为 Rousi 用户消息分页解析补齐返回类型与数据结构兜底，减少 2 项类型错误；本批优先处理 TMDB v3 电影与电视剧对象模型，补齐 98 个同步/异步方法注解并减少 122 项历史类型错误；随后补齐剧集、季度、人物、搜索和趋势对象的 142 个方法注解，再减少 142 项类型错误；绿联 API 响应边界补齐具体泛型与运行时字典收窄，减少 31 项类型错误；运行时限流器补齐状态方法、装饰器边界和时间队列类型，减少 31 项类型错误；QQ Bot API 响应边界补齐具体泛型与 JSON 形状校验，减少 17 项类型错误；rTorrent 客户端清理 182 项错误，调用端同步明确字典合同，累计再减少 190 项错误；豆瓣 API、中心服务接口及订阅消费端补齐返回边界和参数收窄，结合 Context 方法签名与缓存代理类型清理，累计再减少 455 项错误；共享 HTTP 客户端清理 110 项错误，TMDB API 清理 84 项错误，索引器爬虫清理 87 项错误，并补充 U115、AliPan、OpenList 对可空流响应的防守；U115 其余存储基类契约债务暂留待测试完备后处理；缓存同步/异步继承冲突保留为设计债务，未纳入严格门禁 | | Ruff 历史诊断 | 73 | 低水位门禁通过，但规则集只覆盖 `E4/E7/E9/F/I` | | 覆盖率逐文件低水位 | 全 app（排除 app/plugins）当前聚合 77.68% | 存量文件比例不降；语句减少且未覆盖行数不增时允许比例变化，新文件至少 80% | diff --git a/mypy.ini b/mypy.ini index b959f7f12..ad563cbbf 100644 --- a/mypy.ini +++ b/mypy.ini @@ -7,6 +7,7 @@ follow_imports = skip show_error_codes = True pretty = True files = + app/modules/jellyfin/jellyfin.py, app/modules/ugreen/ugreen.py, app/adapters/external/ocr.py, app/agent/tools/catalog.py, diff --git a/tests/fixtures/architecture/mypy-baseline.json b/tests/fixtures/architecture/mypy-baseline.json index d6dfca1e5..1410a702e 100644 --- a/tests/fixtures/architecture/mypy-baseline.json +++ b/tests/fixtures/architecture/mypy-baseline.json @@ -1069,19 +1069,6 @@ "no-untyped-def": 1, "type-arg": 1 }, - "app/modules/jellyfin/jellyfin.py": { - "arg-type": 7, - "assignment": 4, - "dict-item": 1, - "no-any-return": 11, - "no-untyped-call": 2, - "no-untyped-def": 5, - "operator": 4, - "return": 1, - "type-arg": 9, - "union-attr": 1, - "var-annotated": 3 - }, "app/modules/listenbrainz/__init__.py": { "misc": 2, "no-any-return": 2 diff --git a/tests/test_jellyfin_typed_boundaries.py b/tests/test_jellyfin_typed_boundaries.py new file mode 100644 index 000000000..b6c94f394 --- /dev/null +++ b/tests/test_jellyfin_typed_boundaries.py @@ -0,0 +1,109 @@ +""" +验证 Jellyfin JSON 边界不会把空路径或标识变成文本。 +""" + +from unittest.mock import Mock + +import pytest + +from app.modules.jellyfin.jellyfin import Jellyfin + + +def _client(monkeypatch: pytest.MonkeyPatch, payload: object) -> Jellyfin: + """ + 注入离线响应，避免初始化期间查询真实服务器。 + """ + client = Jellyfin.__new__(Jellyfin) + client._host = "http://jellyfin.test/" + client._apikey = "test-key" + client.user = "user" + response = Mock() + response.json.return_value = payload + monkeypatch.setattr(client, "_request", Mock(return_value=Mock(get_res=Mock(return_value=response)))) + return client + + +@pytest.mark.parametrize("path", [None, "", "/media/电影.mkv"]) +def test_playback_path_preserves_nullable_text(monkeypatch: pytest.MonkeyPatch, path: object) -> None: + """ + 播放源路径的空值及空字符串原样返回，不产生字符串 None。 + """ + client = _client(monkeypatch, {"MediaSources": [{"Path": path}]}) + assert client.get_item_path_by_id("item") == path + + +@pytest.mark.parametrize("identifier", [None, "user-id", 123]) +def test_named_user_preserves_identifier_type(monkeypatch: pytest.MonkeyPatch, identifier: object) -> None: + """ + 按名称命中的用户标识保持字符串、整数或空值原样。 + """ + client = _client(monkeypatch, [{"Name": "admin", "Id": identifier}]) + assert client.get_user("admin") == identifier + + +def test_invalid_path_uses_existing_request_failure_fallback(monkeypatch: pytest.MonkeyPatch) -> None: + """ + 非文本路径在响应边界被拒绝，并由既有请求异常处理返回空值。 + """ + client = _client(monkeypatch, {"MediaSources": [{"Path": ["invalid"]}]}) + assert client.get_item_path_by_id("item") is None + + +def test_ancestor_field_preserves_arbitrary_json(monkeypatch: pytest.MonkeyPatch) -> None: + """ + 通用祖先字段读取保留嵌套 JSON，而不误标成纯字符串。 + """ + nested = {"Keys": [1, None, "value"]} + client = _client(monkeypatch, [{"Custom": nested}]) + assert client.get_itemId_ancestors("item", 0, "Custom") is nested + + +@pytest.mark.parametrize("method_name", ["get_data", "post_data"]) +def test_custom_request_integer_user_preserves_type_error( + monkeypatch: pytest.MonkeyPatch, method_name: str, +) -> None: + """ + 非零整数用户标识仍在 URL 替换阶段抛出 TypeError，不被请求异常处理吞掉。 + """ + client = _client(monkeypatch, {}) + client.user = 123 + with pytest.raises(TypeError): + getattr(client, method_name)("[HOST]Users/[USER]?api_key=[APIKEY]") + client._request.assert_not_called() + + +@pytest.mark.parametrize("method_name", ["get_data", "post_data"]) +def test_custom_request_zero_user_preserves_empty_replacement( + monkeypatch: pytest.MonkeyPatch, method_name: str, +) -> None: + """ + 值为零的用户标识沿用假值回退，替换为空字符串后正常发送请求。 + """ + client = _client(monkeypatch, {}) + client.user = 0 + result = getattr(client, method_name)("[HOST]Users/[USER]?api_key=[APIKEY]") + request = client._request.return_value + sender = request.get_res if method_name == "get_data" else request.post_res + assert result is sender.return_value + assert sender.call_args.kwargs["url"] == "http://jellyfin.test/Users/?api_key=test-key" + + +def test_library_folders_missing_paths_preserves_type_error(monkeypatch: pytest.MonkeyPatch) -> None: + """ + 媒体库缺少路径列表时仍抛出 TypeError，不能误判为已成功读取空库。 + """ + client = _client(monkeypatch, {}) + monkeypatch.setattr(client, "get_jellyfin_virtual_folders", Mock(return_value=[{"Id": "library"}])) + with pytest.raises(TypeError): + client.get_user_library_folders() + + +def test_library_folders_empty_paths_preserves_empty_result(monkeypatch: pytest.MonkeyPatch) -> None: + """ + 合法空路径列表表示没有同步目录，应返回空列表而不抛出异常。 + """ + client = _client(monkeypatch, {}) + monkeypatch.setattr( + client, "get_jellyfin_virtual_folders", Mock(return_value=[{"Id": "library", "Path": []}]), + ) + assert client.get_user_library_folders() == []