Update 2.1.0

Author: romanin-rf

README.md

@@ -8,12 +8,24 @@ pip install -U pydustry.py
 ```python
 import pydustry
 
-status = pydustry.Server("easyplay.su").get_status()
+status = pydustry.Server("rcrms.ru").get_status()
 
 print(status)
 ```
 
 - `Return`
 ```python
-Status(name='[#3bffff][*] []EasyPlay Gaming + [#3dffcb]Rating-System', map='EasyPlay.HUB', players=56, wave=1, version=126, vertype='official', ping=35)
+Status(
+    name='[gold]RCR [#B5B8B1]- [white]Ру[blue]сс[red]кий [#B5B8B1]Сервер',
+    map='RCR HUB',
+    players=7,
+    wave=1,
+    version=146,
+    vertype='official',
+    gamemode=0,
+    limit=0,
+    desc='...',
+    modename='LOBBY',
+    ping=37
+)
 ```

pydustry/pydustry.py

@@ -16,8 +16,9 @@ class Status:
     limit: int
     desc: int
     modename: int
-    ping: float
+    ping: int
 
+# ! Main Class
 class Server:
     def __init__(
         self,
@@ -27,43 +28,55 @@ def __init__(
     ) -> None:
         self.server: Tuple[str, int] = (server_host, server_port)
         self.input_server: Tuple[str, int] = (server_host, input_port)
-
-    def get_status(self, timeout: float=10.0) -> Status:
+    
+    # ! Magic Methods
+    def __str__(self) -> str:
+        return f"{self.server[0]}:{self.server[1]}:{self.input_server[1]}"
+    
+    def __repr__(self) -> str:
+        return f"{self.__class__.__name__}({repr(self.__str__())})"
+    
+    # ! Main Method
+    def get_status(
+        self,
+        timeout: float=10.0,
+        encoding: str='utf-8',
+        errors: str='strict'
+    ) -> Status:
+        info = {}
         s = socket(AF_INET, SOCK_DGRAM)
         s.connect(self.server)
         s.settimeout(timeout)
-        info = {}
         s_time = time()
         s.send(b"\xfe\x01")
         data = s.recv(1024)
         e_time = time()
-        # * Парсинг
-        info["name"] = data[1:data[0]+1].decode("utf-8")
+        info['name'] = data[1:data[0]+1].decode(encoding, errors)
         data = data[data[0]+1:]
-        info["map"] = data[1:data[0]+1].decode("utf-8")
+        info['map'] = data[1:data[0]+1].decode(encoding, errors)
         data = data[data[0]+1:]
-        info["players"] = unpack(">i", data[:4])[0]
+        info['players'] = unpack(">i", data[:4])[0]
         data = data[4:]
-        info["wave"] = unpack(">i", data[:4])[0]
+        info['wave'] = unpack(">i", data[:4])[0]
         data = data[4:]
-        info["version"] = unpack(">i", data[:4])[0]
+        info['version'] = unpack(">i", data[:4])[0]
         data = data[4:]
-        info["vertype"] = data[1:data[0]+1].decode("utf-8")
+        info['vertype'] = data[1:data[0]+1].decode(encoding, errors)
         data = data[data[0]+1:]
         info['gamemode'] = unpack('>b', data[:1])[0]
         data = data[1:]
         info['limit'] = unpack(">i", data[:4])[0]
         data = data[4:]
-        info['desc'] = data[1:data[0]+1].decode("utf-8")
+        info['desc'] = data[1:data[0]+1].decode(encoding, errors)
         data = data[data[0]+1:]
-        info['modename'] = data[1:data[0]+1].decode("utf-8")
+        info['modename'] = data[1:data[0]+1].decode(encoding, errors)
         data = data[data[0]+1:]
-        info["ping"] = round((e_time - s_time) * 1000)
+        info['ping'] = round((e_time - s_time) * 1000)
         return Status(**info)
 
     def send_command(self, command: str) -> None:
         s = create_connection(self.input_server)
-        s.sendall(command.encode(errors="ignore"))
+        s.sendall(command.encode())
         s.close()
 
     def ping(self, timeout: float=10.0) -> int:

pyproject.toml

@@ -1,16 +1,22 @@
 [tool.poetry]
 name = "pydustry.py"
-version = "2.0.1"
+version = "2.1.0"
 description = "Module for server information in the game Mindustry."
-authors = ["Romanin <[email protected]>"]
+repository = "https://github.com/RCR-OOP/pydustry.py"
+authors = [
+    "Romanin <[email protected]>"
+]
 license = "MIT"
 readme = "README.md"
 packages = [{include = "pydustry"}]
 keywords = ["midnustry", "game", "server", "parser", "infomation"]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Operating System :: OS Independent"
+]
 
 [tool.poetry.dependencies]
-python = "^3.9"
-
+python = ">=3.6"
 
 [build-system]
 requires = ["poetry-core"]