serverwatcher 5.8.dev9__tar.gz → 5.8.dev11__tar.gz

{serverwatcher-5.8.dev9/src/serverwatcher.egg-info → serverwatcher-5.8.dev11}/PKG-INFO

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

{serverwatcher-5.8.dev9 → serverwatcher-5.8.dev11}/pyproject.toml

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

{serverwatcher-5.8.dev9 → serverwatcher-5.8.dev11}/src/serverwatcher/configclasses/messages.py

@@ -6,8 +6,9 @@ def yaml_key(path: str, default=None):
 @dataclass
 class MessagesConfig:
     prefix: str = yaml_key("prefix", default="<aqua>[Server Watcher]")
-    broadcast_restart_at: str = yaml_key("broadcast_restart_at")
     bullet: str = yaml_key("bullet")
+    
+    broadcast_restart_at: str = yaml_key("broadcast_restart_at")
 
     # minute messages
     minute_120: str = yaml_key("broadcast_minutes.120", default="{prefix} Restart in 2 hours!")
@@ -31,13 +32,13 @@ class MessagesConfig:
     second_1:  str = yaml_key("broadcast_seconds.1",  default="{prefix} Restart in 1 second!")
 
     # logging
-    startup: str = yaml_key("logging.startup", default="{prefix} Default test logging.startup")
+    startup: str = yaml_key("logging.startup")
     status_check: str = yaml_key("logging.status_check")
     validation_fail: str = yaml_key("logging.validation_fail")
     validation_ok: str = yaml_key("logging.validation_ok")
     shutdown: str = yaml_key("logging.shutdown")
     immediate_restart: str = yaml_key("logging.immediate_restart")
-    no_restart: str = yaml_key("logging.no_restart", default="{prefix} Default test logging.no_restart")
+    no_restart: str = yaml_key("logging.no_restart")
     scheduled: str = yaml_key("logging.scheduled")
     gap_low: str = yaml_key("logging.gap_low")
     gap_high: str = yaml_key("logging.gap_high")

{serverwatcher-5.8.dev9 → serverwatcher-5.8.dev11}/src/serverwatcher/defaultconfigs/messages.yaml

@@ -1,7 +1,7 @@
 prefix: '<aqua>[Server Watcher]'
+bullet: '-'
 
 broadcast_restart_at: '{prefix} The server will restart at {time} CDT.'
-bullet: '-'
 
 broadcast_minutes:
   '120': '{prefix} Restart in 2 hours!'

{serverwatcher-5.8.dev9 → serverwatcher-5.8.dev11}/src/serverwatcher/watcher.py

@@ -96,7 +96,12 @@ class ServerWatcher:
         self.tz = ZoneInfo(self.config.timezone)
 
     def fmt(self, template: str, **fmt):
-        # apply t-eval formatting to templates
+        simple = {
+            "prefix": self.messages.prefix,
+            "bullet": self.messages.bullet,
+        }
+        for key, value in simple.items():
+            template = template.replace(f"{{{key}}}", value)
         return t_eval(template, self=self, **fmt)
     
     def say(self, template, level="info", **fmt):
@@ -109,8 +114,6 @@ class ServerWatcher:
             **fmt
         )
 
-
-
     def shutdown(self):
         self.say(self.messages.shutdown)
         raise SystemExit
@@ -282,7 +285,6 @@ class ServerWatcher:
         # perform restart
         self.restart_and_wait()
 
-
     # main loop
     def run(self):
         if self.config.clear_terminal:

{serverwatcher-5.8.dev9 → serverwatcher-5.8.dev11/src/serverwatcher.egg-info}/PKG-INFO

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