ddapi 0.5.1__tar.gz → 0.6.0__tar.gz

{ddapi-0.5.1 → ddapi-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ddapi
-Version: 0.5.1
+Version: 0.6.0
 Summary: DDnet api
 Home-page: https://github.com/ByFox213/ddapi
 Author: ByFox

{ddapi-0.5.1 → ddapi-0.6.0}/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, StatusAPI, utc_times, DDStatsDB
+from .main import DDnetApi, DDstats, DDStatsDB
 from .dataclass import *
 
-__version__ = "0.5.1"
+__version__ = "0.6.0"
 __author__ = 'ByFox'
 __LICENSE__ = "MIT"

{ddapi-0.5.1 → ddapi-0.6.0}/ddapi/ddapi/dataclass.py

@@ -6,6 +6,7 @@ from pydantic import BaseModel, Field
 
 rm_list = ["DD-Persian", "/vDQMHSss8W"]
 
+
 # DDStats
 
 
@@ -407,29 +408,26 @@ class Master(BaseModel):
             yield i.info.clients
 
     def get_clans(self, limit: int = 50, rm: list[str] = None) -> list[tuple[Any, int]]:
-        if rm is None:
-            rm = []
-        rm.extend(rm_list)
+        remove_list = [] if rm is None else rm
+        remove_list.extend(["DD-Persian", ''])
         if not self.servers:
             return []
-        dat = Counter(client.clan
-                      for server in self.servers
-                      for client in server.info.clients
-                      if server.info is not None
-                      and server.info.clients is not None
-                      and client != '')
-        for i in rm:
+        dat: Counter[Any] = Counter(client.clan
+                                    for server in self.servers
+                                    for client in server.info.clients
+                                    if server.info is not None
+                                    and server.info.clients is not None
+                                    and client != '')
+        for i in remove_list:
             del dat[i]
         return sorted(dat.items(), key=lambda x: x[1], reverse=True)[:limit]
 
-    def get_count_servers(self, limit: int = 10) -> list[tuple[int, list | Any, str | None, str | None]]:
-        dat = []
-        for i in self.servers:
-            add = i.addresses
-            if isinstance(i.addresses, list):
-                add = i.addresses[0]
-            dat.append((i.get_count_client(), add, i.info.game_type, i.info.name))
-        return sorted(dat, key=lambda x: x[0], reverse=True)[:limit]
+    def get_count_servers(self, limit: int = 10) -> list:
+        return sorted((
+            (i.get_count_client(), i.addresses[0], i.info.game_type, i.info.name)
+            if isinstance(i.addresses, list)
+            else (i.get_count_client(), i.addresses, i.info.game_type, i.info.name)
+            for i in self.servers), key=lambda x: x[0], reverse=True)[:limit]
 
 
 class QueryData(BaseModel):

ddapi-0.6.0/ddapi/ddapi/deflt.py

@@ -0,0 +1,84 @@
+import asyncio
+from abc import ABC
+from json import JSONDecoder
+from typing import Union, Any
+from urllib.parse import quote
+
+import aiohttp
+from aiohttp import ClientSession, ClientConnectorError
+from aiohttp.typedefs import DEFAULT_JSON_DECODER
+
+from .dataclass import Player
+
+
+class API(ABC):
+    def __init__(self,
+                 session: ClientSession = None,
+                 json_loads: JSONDecoder = DEFAULT_JSON_DECODER,
+                 emojis: dict[str, str] = None):
+        self.emojis = emojis
+        if emojis is None:
+            self.emojis = {"fox": "🦊"}
+        self.session = session
+        self.json_loads = json_loads
+        self.url = "https://ddstats.qwik.space/player/json?player={0}"
+
+    @staticmethod
+    def powered() -> str:
+        """Return an empty string."""
+        return ''
+
+    async def _get_emoji(self, player_name: str) -> str:
+        """Return an emoji for the given player name."""
+        for name, emoji in self.emojis.items():
+            if name in player_name.lower():
+                return emoji
+        return ''
+
+    async def _send(self, url: str) -> Union[dict, None]:
+        """Send a GET request to the given URL and return the response as JSON."""
+        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
+        except ClientConnectorError:
+            return
+
+    async def _generate(
+            self,
+            url: str,
+            model,
+            k: str = None,
+            emoji: str = None
+    ) -> Union[Any, None]:
+        """Generate a model instance from the given URL and optional keyword arguments."""
+        dat = await self._send(url)
+        if dat is None:
+            return
+        if k is not None:
+            dat = {k: dat}
+        if emoji is not None:
+            dat["emoji"] = emoji
+        return model(**dat)
+
+    async def close(self) -> None:
+        """Close the aiohttp session."""
+        if self.session:
+            await self.session.close()
+            self.session = None
+
+    async def player(self, player_name: str) -> Player:
+        """Fetch player data from the API and return it as a dictionary."""
+        return await self._generate(
+            self.url.format(quote(player_name)),
+            Player,
+            emoji=await self._get_emoji(player_name)
+        )
+
+    async def players(self, player_names: list[str]) -> tuple[Player]:
+        """Fetch data for multiple players from the API and return it as a list of dictionaries."""
+        tasks = [self.player(player_name) for player_name in player_names]
+        return await asyncio.gather(*tasks)

ddapi-0.6.0/ddapi/ddapi/main.py

@@ -0,0 +1,97 @@
+import asyncio
+from typing import Union
+from urllib.parse import quote
+
+from .dataclass import DDPlayer, Master, Query, DMap, DDStatsSql, DDStatus
+from .deflt import API
+
+__all__ = (
+    "DDnetApi",
+    "DDstats",
+    "DDStatsDB"
+)
+
+
+class DDStatsDB(API):
+    def __init__(self):
+        super().__init__()
+
+    @staticmethod
+    def powered() -> str:
+        return 'ddstats.org'
+
+    async def _rt(self, url: str):
+        return await self._generate(url, DDStatsSql)
+
+    async def next(self, dd: DDStatsSql):
+        return await self._rt(dd.next_url)
+
+    async def sql(self, sql: str):
+        return await self._rt(f"https://db.ddstats.org/ddnet-7b306cf?sql={quote(sql)}")
+
+    async def mapinfo(self):
+        return await self._rt("https://db.ddstats.org/ddnet-7b306cf/mapinfo.json")
+
+    async def teamrace(self):
+        return await self._rt("https://db.ddstats.org/ddnet-7b306cf/teamrace.json")
+
+    async def race(self):
+        return await self._rt("https://db.ddstats.org/ddnet-7b306cf/race.json")
+
+    async def maps(self):
+        return await self._rt("https://db.ddstats.org/ddnet-7b306cf/maps.json")
+
+
+class DDnetApi(API):
+    def __init__(self):
+        super().__init__()
+        self.url = "https://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(
+            f"{self.url}players/?json2={quote(player_name)}",
+            DDPlayer,
+            emoji=await self._get_emoji(player_name)
+        )
+
+    async def players(self, player_names: list[str]) -> tuple[DDPlayer]:
+        """Fetch data for multiple players from the API and return it as a list of dictionaries."""
+        tasks = [self.player(player_name) for player_name in player_names]
+        return await asyncio.gather(*tasks)
+
+    async def status(self) -> Union[DDStatus, None]:
+        return await self._generate(
+            f"{self.url}status/json/stats.json",
+            DDStatus
+        )
+
+    async def query(self, player: str) -> Union[Query, None]:
+        return await self._generate(
+            f"{self.url}players/?query={quote(player)}",
+            Query,
+            "data",
+            emoji=await self._get_emoji(player)
+        )
+
+    async def master(self) -> Union[Master, None]:
+        return await self._generate(
+            "https://master1.ddnet.org/ddnet/15/servers.json",
+            Master
+        )
+
+    async def map(self, map_name: str) -> Union[DMap, None]:
+        return await self._generate(
+            f"{self.url}maps/?json={quote(map_name)}",
+            DMap
+        )
+
+
+class DDstats(API):
+    @staticmethod
+    def powered() -> str:
+        return 'ddstats.tw'

{ddapi-0.5.1 → ddapi-0.6.0}/ddapi/ddapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ddapi
-Version: 0.5.1
+Version: 0.6.0
 Summary: DDnet api
 Home-page: https://github.com/ByFox213/ddapi
 Author: ByFox

{ddapi-0.5.1 → ddapi-0.6.0}/setup.cfg

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

{ddapi-0.5.1 → ddapi-0.6.0}/setup.py

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

ddapi-0.5.1/ddapi/ddapi/deflt.py

@@ -1,63 +0,0 @@
-from abc import ABC
-from typing import Union, Any
-
-import aiohttp
-from aiohttp import ClientSession, ClientConnectorError
-from aiohttp.typedefs import DEFAULT_JSON_DECODER, JSONDecoder
-
-
-class API(ABC):
-    def __init__(self,
-                 session: ClientSession = None,
-                 json_loads: JSONDecoder = DEFAULT_JSON_DECODER,
-                 emojis: dict[str, str] = None):
-        self.emojis = emojis
-        if emojis is None:
-            self.emojis = {"fox": "🦊"}
-        self.session = session
-        self.json_loads = json_loads
-        self.url = "https://ddstats.qwik.space/player/json?player={0}"
-
-    def __del__(self):
-        self.session = None
-
-    @staticmethod
-    def powered() -> str:
-        return ''
-
-    def _get_emoji(self, player_name: str) -> str:
-        for name, emoji in self.emojis.items():
-            if name in player_name.lower():
-                return emoji
-        return ''
-
-    def closed(self):
-        return self.session.closed is None or self.session.closed
-
-    async def _send(self, url: str) -> Union[dict, None]:
-        if self.session is None:
-            self.session = aiohttp.ClientSession()
-        try:
-            async with self.session.get(url) as req:
-                if req.status == 200:
-                    usr = await req.text()
-                    if usr == '{}' or usr is None:
-                        return
-                    del usr
-                    return await req.json(loads=self.json_loads)
-                return
-        except ClientConnectorError:
-            return
-
-    async def _generate(self, url: str, model, k: str = None, emoji: str = None) -> Any:
-        dat = await self._send(url)
-        if dat is None:
-            return
-        if k is not None:
-            dat = {k: dat}
-        if emoji is not None:
-            dat["emoji"] = emoji
-        return model(**dat)
-
-    async def close(self) -> None:
-        return await self.session.close()

ddapi-0.5.1/ddapi/ddapi/main.py

@@ -1,79 +0,0 @@
-import re
-from datetime import datetime
-from typing import Union
-from urllib.parse import quote
-
-from .dataclass import DDPlayer, Master, Player, Query, DMap, DDStatsSql, DDStatus
-from .deflt import API
-
-REG_SERVER = r"^((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9]).){3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])$"
-
-__all__ = (
-    "utc_times",
-    "DDnetApi",
-    "DDstats",
-    "DDStatsDB"
-)
-
-
-def utc_times(timestamp: int | float) -> datetime:
-    return datetime.utcfromtimestamp(timestamp)
-
-
-class DDStatsDB(API):
-    @staticmethod
-    def powered() -> str:
-        return 'ddstats.org'
-
-    async def _rt(self, url: str):
-        return await self._generate(url, DDStatsSql)
-
-    async def next(self, dd: DDStatsSql):
-        return await self._rt(dd.next_url)
-
-    async def sql(self, sql: str):
-        return await self._rt(f"https://db.ddstats.org/ddnet-7b306cf?sql={quote(sql)}")
-
-    async def mapinfo(self):
-        return await self._rt("https://db.ddstats.org/ddnet-7b306cf/mapinfo.json")
-
-    async def teamrace(self):
-        return await self._rt("https://db.ddstats.org/ddnet-7b306cf/teamrace.json")
-
-    async def race(self):
-        return await self._rt("https://db.ddstats.org/ddnet-7b306cf/race.json")
-
-    async def maps(self):
-        return await self._rt("https://db.ddstats.org/ddnet-7b306cf/maps.json")
-
-
-class DDnetApi(API):
-    @staticmethod
-    def powered() -> str:
-        return 'ddnet.org'
-
-    async def player(self, player: str) -> Union[DDPlayer, None]:
-        return await self._generate(f"https://ddnet.org/players/?json2={quote(player)}", DDPlayer,
-                                    emoji=self._get_emoji(player))
-
-    async def status(self) -> Union[DDStatus, None]:
-        return await self._generate("https://ddnet.org/status/json/stats.json", DDStatus)
-
-    async def query(self, player: str) -> Union[Query, None]:
-        return await self._generate(f"https://ddnet.org/players/?query={quote(player)}", Query, "data",
-                                    emoji=self._get_emoji(player))
-
-    async def master(self) -> Union[Master, None]:
-        return await self._generate("https://master1.ddnet.org/ddnet/15/servers.json", Master)
-
-    async def map(self, map_name: str) -> Union[DMap, None]:
-        return await self._generate(f"https://ddnet.org/maps/?json={quote(map_name)}", DMap)
-
-
-class DDstats(API):
-    @staticmethod
-    def powered() -> str:
-        return 'ddstats.tw'
-
-    async def player(self, nickname) -> Union[Player, None]:
-        return await self._generate(f"https://ddstats.tw/player/json?player={quote(nickname)}", Player, emoji=self._get_emoji(nickname))