serverwatcher 5.10__tar.gz → 5.12__tar.gz

{serverwatcher-5.10/src/serverwatcher.egg-info → serverwatcher-5.12}/PKG-INFO

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

{serverwatcher-5.10 → serverwatcher-5.12}/pyproject.toml

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

{serverwatcher-5.10 → serverwatcher-5.12}/src/serverwatcher/watcher.py

@@ -64,41 +64,14 @@ class ServerWatcher:
         
         self.router = MessageRouter(
             name=logger_name,
-            server=self.server,
+            Servers=[self.server],
             log_path=self.config.log_path,
-            formatter=self._fmt,
         )
 
         self.tz = ZoneInfo(self.config.timezone)
 
-    def _fmt(self, template: str, **ctx):
-        return mapit(template, **ctx)
-
-    def say(self, template, level="info", only_maps=None, disable=None, enable=None, **ctx):
-        if not template:
-            return
-
-        msg = mapit(
-            template,
-            only_maps=only_maps,
-            disable=disable,
-            enable=enable,
-        )
-
-        self.router.say(
-            msg,
-            level=level,
-            log=self.config.enable_logging,
-        )
-
-    def say_mc(self, template, level="info", only_maps=None, disable=None, enable=None, **ctx):
-        disable = (disable or []) + [utils.ASCII_COLOR_MAP]
-        enable = (enable or []) + [utils.MC_COLOR_MAP]
-        msg = mapit(template, only_maps=only_maps, disable=disable, enable=enable, **ctx)
-        self.router.broadcast(msg)
-
     def shutdown(self):
-        self.say(self.messages.shutdown)
+        self.router.info(self.messages.shutdown)
         raise SystemExit
 
     def restart_and_wait(self):
@@ -106,10 +79,10 @@ class ServerWatcher:
             self.origin.disableSchedule(self.watcherconfig.restart_soon_id)
 
         self.server.restart()
-        self.say(self.messages.restart_action_sent)
+        self.router.info(self.messages.restart_action_sent)
         time.sleep(self.watcherconfig.restart_wait_seconds)
 
-        self.say(self.messages.status_check, level="warn")
+        self.router.warn(self.messages.status_check)
         alive = utils.waitForOnline(
             self.server,
             timeout=self.watcherconfig.restart_timeout,
@@ -117,10 +90,16 @@ class ServerWatcher:
         )
 
         if alive:
-            self.say(self.messages.server_back_online)
-            self.say_mc(self.messages.server_back_online_broadcast)
+            self.router.info(self.messages.server_back_online)
+            self.router.broadcast(
+                mapit(
+                    self.messages.server_back_online_broadcast,
+                    enable=[utils.MC_COLOR_MAP],
+                    disable=[utils.ASCII_COLOR_MAP]
+                )
+            )
         else:
-            self.say(self.messages.server_failed_restart, level="error")
+            self.router.error(self.messages.server_failed_restart)
 
     def schedule_restart(self, minutes):
         info = utils.snapSchedule(minimumMinutes=minutes)
@@ -129,12 +108,19 @@ class ServerWatcher:
         local_time = scheduled.astimezone(self.tz)
         time_str = local_time.strftime("%I:%M %p")
 
-        self.say_mc(self.messages.broadcast_restart_at, time=time_str)
+        self.router.broadcast(
+            mapit(
+                self.messages.broadcast_restart_at,
+                time=time_str,
+                enable=[utils.MC_COLOR_MAP],
+                disable=[utils.ASCII_COLOR_MAP]
+            )
+        )
 
         minute_callbacks = {
             int(k.split("_")[1]): (
-                lambda msg=mapit(getattr(self.messages, k)):
-                    self.say_mc(msg)
+                lambda msg=mapit(getattr(self.messages, k), enable=[utils.MC_COLOR_MAP], disable=[utils.ASCII_COLOR_MAP]):
+                    self.router.broadcast(msg)
             )
             for k in vars(self.messages)
             if k.startswith("minute_")
@@ -142,8 +128,8 @@ class ServerWatcher:
 
         second_callbacks = {
             int(k.split("_")[1]): (
-                lambda msg=mapit(getattr(self.messages, k)):
-                    self.say_mc(msg)
+                lambda msg=mapit(getattr(self.messages, k), enable=[utils.MC_COLOR_MAP], disable=[utils.ASCII_COLOR_MAP]):
+                    self.router.broadcast(msg)
             )
             for k in vars(self.messages)
             if k.startswith("second_")
@@ -156,10 +142,10 @@ class ServerWatcher:
         )
 
     def evaluate(self):
-        self.say("ServerWatcher is running!")
+        self.router.info("ServerWatcher is running!")
 
         if not utils.validateAll(self.panel, self.server):
-            self.say(self.messages.validation_fail, level="error")
+            self.router.error(self.messages.validation_fail)
             self.shutdown()
 
         self.server.refresh()
@@ -203,36 +189,36 @@ class ServerWatcher:
             anti += snap.players * self.watcherconfig.weight_per_player
 
         if restart_reasons:
-            self.say(self.messages.pro_restart_splash, level="warn")
+            self.router.warn(self.messages.pro_restart_splash)
             for r in restart_reasons:
-                self.say(f"{self.messages.bullet} {r}", level="warn")
+                self.router.warn(f"{self.messages.bullet} {r}")
 
         if no_restart_reasons:
-            self.say(self.messages.anti_restart_splash, level="warn")
+            self.router.warn(self.messages.anti_restart_splash)
             for r in no_restart_reasons:
-                self.say(f"{self.messages.bullet} {r}", level="warn")
+                self.router.warn(f"{self.messages.bullet} {r}")
 
-        self.say(f"{self.messages.pro_restart_number} {pro}", level="warn")
-        self.say(f"{self.messages.anti_restart_number} {anti}", level="warn")
+        self.router.warn(f"{self.messages.pro_restart_number} {pro}")
+        self.router.warn(f"{self.messages.anti_restart_number} {anti}")
 
         gap = abs(pro - anti)
 
         if pro == 0:
-            self.say(self.messages.no_restart)
+            self.router.info(self.messages.no_restart)
             return
 
         if pro > anti and snap.players == 0:
-            self.say(self.messages.immediate_restart)
+            self.router.info(self.messages.immediate_restart)
             self.restart_and_wait()
             return
 
-        self.say(self.messages.scheduled)
+        self.router.info(self.messages.scheduled)
 
         if gap <= 2:
-            self.say(self.messages.gap_low, level="warn", gap=gap)
+            self.router.warn(self.messages.gap_low, gap=gap)
             self.schedule_restart(self.watcherconfig.low_gap_minutes)
         else:
-            self.say(self.messages.gap_high, level="warn", gap=gap)
+            self.router.warn(self.messages.gap_high, gap=gap)
             self.schedule_restart(self.watcherconfig.high_gap_minutes)
 
         self.restart_and_wait()

{serverwatcher-5.10 → serverwatcher-5.12/src/serverwatcher.egg-info}/PKG-INFO

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