serverwatcher 3.5__tar.gz → 3.6__tar.gz

{serverwatcher-3.5/src/serverwatcher.egg-info → serverwatcher-3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: serverwatcher
-Version: 3.5
+Version: 3.6
 Summary: A HungerLib-powered Minecraft server automation engine.
 Author: iFamished
 License: GPL-3.0

{serverwatcher-3.5 → serverwatcher-3.6}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "serverwatcher"
-version = "3.5"
+version = "3.6"
 description = "A HungerLib-powered Minecraft server automation engine."
 readme = "README.md"
 requires-python = ">=3.10"

{serverwatcher-3.5 → serverwatcher-3.6}/src/serverwatcher/__init__.py

@@ -7,7 +7,7 @@ except PackageNotFoundError:
     __version__ = '0.0.0'
 
 from .watcher import ServerWatcher
-from .schema import validate_config_schema, validate_messages_schema flatten_nested
+from .schema import validate_config_schema, validate_messages_schema, flatten_nested
 
 
 __all__ = [

serverwatcher-3.6/src/serverwatcher/config/global_config.py

@@ -0,0 +1,17 @@
+from dataclasses import dataclass
+
+@dataclass
+class GlobalConfig:
+    panel_name: str
+    panel_url: str
+    panel_api_key: str
+
+    origin_server_id: str
+
+    server_name: str
+    server_server_id: str
+    server_domain: str
+    server_port: int
+    server_rcon_port: int
+    server_rcon_password: str
+    server_tps_command: str

{serverwatcher-3.5 → serverwatcher-3.6}/src/serverwatcher/watcher.py

@@ -15,6 +15,7 @@ from hungerlib.addons import (
     map_to_dataclass,
 )
 
+from serverwatcher.schema import flatten_nested
 from serverwatcher.config import GlobalConfig, MessagesConfig, WatcherConfig
 
 # Set directory
@@ -64,34 +65,32 @@ class ServerWatcher:
         )
 
         # panel
-        p = self.global_cfg.panel
         self.panel = Panel(
-            name=p["name"],
-            url=p["url"],
-            api_key=p["api_key"],
+            name=self.global_cfg.panel_name,
+            url=self.global_cfg.panel_url,
+            api_key=self.global_cfg.panel_api_key,
         )
 
+
         # origin
-        o = self.global_cfg.origin
         self.origin = GenericServer(
             name="Origin",
             panel=self.panel,
-            server_id=o["server_id"],
+            server_id=self.global_cfg.origin_server_id
         )
 
-        # server
-        s = self.global_cfg.server
         self.server = MinecraftServer(
-            name=s["name"],
+            name=self.global_cfg.name,
             panel=self.panel,
-            server_id=s["server_id"],
-            server_domain=s["domain"],
-            server_port=s["port"],
-            rcon_port=s["rcon_port"],
-            rcon_password=s["rcon_password"],
-            tpsCommand=s["tps_command"],
+            server_id=self.global_cfg.server_id,
+            server_domain=self.global_cfg.domain,
+            server_port=self.global_cfg.port,
+            rcon_port=self.global_cfg.rcon_port,
+            rcon_password=self.global_cfg.rcon_password,
+            tpsCommand=self.global_cfg.tps_command,
         )
 
+
         # logger
         logger_name = self.cfg.logger_name_template.format(
             server_name=s["name"]

{serverwatcher-3.5 → serverwatcher-3.6/src/serverwatcher.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: serverwatcher
-Version: 3.5
+Version: 3.6
 Summary: A HungerLib-powered Minecraft server automation engine.
 Author: iFamished
 License: GPL-3.0

serverwatcher-3.5/src/serverwatcher/config/global_config.py

@@ -1,7 +0,0 @@
-from dataclasses import dataclass
-
-@dataclass
-class GlobalConfig:
-    panel: dict
-    origin: dict
-    server: dict