GithubBackup/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-07-06 23:31:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix User-Agent

Browse Source
This commit is contained in:
jxxghp
2025-07-20 15:50:45 +08:00
parent d9e9edb2c4
commit 776f629771
7 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/api/endpoints/system.py
View File

@@ -95,7 +95,7 @@ def fetch_image(
# 请求远程图片 # 请求远程图片
referer = "https://movie.douban.com/" if "doubanio.com" in url else None referer = "https://movie.douban.com/" if "doubanio.com" in url else None
proxies = settings.PROXY if proxy else None proxies = settings.PROXY if proxy else None
response = RequestUtils(ua=settings.USER_AGENT, proxies=proxies, referer=referer, response = RequestUtils(ua=settings.NORMAL_USER_AGENT, proxies=proxies, referer=referer,
accept_type="image/avif,image/webp,image/apng,*/*").get_res(url=url) accept_type="image/avif,image/webp,image/apng,*/*").get_res(url=url)
if not response: if not response:
raise HTTPException(status_code=502, detail="Failed to fetch the image from the remote server") raise HTTPException(status_code=502, detail="Failed to fetch the image from the remote server")
@@ -490,7 +490,7 @@ def nettest(
proxies=settings.PROXY if proxy else None, proxies=settings.PROXY if proxy else None,
headers=headers, headers=headers,
timeout=10, timeout=10,
ua=settings.USER_AGENT, ua=settings.NORMAL_USER_AGENT,
).get_res(url) ).get_res(url)
# 计时结束的毫秒数 # 计时结束的毫秒数
end_time = datetime.now() end_time = datetime.now()

2
app/chain/media.py
View File

@@ -454,7 +454,7 @@ class MediaChain(ChainBase):
""" """
try: try:
logger.info(f"正在下载图片：{_url} ...") logger.info(f"正在下载图片：{_url} ...")
r = RequestUtils(proxies=settings.PROXY, ua=settings.USER_AGENT).get_res(url=_url) r = RequestUtils(proxies=settings.PROXY, ua=settings.NORMAL_USER_AGENT).get_res(url=_url)
if r: if r:
return r.content return r.content
else: else:

2
app/chain/recommend.py
View File

@@ -130,7 +130,7 @@ class RecommendChain(ChainBase, metaclass=Singleton):
# 请求远程图片 # 请求远程图片
referer = "https://movie.douban.com/" if "doubanio.com" in url else None referer = "https://movie.douban.com/" if "doubanio.com" in url else None
proxies = settings.PROXY if not referer else None proxies = settings.PROXY if not referer else None
response = RequestUtils(ua=settings.USER_AGENT, proxies=proxies, referer=referer).get_res(url=url) response = RequestUtils(ua=settings.NORMAL_USER_AGENT, proxies=proxies, referer=referer).get_res(url=url)
if not response: if not response:
logger.debug(f"Empty response for URL: {url}") logger.debug(f"Empty response for URL: {url}")
return return

11
app/core/config.py
View File

@@ -517,6 +517,13 @@ class Settings(BaseSettings, ConfigModel, LogConfigModel):
""" """
return f"{self.PROJECT_NAME}/{APP_VERSION[1:]} ({platform.system()} {platform.release()}; {SystemUtils.cpu_arch()})" return f"{self.PROJECT_NAME}/{APP_VERSION[1:]} ({platform.system()} {platform.release()}; {SystemUtils.cpu_arch()})"
@property
def NORMAL_USER_AGENT(self) -> str:
"""
默认浏览器用户代理字符串
"""
return "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36"
@property @property
def INNER_CONFIG_PATH(self): def INNER_CONFIG_PATH(self):
return self.ROOT_PATH / "config" return self.ROOT_PATH / "config"
@@ -613,7 +620,7 @@ class Settings(BaseSettings, ConfigModel, LogConfigModel):
if self.GITHUB_TOKEN: if self.GITHUB_TOKEN:
return { return {
"Authorization": f"Bearer {self.GITHUB_TOKEN}", "Authorization": f"Bearer {self.GITHUB_TOKEN}",
"User-Agent": self.USER_AGENT, "User-Agent": self.NORMAL_USER_AGENT,
} }
return {} return {}
@@ -642,7 +649,7 @@ class Settings(BaseSettings, ConfigModel, LogConfigModel):
continue continue
headers[repo_info] = { headers[repo_info] = {
"Authorization": f"Bearer {token}", "Authorization": f"Bearer {token}",
"User-Agent": self.USER_AGENT, "User-Agent": self.NORMAL_USER_AGENT,
} }
except Exception as e: except Exception as e:
print(f"处理令牌对 '{token_pair}' 时出错: {e}") print(f"处理令牌对 '{token_pair}' 时出错: {e}")

2
app/modules/douban/apiv2.py
View File

@@ -234,7 +234,7 @@ class DoubanApi(metaclass=WeakSingleton):
if '_ts' in params: if '_ts' in params:
params.pop('_ts') params.pop('_ts')
resp = RequestUtils( resp = RequestUtils(
ua=settings.USER_AGENT, ua=settings.NORMAL_USER_AGENT,
session=self._session, session=self._session,
).post_res(url=req_url, data=params) ).post_res(url=req_url, data=params)
if resp is not None and resp.status_code == 400 and "rate_limit" in resp.text: if resp is not None and resp.status_code == 400 and "rate_limit" in resp.text:

2
app/modules/telegram/telegram.py
View File

@@ -524,7 +524,7 @@ class Telegram:
:param reply_markup: 内联键盘 :param reply_markup: 内联键盘
""" """
if image: if image:
res = RequestUtils(proxies=settings.PROXY, ua=settings.USER_AGENT).get_res(image) res = RequestUtils(proxies=settings.PROXY, ua=settings.NORMAL_USER_AGENT).get_res(image)
if res is None: if res is None:
raise Exception("获取图片失败") raise Exception("获取图片失败")
if res.content: if res.content:

2
app/modules/themoviedb/tmdbapi.py
View File

@@ -514,7 +514,7 @@ class TmdbApi:
return {} return {}
logger.info("正在从TheDbMovie网站查询：%s ..." % name) logger.info("正在从TheDbMovie网站查询：%s ..." % name)
tmdb_url = "https://www.themoviedb.org/search?query=%s" % quote(name) tmdb_url = "https://www.themoviedb.org/search?query=%s" % quote(name)
res = RequestUtils(timeout=5, ua=settings.USER_AGENT, proxies=settings.PROXY).get_res(url=tmdb_url) res = RequestUtils(timeout=5, ua=settings.NORMAL_USER_AGENT, proxies=settings.PROXY).get_res(url=tmdb_url)
if res is None: if res is None:
return None return None
if res.status_code == 429: if res.status_code == 429: