ddapi 0.4.8__tar.gz → 0.5.0__tar.gz

{ddapi-0.4.8 → ddapi-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ddapi
-Version: 0.4.8
+Version: 0.5.0
 Summary: ddapi
 Home-page: https://github.com/ByFox213/ddapi
 Author: ByFox

{ddapi-0.4.8 → ddapi-0.5.0}/ddapi/ddapi/dataclass.py

@@ -1,9 +1,10 @@
 # pylint: disable-all
 from collections import Counter
 from datetime import datetime
-from typing import Optional, Union, Any
+from typing import Optional, Union, Any, AsyncGenerator
 from pydantic import BaseModel, Field
 
+rm_list = ["DD-Persian", "/vDQMHSss8W"]
 
 # DDStats
 
@@ -360,14 +361,14 @@ class Client(BaseModel):
 
 
 class Info(BaseModel):
-    max_clients: int = Field(default=0)
-    max_players: int = Field(default=0)
-    passworded: bool = Field(default=None)
-    game_type: str = Field(default=None)
-    name: str = Field(default=None)
-    map: dict = Field(default=None)
-    version: str = Field(default=None)
-    clients: list[Client] = Field(default=None)
+    max_clients: int | None = Field(default=0)
+    max_players: int | None = Field(default=0)
+    passworded: bool | None = Field(default=None)
+    game_type: str | None = Field(default=None)
+    name: str | None = Field(default=None)
+    map: dict | None = Field(default=None)
+    version: str | None = Field(default=None)
+    clients: list[Client] | None = Field(default=None)
 
 
 class Server(BaseModel):
@@ -376,33 +377,40 @@ class Server(BaseModel):
     info: Info = Field(default=None)
 
     def get_count_client(self) -> int:
-        return len(self.info.clients)
+        if self.info is not None and self.info.clients is not None:
+            return len(self.info.clients)
+        return 0
 
 
 class Master(BaseModel):
     servers: list[Server]
 
-    async def get_info(self):
+    async def get_info(self) -> AsyncGenerator[Info, None]:
         for i in self.servers:
+            if i.info is None:
+                continue
             yield i.info
 
-    async def get_clients(self):
+    async def get_clients(self) -> AsyncGenerator[Client, None]:
         for i in self.servers:
+            if i.info is None or i.info.clients is None:
+                continue
             yield i.info.clients
 
     def get_count(self) -> int:
         return len(self.servers)
 
-    def get_clans(self, limit: int = 50, rm=None):
+    def get_clans(self, limit: int = 50, rm: list[str] = None) -> list[tuple[Any, int]]:
         if rm is None:
-            rm = ["DD-Persian"]
-        dat = Counter(client.clan for server in self.servers for client in server.info.clients)
+            rm = []
+        rm.extend(rm_list)
+        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)
         del dat['']
         for i in rm:
             del dat[i]
         return sorted(dat.items(), key=lambda x: x[1], reverse=True)[:limit]
 
-    def get_count_servers(self, limit: int = 10):
+    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

{ddapi-0.4.8 → ddapi-0.5.0}/ddapi/ddapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ddapi
-Version: 0.4.8
+Version: 0.5.0
 Summary: ddapi
 Home-page: https://github.com/ByFox213/ddapi
 Author: ByFox

{ddapi-0.4.8 → ddapi-0.5.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ddapi"
-version = "0.4.8"
+version = "0.5.0"
 description = "ddapi"
 readme = "README.md"
 authors = [{ name = "ByFox" }]

{ddapi-0.4.8 → ddapi-0.5.0}/setup.cfg

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

{ddapi-0.4.8 → ddapi-0.5.0}/setup.py

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