ddapi 0.7.2__tar.gz → 0.8.1__tar.gz

{ddapi-0.7.2 → ddapi-0.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ddapi
-Version: 0.7.2
+Version: 0.8.1
 Summary: DDnet api
 Home-page: https://github.com/ByFox213/ddapi
 Author: ByFox
@@ -21,19 +21,23 @@ Dynamic: requires-python
 Dynamic: summary
 
 ddapi is an api from the ddnet and qwik website
+
 ## Installation
 
 ```bash
   pip install ddapi
 ```
+
 or
+
 ```bash
   pip install git+https://github.com/ByFox213/ddapi
 ```
-    
+
 ## Usage/Examples
 
 DDnet
+
 ```python
 import asyncio
 from ddapi import DDnetApi, DDPlayer
@@ -45,6 +49,7 @@ async def main():
     user: DDPlayer = await obj.player(nickname)
     if user is None:
         return "Player not found"
+
     print(f"{user.player}: {user.points.points}")
     # Cor: 31473 
     await obj.close()  # Closing client Not necessary
@@ -53,10 +58,10 @@ async def main():
 
 asyncio.run(main())
 ```
+
 Tested on Python
 | 3.9 | 3.10 | 3.11 | 3.12 |
 |-----|------|------|------|
-| ?   | ?    |  ✅  | ?    |
-
+| ? | ? | ✅ | ✅ |
 
 [other examples](https://github.com/ByFox213/ddapi/tree/main/example)

{ddapi-0.7.2 → ddapi-0.8.1}/README.md

@@ -1,17 +1,21 @@
 ddapi is an api from the ddnet and qwik website
+
 ## Installation
 
 ```bash
   pip install ddapi
 ```
+
 or
+
 ```bash
   pip install git+https://github.com/ByFox213/ddapi
 ```
-    
+
 ## Usage/Examples
 
 DDnet
+
 ```python
 import asyncio
 from ddapi import DDnetApi, DDPlayer
@@ -23,6 +27,7 @@ async def main():
     user: DDPlayer = await obj.player(nickname)
     if user is None:
         return "Player not found"
+
     print(f"{user.player}: {user.points.points}")
     # Cor: 31473 
     await obj.close()  # Closing client Not necessary
@@ -31,10 +36,10 @@ async def main():
 
 asyncio.run(main())
 ```
+
 Tested on Python
 | 3.9 | 3.10 | 3.11 | 3.12 |
 |-----|------|------|------|
-| ?   | ?    |  ✅  | ?    |
-
+| ? | ? | ✅ | ✅ |
 
 [other examples](https://github.com/ByFox213/ddapi/tree/main/example)

{ddapi-0.7.2 → ddapi-0.8.1}/ddapi/ddapi/__init__.py

@@ -1,7 +1,7 @@
 """the module is made for the convenience of users to download and use"""
 from .main import DDnetApi, DDstats, Status
-from .dataclass import *
+from .scheme import *
 
-__version__ = "0.6.0"
+__version__ = "0.8.1"
 __author__ = 'ByFox'
 __LICENSE__ = "MIT"

ddapi-0.7.2/ddapi/ddapi/deflt.py → ddapi-0.8.1/ddapi/ddapi/api.py

@@ -1,5 +1,5 @@
 from abc import ABC
-from typing import Union, Optional, TypeVar, Type, Any
+from typing import Optional, TypeVar, Type, Any
 
 import aiohttp
 from aiohttp import ClientSession, ClientConnectorError
@@ -14,23 +14,21 @@ class API(ABC):
             session: ClientSession = None,
             json_loads: Any = DEFAULT_JSON_DECODER
     ):
-        self.session = session
+        self.__session = session
         self.json_loads = json_loads
 
     @staticmethod
-    def powered() -> str:
-        """Return an empty string."""
-        return ''
+    def powered() -> None:
+        return None
 
-    async def _get(self, url: str) -> Union[dict, None]:
+    async def _get(self, url: str) -> Optional[dict]:
         """Send a GET request to the given URL and return the response as JSON."""
-        if self.session is None:
-            self.session = aiohttp.ClientSession()
+        if self.__session is None:
+            self.__session = aiohttp.ClientSession()
+
         try:
-            async with self.session.get(url) as req:
-                if req.status == 200:
-                    return await req.json(loads=self.json_loads)
-                return
+            async with self.__session.get(url) as req:
+                return await req.json(loads=self.json_loads) if req.status == 200 else None
         except ClientConnectorError:
             return
 
@@ -38,7 +36,7 @@ class API(ABC):
             self,
             url: str,
             model: Type[ModelType],
-            k: str = None
+            k: Optional[str] = None
     ) -> Optional[ModelType]:
         """Generate a model instance from the given URL and optional keyword arguments.
 
@@ -54,11 +52,15 @@ class API(ABC):
         if dat is None or not dat:
             return
 
-        data_to_pass = {k: dat} if k else dat
+        data_to_pass = {k: dat} if k is not None else dat
         return model(**data_to_pass)
 
+    async def is_closed(self) -> bool:
+        """True is closed, False otherwise."""
+        return self.__session is None or self.__session.closed
+
     async def close(self) -> None:
         """Close the aiohttp session."""
-        if self.session:
-            await self.session.close()
-            self.session = None
+        if self.__session is not None:
+            await self.__session.close()
+        self.__session = None

ddapi-0.8.1/ddapi/ddapi/main.py

@@ -0,0 +1,173 @@
+from typing import Union
+from urllib.parse import quote
+
+from .api import API
+from .scheme import DDPlayer, Master, Query, DMap, DDStatus, Player, MasterTw, ServerTwOne, ChartEnum, Charts
+
+__all__ = (
+    "DDnetApi",
+    "DDstats",
+    "Status"
+)
+
+
+class DDnetApi(API):
+    def __init__(self):
+        super().__init__()
+        self.domain = "ddnet.org"
+
+    @staticmethod
+    def powered() -> str:
+        return DDnetApi().domain
+
+    async def player(self, player_name: str) -> DDPlayer:
+        """Fetch player data from the API and return it as a dictionary."""
+        return await self._generate_model_instance(
+            f"https://{self.domain}/players/?json2={quote(player_name)}",
+            DDPlayer
+        )
+
+    async def status(self) -> Union[DDStatus, None]:
+        return await self._generate_model_instance(
+            f"https://{self.domain}/status/json/stats.json",
+            DDStatus
+        )
+
+    async def query(self, player: str) -> Union[Query, None]:
+        return await self._generate_model_instance(
+            f"https://{self.domain}/players/?query={quote(player)}",
+            Query,
+            "data"
+        )
+
+    async def master(self) -> Union[Master, None]:
+        return await self._generate_model_instance(
+            f"https://master1.{self.domain}/ddnet/15/servers.json",
+            Master
+        )
+
+    async def map(self, map_name: str) -> Union[DMap, None]:
+        return await self._generate_model_instance(
+            f"https://{self.domain}/maps/?json={quote(map_name)}",
+            DMap
+        )
+
+
+class DDstats(API):
+    def __init__(self):
+        super().__init__()
+        self.domain = 'ddstats.tw'
+
+    @staticmethod
+    def powered() -> str:
+        return DDstats().domain
+
+    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(
+            f"https://{self.domain}/player/json?player={quote(player_name)}",
+            Player
+        )
+
+
+class Status(API):
+    def __init__(self):
+        super().__init__()
+        self.domain = 'status.tw'
+
+    @staticmethod
+    def powered() -> str:
+        return Status().domain
+
+    async def info(self) -> None:
+        # https://api.status.tw/info
+        raise NotImplementedError()
+
+    async def master_bans(self) -> None:
+        # https://api.status.tw/master/bans/list
+        raise NotImplementedError()
+
+    async def map_list(self) -> None:
+        # https://api.status.tw/map/list
+        raise NotImplementedError()
+
+    async def map(self, name: str) -> None:
+        # https://api.status.tw/map/name/{name}
+        raise NotImplementedError()
+
+    async def gametype_list(self) -> None:
+        # https://api.status.tw/gametype/list
+        raise NotImplementedError()
+
+    async def gametype(self, name: str) -> None:
+        # https://api.status.tw/gametype/name/{name}
+        raise NotImplementedError()
+
+    async def version_list(self) -> None:
+        # https://api.status.tw/version/list
+        raise NotImplementedError()
+
+    async def version(self, name: str) -> None:
+        # https://api.status.tw/version/name/{name}
+        raise NotImplementedError()
+
+    async def server_list(self) -> MasterTw:
+        """Fetch player data from the API and return it as a dictionary."""
+        return await self._generate_model_instance(
+            f"https://api.{self.domain}/server/list",
+            MasterTw,
+            "servers"
+        )
+
+    async def server(self, ip: str, port: Union[int, str]) -> ServerTwOne:
+        return await self._generate_model_instance(
+            f"https://api.{self.domain}/server/{quote(ip)}/{port}",
+            ServerTwOne,
+        )
+
+    async def server_charts(self, ip: str, port: Union[int, str], chart: ChartEnum = ChartEnum.day) -> Charts:
+        return await self._generate_model_instance(
+            f"https://api.{self.domain}/server/{quote(ip)}/{port}/chart/{chart}",
+            Charts,
+            "charts"
+        )
+
+    async def server_history(self, ip: str, port: Union[int, str]) -> None:
+        # https://api.status.tw/server/{ip}/{port}/history
+        raise NotImplementedError()
+
+    async def server_stats(self, ip: str, port: Union[int, str]) -> None:
+        # https://api.status.tw/server/{ip}/{port}/stats
+        raise NotImplementedError()
+
+    async def clan_list(self) -> None:
+        # https://api.status.tw/clan/list
+        raise NotImplementedError()
+
+    async def clan(self, name: str) -> None:
+        # https://api.status.tw/clan/name/{name}
+        raise NotImplementedError()
+
+    async def player_list(self) -> None:
+        # https://api.status.tw/player/list
+        raise NotImplementedError()
+
+    async def player(self, name: str) -> None:
+        # https://api.status.tw/player/name/{name}
+        raise NotImplementedError()
+
+    async def player_history(self, name: str) -> None:
+        # https://api.status.tw/player/name/{name}/history
+        raise NotImplementedError()
+
+    async def stats(self) -> None:
+        # https://api.status.tw/stats
+        raise NotImplementedError()
+
+    async def stats_players(self, t: str) -> None:
+        # 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
+        raise NotImplementedError()

ddapi-0.8.1/ddapi/ddapi/scheme/__init__.py

@@ -0,0 +1,3 @@
+from .ddnet import *
+from .status_tw import *
+from .ddstats_tw import *

ddapi-0.8.1/ddapi/ddapi/scheme/ddnet.py

@@ -0,0 +1,132 @@
+# ddnet
+from typing import Optional
+
+from pydantic import BaseModel, Field
+
+
+class DPoints(BaseModel):
+    total: int
+    points: Optional[int] = Field(default=None)
+    rank: Optional[int] = Field(default=None)
+
+
+class MaxFinishes(BaseModel):
+    rank: int
+    player: str
+    num: int
+    time: float
+    min_timestamp: int
+    max_timestamp: int
+
+
+class DDRanks(BaseModel):
+    rank: int
+    player: str
+    time: float
+    timestamp: int
+    country: str
+
+
+class DDTeamRanks(BaseModel):
+    rank: int
+    players: list[str]
+    time: float
+    timestamp: int
+    country: str
+
+
+class DMap(BaseModel):
+    name: str
+    website: str
+    thumbnail: str
+    web_preview: str
+    type: str
+    points: int
+    difficulty: int
+    mapper: str
+    release: Optional[int] = None
+    median_time: float
+    first_finish: int
+    last_finish: int
+    finishes: int
+    finishers: int
+    biggest_team: int
+    width: int
+    height: int
+    tiles: list[str]
+    team_ranks: list[DDTeamRanks]
+    ranks: list[DDRanks]
+    max_finishes: list[MaxFinishes]
+
+
+class DRank(BaseModel):
+    points: Optional[int] = None
+    rank: Optional[int] = None
+
+
+class FirstFinish(BaseModel):
+    timestamp: float
+    map: str
+    time: float
+
+
+class LastFinish(BaseModel):
+    timestamp: float
+    map: str
+    time: float
+    country: str
+    type: Optional[str] = None
+
+
+class FavoritePartner(BaseModel):
+    name: str
+    finishes: int
+
+
+class DData(BaseModel):
+    points: Optional[DPoints] = Field(default=None)
+    team_rank: Optional[DRank] = Field(default=None)
+    rank: Optional[DRank] = Field(default=None)
+    maps: Optional[dict] = Field(default=None)
+
+
+class DDType(BaseModel):
+    Novice: Optional[DData] = None
+    Moderate: Optional[DData] = None
+    Brutal: Optional[DData] = None
+    Insane: Optional[DData] = None
+    Dummy: Optional[DData] = None
+    DDmaX_Easy: Optional[DData] = Field(default=None, validation_alias='DDmaX.Easy')
+    DDmaX_Next: Optional[DData] = Field(default=None, validation_alias='DDmaX.Next')
+    DDmaX_Nut: Optional[DData] = Field(default=None, validation_alias='DDmaX.Nut')
+    DDmaX_Pro: Optional[DData] = Field(default=None, validation_alias='DDmaX.Pro')
+    Oldschool: Optional[DData] = Field(default=None)
+    Race: Optional[DData] = None
+    Solo: Optional[DData] = None
+    total: Optional[DData] = None
+
+
+class Activity(BaseModel):
+    date: str
+    hours_played: int
+
+
+class FavoriteServer(BaseModel):
+    server: str
+
+
+class DDPlayer(BaseModel):
+    player: str
+    points: DPoints
+    team_rank: Optional[DRank] = None
+    rank: Optional[DRank] = None
+    points_last_year: Optional[DRank] = None
+    points_last_month: Optional[DRank] = None
+    points_last_week: Optional[DRank] = None
+    favorite_server: FavoriteServer
+    first_finish: FirstFinish
+    last_finishes: list[LastFinish]
+    favorite_partners: Optional[list[FavoritePartner]] = None
+    types: DDType
+    activity: list[Activity]
+    hours_played_past_365_days: int

ddapi-0.7.2/ddapi/ddapi/dataclass.py → ddapi-0.8.1/ddapi/ddapi/scheme/ddstats_tw.py

@@ -1,143 +1,13 @@
-# pylint: disable-all
+# ddstats.tw
 from collections import Counter
 from datetime import datetime
-from typing import Optional, Union, Any
+from typing import Any, Union, Optional
+
 from pydantic import BaseModel, Field
 
 rm_list = ["DD-Persian", "/vDQMHSss8W", '']
 
 
-# ddnet
-class DPoints(BaseModel):
-    total: int
-    points: Optional[int] = Field(default=None)
-    rank: Optional[int] = Field(default=None)
-
-
-class MaxFinishes(BaseModel):
-    rank: int
-    player: str
-    num: int
-    time: float
-    min_timestamp: int
-    max_timestamp: int
-
-
-class DDRanks(BaseModel):
-    rank: int
-    player: str
-    time: float
-    timestamp: int
-    country: str
-
-
-class DDTeamRanks(BaseModel):
-    rank: int
-    players: list[str]
-    time: float
-    timestamp: int
-    country: str
-
-
-class DMap(BaseModel):
-    name: str
-    website: str
-    thumbnail: str
-    web_preview: str
-    type: str
-    points: int
-    difficulty: int
-    mapper: str
-    release: Optional[int] = None
-    median_time: float
-    first_finish: int
-    last_finish: int
-    finishes: int
-    finishers: int
-    biggest_team: int
-    width: int
-    height: int
-    tiles: list[str]
-    team_ranks: list[DDTeamRanks]
-    ranks: list[DDRanks]
-    max_finishes: list[MaxFinishes]
-
-
-class DRank(BaseModel):
-    points: Optional[int] = None
-    rank: Optional[int] = None
-
-
-class FirstFinish(BaseModel):
-    timestamp: float
-    map: str
-    time: float
-
-
-class LastFinish(BaseModel):
-    timestamp: float
-    map: str
-    time: float
-    country: str
-    type: Optional[str] = None
-
-
-class FavoritePartner(BaseModel):
-    name: str
-    finishes: int
-
-
-class DData(BaseModel):
-    points: Optional[DPoints] = Field(default=None)
-    team_rank: Optional[DRank] = Field(default=None)
-    rank: Optional[DRank] = Field(default=None)
-    maps: Optional[dict] = Field(default=None)
-
-
-class DDType(BaseModel):
-    Novice: Optional[DData] = None
-    Moderate: Optional[DData] = None
-    Brutal: Optional[DData] = None
-    Insane: Optional[DData] = None
-    Dummy: Optional[DData] = None
-    DDmaX_Easy: Optional[DData] = Field(default=None, validation_alias='DDmaX.Easy')
-    DDmaX_Next: Optional[DData] = Field(default=None, validation_alias='DDmaX.Next')
-    DDmaX_Nut: Optional[DData] = Field(default=None, validation_alias='DDmaX.Nut')
-    DDmaX_Pro: Optional[DData] = Field(default=None, validation_alias='DDmaX.Pro')
-    Oldschool: Optional[DData] = Field(default=None)
-    Race: Optional[DData] = None
-    Solo: Optional[DData] = None
-    total: Optional[DData] = None
-
-
-class Activity(BaseModel):
-    date: str
-    hours_played: int
-
-
-class FavoriteServer(BaseModel):
-    server: str
-
-
-class DDPlayer(BaseModel):
-    player: str
-    points: DPoints
-    team_rank: Optional[DRank] = None
-    rank: Optional[DRank] = None
-    points_last_year: Optional[DRank] = None
-    points_last_month: Optional[DRank] = None
-    points_last_week: Optional[DRank] = None
-    favorite_server: FavoriteServer
-    first_finish: FirstFinish
-    last_finishes: list[LastFinish]
-    favorite_partners: Optional[list[FavoritePartner]] = None
-    types: DDType
-    activity: list[Activity]
-    hours_played_past_365_days: int
-
-
-# ddstats.tw
-
 class PData(BaseModel):
     rank: int
     points: int
@@ -169,9 +39,9 @@ class PointG(BaseModel):
 class Profile(BaseModel):
     name: str
     points: int
-    clan: str
-    country: int
-    skin_name: str
+    clan: Optional[str]
+    country: Optional[int]
+    skin_name: Optional[str]
     skin_color_body: Optional[int] = None
     skin_color_feet: Optional[int] = None
 
@@ -391,6 +261,13 @@ class Server(BaseModel):
         return 0
 
 
+class CountServers(BaseModel):
+    name: str
+    address: str
+    game_type: str
+    count_clients: int
+
+
 class Master(BaseModel):
     servers: list[Server]
 
@@ -401,25 +278,37 @@ class Master(BaseModel):
         remove_list = rm_list.copy() if rm is None else rm
         if not self.servers:
             return []
+
         dat: Counter[Any] = Counter(
             client.clan
             for server in self.servers
             for client in server.info.clients
             if client != ''
         )
+
         for i in remove_list:
             del dat[i]
         return sorted(dat.items(), key=lambda x: x[1], reverse=True)
 
     @property
-    def count_servers(self) -> list:
+    def count_servers(self) -> list[CountServers]:
         return sorted(
             (
-                (i.count_client, i.addresses[0], i.info.game_type, i.info.name)
+                CountServers(
+                    count_clients=i.count_client,
+                    address=i.addresses[0],
+                    game_type=i.info.game_type,
+                    name=i.info.name
+                )
                 if isinstance(i.addresses, list)
-                else (i.count_client, i.addresses, i.info.game_type, i.info.name)
+                else CountServers(
+                    count_clients=i.count_client,
+                    address=i.addresses,
+                    game_type=i.info.game_type,
+                    name=i.info.name
+                )
                 for i in self.servers
-            ), key=lambda x: x[0], reverse=True)
+            ), key=lambda x: x.count_clients, reverse=True)
 
     @property
     def count_clients(self) -> int:
@@ -459,58 +348,3 @@ class DDStatusData(BaseModel):
 
 class DDStatus(BaseModel):
     servers: list[DDStatusData]
-
-# Status.tw
-
-class DataTw(BaseModel):
-    name: str
-    createdAt: datetime
-
-class VersionTw(BaseModel):
-    version: str
-    createdAt: datetime
-
-
-class CountryTw(BaseModel):
-    identifier: str
-    code: int
-    iconUrl: str
-
-
-class ClientTw(BaseModel):
-    name: str
-    country: CountryTw
-    score: int
-    isPlayer: bool
-    isAfk: bool
-    team: int
-    createdAt: datetime
-    clan: DataTw | None
-
-
-class ServersTw(BaseModel):
-    ip: str
-    port: int
-    name: str
-    numClients: int
-    numPlayers: int
-    maxClients: int
-    maxPlayers: int
-    hasPassword: bool
-    supports6: bool
-    supports7: bool
-    createdAt: datetime
-    relevanceScore: int
-    clientScoreKind: str | None
-    logoUrl: str
-    map: DataTw
-    website: str | None = None
-    discordInvite: str | None = None
-    description: str | None = None
-    gameType: DataTw
-    version: VersionTw
-    clients: list[ClientTw]
-
-
-class MasterTw(BaseModel):
-    servers: list[ServersTw]

ddapi-0.8.1/ddapi/ddapi/scheme/status_tw.py

@@ -0,0 +1,84 @@
+# Status.tw
+from datetime import datetime
+from enum import StrEnum
+from typing import Optional
+
+from pydantic import BaseModel
+
+
+class ChartEnum(StrEnum):
+    day = "day"
+    week = "week"
+    month = "month"
+
+
+class DataTw(BaseModel):
+    name: str
+    createdAt: datetime
+
+
+class VersionTw(BaseModel):
+    version: str
+    createdAt: datetime
+
+
+class CountryTw(BaseModel):
+    identifier: str
+    code: int
+    iconUrl: str
+
+
+class ClientTw(BaseModel):
+    name: str
+    country: CountryTw
+    score: int
+    isPlayer: bool
+    isAfk: bool
+    team: int
+    createdAt: datetime
+    clan: DataTw | None
+
+
+class ServerTw(BaseModel):
+    ip: str
+    port: int
+    name: str
+    numClients: int
+    numPlayers: int
+    maxClients: int
+    maxPlayers: int
+    hasPassword: bool
+    supports6: bool
+    supports7: bool
+    createdAt: datetime
+    relevanceScore: int
+    clientScoreKind: str | None
+    logoUrl: str
+    map: DataTw
+    website: Optional[str] = None
+    discordInvite: Optional[str] = None
+    description: Optional[str] = None
+    gameType: DataTw
+    version: VersionTw
+    clients: list[ClientTw]
+
+
+class ServerTwOne(BaseModel):
+    ip: str
+    port: int
+    online: ServerTw
+
+
+class Chart(BaseModel):
+    avgPlayers: float
+    maxPlayers: int
+    minPlayers: int
+    timestamp: datetime
+
+
+class Charts(BaseModel):
+    charts: list[Chart]
+
+
+class MasterTw(BaseModel):
+    servers: list[ServerTw]

{ddapi-0.7.2 → ddapi-0.8.1}/ddapi/ddapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ddapi
-Version: 0.7.2
+Version: 0.8.1
 Summary: DDnet api
 Home-page: https://github.com/ByFox213/ddapi
 Author: ByFox
@@ -21,19 +21,23 @@ Dynamic: requires-python
 Dynamic: summary
 
 ddapi is an api from the ddnet and qwik website
+
 ## Installation
 
 ```bash
   pip install ddapi
 ```
+
 or
+
 ```bash
   pip install git+https://github.com/ByFox213/ddapi
 ```
-    
+
 ## Usage/Examples
 
 DDnet
+
 ```python
 import asyncio
 from ddapi import DDnetApi, DDPlayer
@@ -45,6 +49,7 @@ async def main():
     user: DDPlayer = await obj.player(nickname)
     if user is None:
         return "Player not found"
+
     print(f"{user.player}: {user.points.points}")
     # Cor: 31473 
     await obj.close()  # Closing client Not necessary
@@ -53,10 +58,10 @@ async def main():
 
 asyncio.run(main())
 ```
+
 Tested on Python
 | 3.9 | 3.10 | 3.11 | 3.12 |
 |-----|------|------|------|
-| ?   | ?    |  ✅  | ?    |
-
+| ? | ? | ✅ | ✅ |
 
 [other examples](https://github.com/ByFox213/ddapi/tree/main/example)

{ddapi-0.7.2 → ddapi-0.8.1}/ddapi/ddapi.egg-info/SOURCES.txt

@@ -3,10 +3,13 @@ README.md
 setup.cfg
 setup.py
 ddapi/ddapi/__init__.py
-ddapi/ddapi/dataclass.py
-ddapi/ddapi/deflt.py
+ddapi/ddapi/api.py
 ddapi/ddapi/main.py
 ddapi/ddapi.egg-info/PKG-INFO
 ddapi/ddapi.egg-info/SOURCES.txt
 ddapi/ddapi.egg-info/dependency_links.txt
-ddapi/ddapi.egg-info/top_level.txt
+ddapi/ddapi.egg-info/top_level.txt
+ddapi/ddapi/scheme/__init__.py
+ddapi/ddapi/scheme/ddnet.py
+ddapi/ddapi/scheme/ddstats_tw.py
+ddapi/ddapi/scheme/status_tw.py

{ddapi-0.7.2 → ddapi-0.8.1}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = ddapi
-version = 0.7.2
+version = 0.8.1
 author = ByFox
 description = DDnet api
 long_description = file: README.md

{ddapi-0.7.2 → ddapi-0.8.1}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="ddapi",
-    version="0.7.2",
+    version="0.8.1",
     author="ByFox",
     description="DDnet api",
     long_description=long_description,
@@ -20,6 +20,6 @@ setuptools.setup(
         "Operating System :: OS Independent",
     ],
     package_dir={"": "ddapi"},
-    packages=setuptools.find_packages(where="src"),
+    packages=setuptools.find_packages(where="ddapi"),
     python_requires=">=3.8"
 )

ddapi-0.7.2/ddapi/ddapi/main.py

@@ -1,88 +0,0 @@
-from typing import Union
-from urllib.parse import quote
-
-from .dataclass import DDPlayer, Master, Query, DMap, DDStatus, Player, MasterTw
-from .deflt import API
-
-__all__ = (
-    "DDnetApi",
-    "DDstats",
-    "Status"
-)
-
-
-class DDnetApi(API):
-    def __init__(self):
-        super().__init__()
-        self.domain = "ddnet.org"
-
-    @staticmethod
-    def powered() -> str:
-        return 'ddnet.org'
-
-    async def player(self, player_name: str) -> DDPlayer:
-        """Fetch player data from the API and return it as a dictionary."""
-        return await self._generate_model_instance(
-            f"https://{self.domain}/players/?json2={quote(player_name)}",
-            DDPlayer
-        )
-
-    async def status(self) -> Union[DDStatus, None]:
-        return await self._generate_model_instance(
-            f"https://{self.domain}/status/json/stats.json",
-            DDStatus
-        )
-
-    async def query(self, player: str) -> Union[Query, None]:
-        return await self._generate_model_instance(
-            f"https://{self.domain}/players/?query={quote(player)}",
-            Query,
-            "data"
-        )
-
-    async def master(self) -> Union[Master, None]:
-        return await self._generate_model_instance(
-            f"https://master1.{self.domain}/ddnet/15/servers.json",
-            Master
-        )
-
-    async def map(self, map_name: str) -> Union[DMap, None]:
-        return await self._generate_model_instance(
-            f"https://{self.domain}/maps/?json={quote(map_name)}",
-            DMap
-        )
-
-
-class DDstats(API):
-    def __init__(self):
-        super().__init__()
-        self.url = "https://ddstats.tw/player/json?player={0}"
-
-    @staticmethod
-    def powered() -> str:
-        return 'ddstats.tw'
-
-    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(
-            self.url.format(quote(player_name)),
-            Player
-        )
-
-
-class Status(API): # TODO: Add other
-    def __init__(self):
-        super().__init__()
-        self.url = "https://api.status.tw"
-
-    @staticmethod
-    def powered() -> str:
-        return 'ddstats.tw'
-
-    async def server_list(self) -> MasterTw:
-        """Fetch player data from the API and return it as a dictionary."""
-        return await self._generate_model_instance(
-            self.url + "/server/list",
-            MasterTw,
-            "servers"
-        )