serverwatcher 5.6.1__tar.gz → 5.8.dev2__tar.gz

{serverwatcher-5.6.1/src/serverwatcher.egg-info → serverwatcher-5.8.dev2}/PKG-INFO

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

{serverwatcher-5.6.1 → serverwatcher-5.8.dev2}/pyproject.toml

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

{serverwatcher-5.6.1 → serverwatcher-5.8.dev2}/src/serverwatcher/validator.py

@@ -1,12 +1,13 @@
 import sys
 from dataclasses import fields
 
-from hungerlib.addons import loadConfig
+from hungerlib.addons import loadConfig, clearTerminal
 
 from serverwatcher.configclasses.config import GlobalConfig
 from serverwatcher.configclasses.messages import MessagesConfig
 from serverwatcher.configclasses.watcher import WatcherConfig
 
+clearTerminal()
 
 def deep_get_attr(obj, dotted):
     parts = dotted.split(".")
@@ -123,7 +124,7 @@ def validate_all():
     ensure_no_global_defaults(config, defaults)
     ensure_no_watcher_defaults(watcher, defaults)
 
-    if len(defaults) >= 7:
+    if len(defaults) >= 5:
         print("❌ CONFIG VALIDATION FAILED:\nIt looks like you haven't configured this yet! Please change these defaults:")
         for d in defaults:
             print(" -", d)

{serverwatcher-5.6.1 → serverwatcher-5.8.dev2}/src/serverwatcher/watcher.py

@@ -3,7 +3,7 @@ import time
 import re
 from zoneinfo import ZoneInfo
 
-from hungerlib import Panel, HungerLogger
+from hungerlib import Panel, MessageRouter
 from hungerlib.servers import MinecraftServer, GenericServer
 from hungerlib.addons import (
     clearTerminal,
@@ -26,11 +26,6 @@ validate_all()
 _T_EXPR = re.compile(r"{([^{}]+)}")
 
 def t_eval(template: str, /, **ctx):
-    """
-    Evaluate a t-string-like template with Python expressions inside { }.
-    Example:
-        t_eval("CPU: {snap.cpu}%", snap=snap)
-    """
     def repl(match):
         expr = match.group(1).strip()
         try:
@@ -88,10 +83,11 @@ class ServerWatcher:
             server_name=self.config.server_name
         )
 
-        self.log = HungerLogger(
-            name=self.config.logger_name,
+        self.router = ServerRouter(
+            name=logger_name,
             server=self.server,
             log_path=self.config.log_path,
+            formatter=self.fmt,
             console_backspaces=self.config.console_backspaces,
         )
 
@@ -103,8 +99,7 @@ class ServerWatcher:
     def say(self, template, level="info", **fmt):
         if not template:
             return
-        text = self.fmt(template, **fmt)
-        getattr(self.log, level)(text)
+        self.router.say(template, level=level, **fmt)
 
     def shutdown(self):
         self.say(self.messages.shutdown)
@@ -126,7 +121,7 @@ class ServerWatcher:
 
         if alive:
             self.say(self.messages.server_back_online)
-            self.say(self.messages.server_back_online_broadcast)
+            self.say(self.messages.server_back_online_broadcast, broadcast=True)
         else:
             self.say(self.messages.server_failed_restart, level="error")
 
@@ -137,12 +132,12 @@ class ServerWatcher:
         local_time = scheduled.astimezone(self.tz)
         time_str = local_time.strftime("%I:%M %p")
 
-        self.server.sendBroadcast(self.fmt(self.messages.broadcast_restart_at, time=time_str))
+        self.router.broadcast(self.fmt(self.messages.broadcast_restart_at, time=time_str))
 
         minute_callbacks = {
             int(k.split("_")[1]): (
                 lambda msg=self.fmt(getattr(self.messages, k)):
-                    self.server.sendBroadcast(msg)
+                    self.router.broadcast(msg)
             )
             for k in vars(self.messages)
             if k.startswith("minute_")
@@ -151,7 +146,7 @@ class ServerWatcher:
         second_callbacks = {
             int(k.split("_")[1]): (
                 lambda msg=self.fmt(getattr(self.messages, k)):
-                    self.server.sendBroadcast(msg)
+                    self.router.broadcast(msg)
             )
             for k in vars(self.messages)
             if k.startswith("second_")
@@ -214,15 +209,15 @@ class ServerWatcher:
         if restart_reasons:
             self.say(self.messages.pro_restart_splash, level="warn")
             for r in restart_reasons:
-                self.log.warn(f"{self.messages.bullet} {r}")
+                self.router.warn(f"{self.messages.bullet} {r}")
 
         if no_restart_reasons:
             self.say(self.messages.anti_restart_splash, level="warn")
             for r in no_restart_reasons:
-                self.log.warn(f"{self.messages.bullet} {r}")
+                self.router.warn(f"{self.messages.bullet} {r}")
 
-        self.log.warn(f"{self.messages.pro_restart_number} {pro}")
-        self.log.warn(f"{self.messages.anti_restart_number} {anti}")
+        self.router.warn(f"{self.messages.pro_restart_number} {pro}")
+        self.router.warn(f"{self.messages.anti_restart_number} {anti}")
 
         gap = abs(pro - anti)
 

{serverwatcher-5.6.1 → serverwatcher-5.8.dev2/src/serverwatcher.egg-info}/PKG-INFO

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