ddapi 0.9.3__tar.gz → 0.10.0__tar.gz

{ddapi-0.9.3 → ddapi-0.10.0}/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.4
 Name: ddapi
-Version: 0.9.3
+Version: 0.10.0
 Summary: DDnet api
 Home-page: https://github.com/ByFox213/ddapi
 Author: ByFox
+License: "MIT"
 Project-URL: Github, https://github.com/ByFox213/ddapi
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License

{ddapi-0.9.3 → ddapi-0.10.0}/ddapi/ddapi/__init__.py

@@ -2,6 +2,6 @@
 from .main import DDnetApi, DDstats, Status
 from .scheme import *
 
-__version__ = "0.9.3"
+__version__ = "0.10.0"
 __author__ = 'ByFox'
 __LICENSE__ = "MIT"

{ddapi-0.9.3 → ddapi-0.10.0}/ddapi/ddapi/main.py

@@ -4,6 +4,7 @@ from .api import API
 from .scheme import *
 
 __all__ = (
+    "MasterEnum",
     "DDnetApi",
     "DDstats",
     "Status"
@@ -89,6 +90,26 @@ class DDstats(API):
     def powered() -> str:
         return DDstats().domain
 
+    async def profile(self, player_name: str) -> DProfile:
+        return await self._generate_model_instance(
+            f"https://{self.domain}/profile/json?player={quote(player_name)}",
+            DProfile,
+            "profile"
+        )
+
+    async def map(self, map_name: str) -> SMap:
+        return await self._generate_model_instance(
+            f"https://ddstats.tw/map/json?map={quote(map_name)}",
+            SMap
+        )
+
+    async def maps(self) -> Maps:
+        return await self._generate_model_instance(
+            f"https://{self.domain}/maps/json",
+            Maps,
+            "maps"
+        )
+
     async def player(self, player_name: str) -> Player:
         """Fetch player data from the API and return it as a dictionary."""
         return await self._generate_model_instance(
@@ -180,11 +201,11 @@ class Status(API):
         )
 
     async def server_history(self, ip: str, port: int | str) -> None:
-        # https://api.status.tw/server/{ip}/{port}/history
+        # TODO: https://api.status.tw/server/{ip}/{port}/history
         raise NotImplementedError()
 
     async def server_stats(self, ip: str, port: int | str) -> None:
-        # https://api.status.tw/server/{ip}/{port}/stats
+        # TODO: https://api.status.tw/server/{ip}/{port}/stats
         raise NotImplementedError()
 
     async def clan_list(self) -> ListPl:
@@ -214,7 +235,7 @@ class Status(API):
         )
 
     async def player_history(self, name: str) -> None:
-        # https://api.status.tw/player/name/{name}/history
+        # TODO:  https://api.status.tw/player/name/{name}/history
         raise NotImplementedError()
 
     async def stats(self) -> Stats:
@@ -224,9 +245,9 @@ class Status(API):
         )
 
     async def stats_players(self, t: str) -> None:
-        # https://api.status.tw/stats/players/day | week | month
+        # TODO: https://api.status.tw/stats/players/day | week | month
         raise NotImplementedError()
 
     async def stats_servers(self, t: str) -> None:
-        # https://api.status.tw/stats/servers/week | month
+        # TODO:  https://api.status.tw/stats/servers/week | month
         raise NotImplementedError()

{ddapi-0.9.3 → ddapi-0.10.0}/ddapi/ddapi/scheme/ddnet.py

@@ -297,3 +297,29 @@ class QueryMapData(BaseModel):
 
 class QueryMap(BaseModel):
     maps: list[QueryMapData]
+
+
+class DDStatusData(BaseModel):
+    name: str = None
+    type: str = None
+    host: str = None
+    location: str = None
+    online4: bool = None
+    online6: bool = None
+    uptime: str = None
+    load: float = None
+    network_rx: int = None
+    network_tx: int = None
+    packets_rx: int = None
+    packets_tx: int = None
+    cpu: int = None
+    memory_total: int = None
+    memory_used: int = None
+    swap_total: int = None
+    swap_used: int = None
+    hdd_total: int = None
+    hdd_used: int = None
+
+
+class DDStatus(BaseModel):
+    servers: list[DDStatusData]

{ddapi-0.9.3 → ddapi-0.10.0}/ddapi/ddapi/scheme/ddstats_tw.py

@@ -45,6 +45,10 @@ class Profile(BaseModel):
     skin_color_feet: Optional[int] = None
 
 
+class DProfile(BaseModel):
+    profile: Profile
+
+
 class DDMap(BaseModel):
     map: str
     server: str
@@ -173,7 +177,7 @@ class RecentTop10s(BaseModel):
     map: str
     time: float
     rank: int
-    timestamp: Optional[datetime]
+    timestamp: Optional[datetime] = None
     server: str
 
 
@@ -205,27 +209,74 @@ class Player(BaseModel):
     recent_top_10s: Optional[list[RecentTop10s]] = None
 
 
-class DDStatusData(BaseModel):
-    name: str = None
-    type: str = None
-    host: str = None
-    location: str = None
-    online4: bool = None
-    online6: bool = None
-    uptime: str = None
-    load: float = None
-    network_rx: int = None
-    network_tx: int = None
-    packets_rx: int = None
-    packets_tx: int = None
-    cpu: int = None
-    memory_total: int = None
-    memory_used: int = None
-    swap_total: int = None
-    swap_used: int = None
-    hdd_total: int = None
-    hdd_used: int = None
-
-
-class DDStatus(BaseModel):
-    servers: list[DDStatusData]
+class Maps(BaseModel):
+    maps: list[DDMap]
+
+
+class InfoSMap(BaseModel):
+    map: DDMap
+    finishes: int
+    finishes_rank: int
+    median_time: float
+
+
+class RankingSMap(BaseModel):
+    rank: int
+    timestamp: Optional[datetime] = None
+    name: str
+    time: float
+    map: str
+    server: str
+
+
+class TeamRankingSMap(BaseModel):
+    rank: int
+    timestamp: Optional[datetime] = None
+    id: list[int]
+    players: list[str]
+    time: float
+    map: str
+    server: str
+
+
+class TimeCpsSMap(BaseModel):
+    name: str
+    cp1: float
+    cp2: float
+    cp3: float
+    cp4: float
+    cp5: float
+    cp6: float
+    cp7: float
+    cp8: float
+    cp9: float
+    cp10: float
+    cp11: float
+    cp12: float
+    cp13: float
+    cp14: float
+    cp15: float
+    cp16: float
+    cp17: float
+    cp18: float
+    cp19: float
+    cp20: float
+    cp21: float
+    cp22: float
+    cp23: float
+    cp24: float
+    cp25: float
+    time: float
+
+
+class PlaytimeSMap(BaseModel):
+    name: str
+    seconds_played: int
+
+
+class SMap(BaseModel):
+    info: InfoSMap
+    rankings: list[RankingSMap]
+    team_rankings: list[TeamRankingSMap]
+    time_cps: list[TimeCpsSMap]
+    playtime: list[PlaytimeSMap]

{ddapi-0.9.3 → ddapi-0.10.0}/ddapi/ddapi.egg-info/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.4
 Name: ddapi
-Version: 0.9.3
+Version: 0.10.0
 Summary: DDnet api
 Home-page: https://github.com/ByFox213/ddapi
 Author: ByFox
+License: "MIT"
 Project-URL: Github, https://github.com/ByFox213/ddapi
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License

{ddapi-0.9.3 → ddapi-0.10.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = ddapi
-version = 0.9.3
+version = 0.10.0
 author = ByFox
 description = DDnet api
 long_description = file: README.md
@@ -8,10 +8,7 @@ long_description_content_type = text/markdown
 url = https://github.com/ByFox213/ddapi
 project_urls = 
 	github = https://github.com/ByFox213/ddapi
-classifiers = 
-	Programming Language :: Python :: 3
-	License :: OSI Approved :: MIT License
-	Operating System :: OS Independent
+license = "MIT"
 
 [options]
 package_dir = 

{ddapi-0.9.3 → ddapi-0.10.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="ddapi",
-    version="0.9.3",
+    version="0.10.0",
     author="ByFox",
     description="DDnet api",
     long_description=long_description,