fix: remove tmdb manual gzip fallback

This commit is contained in:
jxxghp
2026-05-20 17:09:31 +08:00
parent 8f117d79f2
commit 068d0af4ca
2 changed files with 2 additions and 67 deletions
+1 -38
View File
@@ -1,8 +1,6 @@
# -*- coding: utf-8 -*-
import asyncio
import gzip
import json as jsonlib
import logging
import time
from copy import deepcopy
@@ -21,7 +19,6 @@ logger = logging.getLogger(__name__)
class TMDb(object):
_RESPONSE_SNAPSHOT_MARKER = "__mp_tmdb_response_snapshot__"
_JSON_DECODE_FAILED = object()
def __init__(self, session=None, language=None):
self._api_key = settings.TMDB_API_KEY
@@ -166,42 +163,8 @@ class TMDb(object):
try:
return response.json()
except (ValueError, UnicodeDecodeError) as err:
# httpx.Response.json() 在响应体是压缩字节或错误编码时会直接抛 UnicodeDecodeError
# 先尝试兼容未被客户端解压的 gzip JSON,仍失败时再收敛成 TMDbException。
json_data = cls._decode_compressed_response_json(response)
if json_data is not cls._JSON_DECODE_FAILED:
return json_data
raise TMDbException(cls._build_invalid_json_message(response, err)) from err
@classmethod
def _decode_compressed_response_json(cls, response):
"""
尝试解析未被HTTP客户端自动解压的压缩JSON响应。
"""
response_content = getattr(response, "content", b"") or b""
if isinstance(response_content, str):
response_content = response_content.encode("utf-8")
if not isinstance(response_content, (bytes, bytearray)):
return cls._JSON_DECODE_FAILED
content_bytes = bytes(response_content)
content_encoding = cls._get_header_value(
getattr(response, "headers", {}) or {},
"Content-Encoding",
) or ""
encodings = {
encoding.strip().lower()
for encoding in str(content_encoding).split(",")
if encoding.strip()
}
if "gzip" not in encodings and not content_bytes.startswith(b"\x1f\x8b"):
return cls._JSON_DECODE_FAILED
try:
return jsonlib.loads(gzip.decompress(content_bytes))
except (OSError, EOFError, ValueError, UnicodeDecodeError):
return cls._JSON_DECODE_FAILED
@staticmethod
def _get_header_value(headers, name):
"""
@@ -255,7 +218,7 @@ class TMDb(object):
if content_encoding:
message_parts.append(f"Content-Encoding{content_encoding}")
if is_encoding_error:
message_parts.append("响应内容编码错误已省略")
message_parts.append("响应内容编码异常,已省略原始内容")
elif response_text:
message_parts.append(f"响应内容:{response_text!r}")
else: