v2.4.3

- 用户界面支持多语言
- 支持设定TheMovieDb元数据语言
- 订阅成功消息增加了演员和简介
- 修复问题

提醒：如升级后页面空白，请强制刷新或者清理浏览器缓存

app/api/endpoints/login.py

@@ -77,5 +77,7 @@ def wallpapers() -> Any:
         return WebUtils.get_bing_wallpapers()
     elif settings.WALLPAPER == "mediaserver":
         return MediaServerChain().get_latest_wallpapers()
-    else:
+    elif settings.WALLPAPER == "tmdb":
         return TmdbChain().get_trending_wallpapers()
+    else:
+        return []

app/api/endpoints/system.py

@@ -171,10 +171,13 @@ def cache_img(
 
 
 @router.get("/global", summary="查询非敏感系统设置", response_model=schemas.Response)
-def get_global_setting():
+def get_global_setting(token: str):
     """
-    查询非敏感系统设置（无需鉴权）
+    查询非敏感系统设置（默认鉴权）
     """
+    if token != "moviepilot":
+        raise HTTPException(status_code=403, detail="Forbidden")
+
     # FIXME: 新增敏感配置项时要在此处添加排除项
     info = settings.dict(
         exclude={"SECRET_KEY", "RESOURCE_SECRET_KEY", "API_TOKEN", "TMDB_API_KEY", "TVDB_API_KEY", "FANART_API_KEY",

app/api/servarr.py

@@ -518,32 +518,33 @@ def arr_series_lookup(term: str, _: Annotated[str, Depends(verify_apikey)], db:
     """
     查询Sonarr剧集 term: `tvdb:${id}` title
     """
+    # 季信息
+    seas: List[int] = []
+
     # 获取TVDBID
     if not term.startswith("tvdb:"):
         mediainfo = MediaChain().recognize_media(meta=MetaInfo(term),
                                                  mtype=MediaType.TV)
         if not mediainfo:
             return [SonarrSeries()]
-        tvdbid = mediainfo.tvdb_id
-        if not tvdbid:
-            return [SonarrSeries()]
+
+        # 季信息
+        if mediainfo.seasons:
+            seas = list(mediainfo.seasons)
     else:
-        mediainfo = None
         tvdbid = int(term.replace("tvdb:", ""))
 
-    # 查询TVDB信息
-    tvdbinfo = MediaChain().tvdb_info(tvdbid=tvdbid)
-    if not tvdbinfo:
-        return [SonarrSeries()]
+        # 查询TVDB信息
+        tvdbinfo = MediaChain().tvdb_info(tvdbid=tvdbid)
+        if not tvdbinfo:
+            return [SonarrSeries()]
 
-    # 季信息
-    seas: List[int] = []
-    sea_num = tvdbinfo.get('season')
-    if sea_num:
-        seas = list(range(1, int(sea_num) + 1))
+        # 季信息
+        sea_num = tvdbinfo.get('season')
+        if sea_num:
+            seas = list(range(1, int(sea_num) + 1))
 
-    # 根据TVDB查询媒体信息
-    if not mediainfo:
+        # 根据TVDB查询媒体信息
         mediainfo = MediaChain().recognize_media(meta=MetaInfo(tvdbinfo.get('seriesName')),
                                                  mtype=MediaType.TV)
 

app/chain/subscribe.py

@@ -233,6 +233,10 @@ class SubscribeChain(ChainBase, metaclass=Singleton):
                 text = f"评分：{mediainfo.vote_average}，来自用户：{username}"
             else:
                 text = f"评分：{mediainfo.vote_average}"
+            if mediainfo.actors:
+                text += f"\n演员：{'、 '.join([actor['name'] for actor in mediainfo.actors])}"
+            if mediainfo.overview:
+                text += f"\n简介：{mediainfo.overview}"
             if mediainfo.type == MediaType.TV:
                 link = settings.MP_DOMAIN('#/subscribe/tv?tab=mysub')
             else:

app/core/config.py

@@ -101,6 +101,8 @@ class ConfigModel(BaseModel):
     TMDB_IMAGE_DOMAIN: str = "image.tmdb.org"
     # TMDB API地址
     TMDB_API_DOMAIN: str = "api.themoviedb.org"
+    # TMDB元数据语言
+    TMDB_LOCALE: str = "zh"
     # TMDB API Key
     TMDB_API_KEY: str = "db55323b8d3e4154498498a75642b381"
     # TVDB API Key
@@ -238,6 +240,7 @@ class ConfigModel(BaseModel):
     SECURITY_IMAGE_DOMAINS: List[str] = Field(
         default_factory=lambda: ["image.tmdb.org",
                                  "static-mdb.v.geilijiasu.com",
+                                 "bing.com",
                                  "doubanio.com",
                                  "lain.bgm.tv",
                                  "raw.githubusercontent.com",

app/modules/themoviedb/__init__.py

@@ -268,7 +268,7 @@ class TheMovieDbModule(_ModuleBase):
                             # 当前季第一季时间
                             first_date = episodes[0].get("air_date")
                             # 判断是不是日期格式
-                            if re.match(r"^\d{4}-\d{2}-\d{2}$", first_date):
+                            if first_date and re.match(r"^\d{4}-\d{2}-\d{2}$", first_date):
                                 season_years[season] = str(first_date).split("-")[0]
                     if season_years:
                         mediainfo.season_years = season_years

app/modules/themoviedb/tmdbapi.py

@@ -33,7 +33,7 @@ class TmdbApi:
         # APIKEY
         self.tmdb.api_key = settings.TMDB_API_KEY
         # 语种
-        self.tmdb.language = 'zh'
+        self.tmdb.language = settings.TMDB_LOCALE
         # 代理
         self.tmdb.proxies = settings.PROXY
         # 调试模式
@@ -632,7 +632,8 @@ class TmdbApi:
             # 转换多语种标题
             self.__update_tmdbinfo_extra_title(tmdb_info)
             # 转换中文标题
-            self.__update_tmdbinfo_cn_title(tmdb_info)
+            if settings.TMDB_LOCALE == "zh":
+                self.__update_tmdbinfo_cn_title(tmdb_info)
 
         return tmdb_info
 

docker/nginx.template.conf

@@ -34,11 +34,6 @@ http {
         listen [::]:${NGINX_PORT};
         server_name moviepilot;
 
-        # HTTPS重定向
-        if (${ENABLE_SSL} = 'true') {
-            return 301 https://$host$request_uri;
-        }
-
         # 公共配置
         include common.conf;
     }

version.py

@@ -1,2 +1,2 @@
-APP_VERSION = 'v2.4.1'
-FRONTEND_VERSION = 'v2.4.1'
+APP_VERSION = 'v2.4.3'
+FRONTEND_VERSION = 'v2.4.3'