serverwatcher 5.8.dev3__py3-none-any.whl → 5.8.dev5__py3-none-any.whl

serverwatcher/watcher.py

@@ -1,3 +1,4 @@
+# serverwatcher.py
 import os
 import time
 import re
@@ -32,7 +33,6 @@ def t_eval(template: str, /, **ctx):
             return str(eval(expr, {}, ctx))
         except Exception as e:
             return f"<err:{e}>"
-
     return _T_EXPR.sub(repl, template)
 
 class ServerWatcher:
@@ -96,23 +96,18 @@ class ServerWatcher:
     def fmt(self, template: str, **fmt):
         return t_eval(template, self=self, **fmt)
 
-    def say(self, template, level="info", **fmt):
-        if not template:
-            return
-        self.router.say(template, level=level, **fmt)
-
     def shutdown(self):
-        self.say(self.messages.shutdown)
+        self.router.say(self.messages.shutdown)
         raise SystemExit
 
     def restart_and_wait(self):
         if self.watcherconfig.schedule_control:
             self.origin.disableSchedule(self.watcherconfig.restart_soon_id)
         self.server.restart()
-        self.say(self.messages.restart_action_sent)
+        self.router.say(self.messages.restart_action_sent)
         time.sleep(self.watcherconfig.restart_wait_seconds)
 
-        self.say(self.messages.status_check, level="warn")
+        self.router.say(self.messages.status_check, level="warn")
         alive = waitForOnline(
             self.server,
             timeout=self.watcherconfig.restart_timeout,
@@ -120,10 +115,10 @@ class ServerWatcher:
         )
 
         if alive:
-            self.say(self.messages.server_back_online)
-            self.say(self.messages.server_back_online_broadcast, broadcast=True)
+            self.router.say(self.messages.server_back_online)
+            self.router.say(self.messages.server_back_online_broadcast, broadcast=True)
         else:
-            self.say(self.messages.server_failed_restart, level="error")
+            self.router.say(self.messages.server_failed_restart, level="error")
 
     def schedule_restart(self, minutes):
         info = snapSchedule(minimumMinutes=minutes)
@@ -159,10 +154,10 @@ class ServerWatcher:
         )
 
     def evaluate(self):
-        self.say(self.messages.startup)
+        self.router.say(self.messages.startup)
 
         if not validateAll(self.panel, self.server):
-            self.say(self.messages.validation_fail, level="error")
+            self.router.say(self.messages.validation_fail, level="error")
             self.shutdown()
 
         self.server.refresh()
@@ -207,36 +202,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.say(self.messages.pro_restart_splash, level="warn")
             for r in restart_reasons:
-                self.router.warn(f"{self.messages.bullet} {r}")
+                self.router.say(f"{self.messages.bullet} {r}", level="warn")
 
         if no_restart_reasons:
-            self.say(self.messages.anti_restart_splash, level="warn")
+            self.router.say(self.messages.anti_restart_splash, level="warn")
             for r in no_restart_reasons:
-                self.router.warn(f"{self.messages.bullet} {r}")
+                self.router.say(f"{self.messages.bullet} {r}", level="warn")
 
-        self.router.warn(f"{self.messages.pro_restart_number} {pro}")
-        self.router.warn(f"{self.messages.anti_restart_number} {anti}")
+        self.router.say(f"{self.messages.pro_restart_number} {pro}", level="warn")
+        self.router.say(f"{self.messages.anti_restart_number} {anti}", level="warn")
 
         gap = abs(pro - anti)
 
         if pro == 0:
-            self.say(self.messages.no_restart)
+            self.router.say(self.messages.no_restart)
             return
 
         if pro > anti and snap.players == 0:
-            self.say(self.messages.immediate_restart)
+            self.router.say(self.messages.immediate_restart)
             self.restart_and_wait()
             return
 
-        self.say(self.messages.scheduled)
+        self.router.say(self.messages.scheduled)
 
         if gap <= 2:
-            self.say(self.messages.gap_low, level="warn", gap=gap)
+            self.router.say(self.messages.gap_low, level="warn", gap=gap)
             self.schedule_restart(self.watcherconfig.low_gap_minutes)
         else:
-            self.say(self.messages.gap_high, level="warn", gap=gap)
+            self.router.say(self.messages.gap_high, level="warn", gap=gap)
             self.schedule_restart(self.watcherconfig.high_gap_minutes)
 
         self.restart_and_wait()

{serverwatcher-5.8.dev3.dist-info → serverwatcher-5.8.dev5.dist-info}/METADATA

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

{serverwatcher-5.8.dev3.dist-info → serverwatcher-5.8.dev5.dist-info}/RECORD

@@ -1,6 +1,6 @@
 serverwatcher/__init__.py,sha256=Q_afN0XU29n48d6Gf0-LT2lLo3RiTWlHRT6rC_fYbjw,486
 serverwatcher/validator.py,sha256=W1-RX8UQWeO2DKEe3vC1_U6xISe_WnAVXHYT0pf4uWc,4753
-serverwatcher/watcher.py,sha256=zedkUtKocApwxNGwdSxa1lS0Ib_GzcHuAlXQct3vaN4,8476
+serverwatcher/watcher.py,sha256=B6Y23pbqqUPtl6a1j1c6XwGJ-EFRv91MoC8YcR6kUUw,8502
 serverwatcher/configclasses/__init__.py,sha256=YS0KhxtAJGdMcaiFstqTRNxIPLnR7s9v3Tkt5h2uKE4,182
 serverwatcher/configclasses/config.py,sha256=cnrRYaJ7W-SuUuVZI2tFgGWtmlLkMNNy51HxTud4tB8,1110
 serverwatcher/configclasses/messages.py,sha256=JZawv8_Kn9rns_bbuw0cuk5DhwinlueCao63NJIttXo,2770
@@ -8,8 +8,8 @@ serverwatcher/configclasses/watcher.py,sha256=urQvRr8b7OjK0sm5eovSg9S3vo0LWZxE0c
 serverwatcher/defaultconfigs/config.yaml,sha256=lq-eTwAG4QQKIJKniMeEj9eD_DG06zMNf-C7Scqa9KI,461
 serverwatcher/defaultconfigs/messages.yaml,sha256=Zft8a1XrZj2YcdVg1njQM55RZTCZdDWzaxi2raIPeOo,2090
 serverwatcher/defaultconfigs/watcher.yaml,sha256=1XUr7p5qRiaZkSccULVgEAGvHMFOM2IPNBRxdnG86NA,380
-serverwatcher-5.8.dev3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-serverwatcher-5.8.dev3.dist-info/METADATA,sha256=Ce07mjhada3tl2y7AC54eeoyurnD0WGy4TJv7aXek3A,1686
-serverwatcher-5.8.dev3.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-serverwatcher-5.8.dev3.dist-info/top_level.txt,sha256=8DJAf8WmmglgtZHkp8aoTriRJ2YPcS4F3DfOIkytASo,14
-serverwatcher-5.8.dev3.dist-info/RECORD,,
+serverwatcher-5.8.dev5.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+serverwatcher-5.8.dev5.dist-info/METADATA,sha256=SqQIIAWImbrmG_IaZMY4QOG6dCap7o6SV2gjNjWx4Vw,1686
+serverwatcher-5.8.dev5.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+serverwatcher-5.8.dev5.dist-info/top_level.txt,sha256=8DJAf8WmmglgtZHkp8aoTriRJ2YPcS4F3DfOIkytASo,14
+serverwatcher-5.8.dev5.dist-info/RECORD,,