serverwatcher 5.14.1__tar.gz → 5.16__tar.gz

{serverwatcher-5.14.1/src/serverwatcher.egg-info → serverwatcher-5.16}/PKG-INFO

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

{serverwatcher-5.14.1 → serverwatcher-5.16}/pyproject.toml

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

{serverwatcher-5.14.1 → serverwatcher-5.16}/src/serverwatcher/configclasses/config.py

@@ -2,6 +2,8 @@ from hungerlib import datamap, datamap_api
 
 @datamap(syntax=datamap_api.braces, mode="config")
 class GlobalConfig:
+    __config_path__ = "/defaultconfigs/config.yaml"
+
     timezone: str = "timezone"
 
     panel_name: str = "panel.name"

{serverwatcher-5.14.1 → serverwatcher-5.16}/src/serverwatcher/configclasses/messages.py

@@ -2,6 +2,8 @@ from hungerlib import datamap, datamap_api
 
 @datamap(syntax=datamap_api.braces, mode="config")
 class MessagesConfig:
+    __config_path__ = "/defaultconfigs/messages.yaml"
+
     prefix: str = "prefix"
     bullet: str = "bullet"
 
@@ -26,6 +28,7 @@ class MessagesConfig:
     second_2:  str = "broadcast_seconds.2"
     second_1:  str = "broadcast_seconds.1"
 
+    startup: str = "logging.startup"
     status_check: str = "logging.status_check"
     validation_fail: str = "logging.validation_fail"
     validation_ok: str = "logging.validation_ok"

{serverwatcher-5.14.1 → serverwatcher-5.16}/src/serverwatcher/configclasses/watcher.py

@@ -2,6 +2,8 @@ from hungerlib import datamap, datamap_api
 
 @datamap(syntax=datamap_api.braces, mode="config")
 class WatcherConfig:
+    __config_path__ = "/defaultconfigs/watcher.yaml"
+
     watch_interval: int = "watch_interval"
     schedule_control: bool = "schedule_control.enabled"
     restart_soon_id: int = "schedule_control.restart_soon_id"
@@ -26,3 +28,5 @@ class WatcherConfig:
     restart_wait_seconds: int = "restart.wait_seconds"
     restart_timeout: int = "restart.online_timeout"
     restart_online_interval: int = "restart.online_interval"
+
+mapit("<green>[%hh%:%mm%]: ", [ASCII_COLOR_MAP])

{serverwatcher-5.14.1 → serverwatcher-5.16}/src/serverwatcher/defaultconfigs/messages.yaml

@@ -7,6 +7,7 @@ broadcast_minutes: {}
 broadcast_seconds: {}
 
 logging:
+  startup: 'ServerWatcher is running!'
   status_check: 'Checking server status...'
   validation_fail: 'Validation FAILED.'
   validation_ok: 'All validation checks succeeded.'

{serverwatcher-5.14.1 → serverwatcher-5.16}/src/serverwatcher/watcher.py

@@ -12,23 +12,9 @@ from serverwatcher.configclasses.watcher import WatcherConfig
 
 class ServerWatcher:
     def __init__(self):
-        self.config = loadConfig(
-            "config/config.yaml",
-            "/defaultconfigs/config.yaml",
-            GlobalConfig
-        )
-
-        self.messages = loadConfig(
-            "config/messages.yaml",
-            "/defaultconfigs/messages.yaml",
-            MessagesConfig
-        )
-
-        self.watcherconfig = loadConfig(
-            "config/watcher.yaml",
-            "/defaultconfigs/watcher.yaml",
-            WatcherConfig
-        )
+        self.config = loadConfig(GlobalConfig)
+        self.messages = loadConfig(MessagesConfig)
+        self.watcherconfig = loadConfig(WatcherConfig)
 
         datamap_api.setGlobalMaps(
             utils.ASCII_COLOR_MAP,
@@ -67,10 +53,10 @@ class ServerWatcher:
             Servers=[self.server],
             log_path=self.config.log_path,
 
-            origin_maps = [utils.ASCII_COLOR_MAP],
-            destination_maps = [utils.ASCII_COLOR_MAP],
-            broadcast_maps = [utils.MC_COLOR_MAP],
-            file_maps = [utils.STRIP_COLOR_MAP],
+            origin_maps = [utils.ASCII_COLOR_MAP, self.config, self.messages, self.watcherconfig],
+            destination_maps = [utils.ASCII_COLOR_MAP, self.config, self.messages, self.watcherconfig],
+            broadcast_maps = [utils.MC_COLOR_MAP, self.config, self.messages, self.watcherconfig],
+            file_maps = [utils.STRIP_COLOR_MAP, self.config, self.messages, self.watcherconfig],
 
             info_prefix=self.config.info_prefix,
             warn_prefix=self.config.warn_prefix,
@@ -115,19 +101,19 @@ class ServerWatcher:
 
         minute_callbacks = {
             int(k.split("_")[1]): (
-                lambda msg=getattr(self.messages, k):
-                    self.router.broadcast(msg)
+                lambda raw=self.messages.as_map()[k]:
+                    self.router.broadcast(mapit(raw))
             )
-            for k in vars(self.messages)
+            for k in self.messages.as_map()
             if k.startswith("minute_")
         }
 
         second_callbacks = {
             int(k.split("_")[1]): (
-                lambda msg=getattr(self.messages, k):
-                    self.router.broadcast(msg)
+                lambda raw=self.messages.as_map()[k]:
+                    self.router.broadcast(mapit(raw))
             )
-            for k in vars(self.messages)
+            for k in self.messages.as_map()
             if k.startswith("second_")
         }
 
@@ -138,7 +124,12 @@ class ServerWatcher:
         )
 
     def evaluate(self):
+        # Lets Pterodactyl know the server is online, then clears terminal and uses user-defined startup key
         self.router.info("ServerWatcher is running!")
+        utils.clearTerminal()
+
+        # Configurable start message
+        self.router.info(self.messages.startup)
 
         if not utils.validateAll(self.panel, self.server):
             self.router.error(self.messages.validation_fail)

{serverwatcher-5.14.1 → serverwatcher-5.16/src/serverwatcher.egg-info}/PKG-INFO

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