Shikong/Clash.Meta
1
0
Fork 0
mirror of https://gitclone.com/github.com/MetaCubeX/Clash.Meta synced 2024-11-09 02:41:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: Update v2 API field aliases to match raw field names, keeping model names unchanged.

Browse Source
This commit is contained in:
KT 2023-10-17 20:20:08 +08:00
parent 6c6b02cff3
commit 24011870ea
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
mihomo/models/player.py
View File

@ -18,12 +18,12 @@ class ForgottenHall(BaseModel):
- memory_of_chaos (`int`): The progress of the memory of chaos, or None if not applicable. - memory_of_chaos (`int`): The progress of the memory of chaos, or None if not applicable.
""" """
memory: int = Field(..., alias="pre_maze_group_index") memory: int = Field(..., alias="level")
"""The progress of the memory (pre_maze_group_index)""" """The progress of the memory (level)"""
memory_of_chaos_id: int = Field(..., alias="maze_group_id") memory_of_chaos_id: int = Field(..., alias="chaos_id")
"""The ID of the memory of chaos (maze_group_id)""" """The ID of the memory of chaos (chaos_id)"""
memory_of_chaos: int = Field(..., alias="maze_group_index") memory_of_chaos: int = Field(..., alias="chaos_level")
"""The progress of the memory of chaos (maze_group_index)""" """The progress of the memory of chaos (chaos_level)"""
class Player(BaseModel): class Player(BaseModel):
@ -64,10 +64,10 @@ class Player(BaseModel):
is_display: bool is_display: bool
"""Is the player's profile display enabled.""" """Is the player's profile display enabled."""
forgotten_hall: ForgottenHall | None = Field(None, alias="challenge_data") forgotten_hall: ForgottenHall | None = Field(None, alias="memory_data")
"""The progress of the Forgotten Hall (challenge_data)""" """The progress of the Forgotten Hall (memory_data)"""
simulated_universes: int = Field(0, alias="pass_area_progress") simulated_universes: int = Field(0, alias="universe_level")
"""Number of simulated universes passed (pass_area_progress)""" """Number of simulated universes passed (universe_level)"""
light_cones: int = Field(0, alias="light_cone_count") light_cones: int = Field(0, alias="light_cone_count")
"""Number of light cones owned""" """Number of light cones owned"""
characters: int = Field(0, alias="avatar_count") characters: int = Field(0, alias="avatar_count")
@ -82,3 +82,16 @@ class Player(BaseModel):
if isinstance(space_info, dict): if isinstance(space_info, dict):
data.update(space_info) data.update(space_info)
return data return data
@root_validator(pre=True)
def transform_for_backward_compatibility(cls, data):
if isinstance(data, dict):
if "pass_area_progress" in data and "universe_level" not in data:
data["universe_level"] = data["pass_area_progress"]
if "challenge_data" in data and "memory_data" not in data:
c: dict[str, int] = data["challenge_data"]
data["memory_data"] = {}
data["memory_data"]["level"] = c.get("pre_maze_group_index")
data["memory_data"]["chaos_id"] = c.get("maze_group_id")
data["memory_data"]["chaos_level"] = c.get("maze_group_index")
return data

2
pyproject.toml
View File

@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project] [project]
name = "mihomo" name = "mihomo"
version = "1.1.6" version = "1.1.7"
authors = [ authors = [
{ name="KT", email="xns77477@gmail.com" }, { name="KT", email="xns77477@gmail.com" },
] ]