nas/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-10-31 12:24:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(schemas): 保持内部导入为私有，避免 MetaBase.to_dict 导出无 setter 属性

Browse Source
This commit is contained in:
jxxghp
2026-09-10 20:23:31 +08:00
parent 60a95090b6
commit e857e2cf04
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/domain/meta/metabase.py
View File

@@ -770,5 +770,4 @@ class MetaBase(object):
dicts["edition"] = self.edition
dicts["name"] = self.name
dicts["episode_list"] = self.episode_list
dicts["season_list"] = self.season_list
return dicts

12
app/schemas/context.py
View File

@@ -1,13 +1,13 @@
from typing import Annotated, Any, Dict, List, Optional, Union
from pydantic import BaseModel, Discriminator, Field, PrivateAttr, RootModel, Tag, model_validator
from pydantic import BaseModel, Discriminator, Field, PrivateAttr as _PrivateAttr, RootModel, Tag, model_validator
from app.schemas.category import ClassificationFactValue, ClassificationResult
from app.schemas.common import JsonData
from app.schemas.media import OptionalMediaIdentityMixin
from app.schemas.music import MusicArtistInfo as _MusicArtistInfo
from app.schemas.music import MusicInfo, MusicMeta
from app.schemas.types import MediaSource, MediaType
from app.schemas.types import MediaSource, MediaType as _MediaType
class MetaInfo(OptionalMediaIdentityMixin, BaseModel):
@@ -75,7 +75,7 @@ class MetaInfo(OptionalMediaIdentityMixin, BaseModel):
# 显式媒体数据源原生ID
media_id: Optional[str] = None
_season_list: Optional[List[int]] = PrivateAttr(default=None)
_season_list: Optional[List[int]] = _PrivateAttr(default=None)
@model_validator(mode="wrap")
@classmethod
@@ -95,7 +95,7 @@ class MetaInfo(OptionalMediaIdentityMixin, BaseModel):
if self._season_list is not None:
return self._season_list
if self.begin_season is None:
if self.type in (MediaType.TV, MediaType.TV.value):
if self.type in (_MediaType.TV, _MediaType.TV.value):
return [1]
return []
if self.end_season is not None:
@@ -115,7 +115,7 @@ class MetaInfo(OptionalMediaIdentityMixin, BaseModel):
else "S%s-S%s" % \
(str(self.begin_season).rjust(2, "0"),
str(self.end_season).rjust(2, "0"))
if self.type in (MediaType.TV, MediaType.TV.value):
if self.type in (_MediaType.TV, _MediaType.TV.value):
return "S01"
return ""
@@ -124,7 +124,7 @@ class MetaInfo(OptionalMediaIdentityMixin, BaseModel):
"""返回 begin_season 的数字，电视剧没有季的返回1。"""
if self.begin_season is not None:
return str(self.begin_season)
if self.type in (MediaType.TV, MediaType.TV.value):
if self.type in (_MediaType.TV, _MediaType.TV.value):
return "1"
return ""