serverwatcher 5.28__tar.gz → 5.29__tar.gz

{serverwatcher-5.28/src/serverwatcher.egg-info → serverwatcher-5.29}/PKG-INFO

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

{serverwatcher-5.28 → serverwatcher-5.29}/pyproject.toml

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

{serverwatcher-5.28 → serverwatcher-5.29}/src/serverwatcher/configclasses/messages.py

@@ -10,24 +10,8 @@ class MessagesConfig:
 
     broadcast_restart_at: str = 'broadcast_restart_at'
 
-    minute_120: str = 'broadcast_minutes.120'
-    minute_60:  str = 'broadcast_minutes.60'
-    minute_45:  str = 'broadcast_minutes.45'
-    minute_30:  str = 'broadcast_minutes.30'
-    minute_15:  str = 'broadcast_minutes.15'
-    minute_5:   str = 'broadcast_minutes.5'
-    minute_1:   str = 'broadcast_minutes.1'
-
-    second_10: str = 'broadcast_seconds.10'
-    second_9:  str = 'broadcast_seconds.9'
-    second_8:  str = 'broadcast_seconds.8'
-    second_7:  str = 'broadcast_seconds.7'
-    second_6:  str = 'broadcast_seconds.6'
-    second_5:  str = 'broadcast_seconds.5'
-    second_4:  str = 'broadcast_seconds.4'
-    second_3:  str = 'broadcast_seconds.3'
-    second_2:  str = 'broadcast_seconds.2'
-    second_1:  str = 'broadcast_seconds.1'
+    minute_template: str = 'broadcast_templates.minutes'
+    second_template: str = 'broadcast_templates.seconds'
 
     startup: str = 'logging.startup'
     status_check: str = 'logging.status_check'
@@ -66,24 +50,8 @@ class fallbacks:
 
     broadcast_restart_at = '{prefix} The server will restart at {time} CDT.'
 
-    minute_120 = '{prefix} The server will restart in 2 hours.'
-    minute_60  = '{prefix} The server will restart in 1 hour.'
-    minute_45  = '{prefix} The server will restart in 45 minutes.'
-    minute_30  = '{prefix} The server will restart in 30 minutes.'
-    minute_15  = '{prefix} The server will restart in 15 minutes.'
-    minute_5   = '{prefix} The server will restart in 5 minutes.'
-    minute_1   = '{prefix} The server will restart in 1 minute.'
-
-    second_10 = '{prefix} <red>The server is restarting in 10 seconds!'
-    second_9  = '{prefix} <red>The server is restarting in 9 seconds!'
-    second_8  = '{prefix} <red>The server is restarting in 8 seconds!'
-    second_7  = '{prefix} <red>The server is restarting in 7 seconds!'
-    second_6  = '{prefix} <red>The server is restarting in 6 seconds!'
-    second_5  = '{prefix} <red>The server is restarting in 5 seconds!'
-    second_4  = '{prefix} <red>The server is restarting in 4 seconds!'
-    second_3  = '{prefix} <red>The server is restarting in 3 seconds!'
-    second_2  = '{prefix} <red>The server is restarting in 2 seconds!'
-    second_1  = '{prefix} <red>The server is restarting in 1 second!'
+    minute_template = '{prefix} Restart in {n} minute{s}!'
+    second_template = '{prefix} <red>Restarting in {n} second{s}!'
 
     startup = 'ServerWatcher is running!'
     status_check = 'Checking server status...'

{serverwatcher-5.28 → serverwatcher-5.29}/src/serverwatcher/configclasses/watcher.py

@@ -7,8 +7,8 @@ class WatcherConfig:
 
     watch_interval: int = 'watch_interval'
 
-    sample_duration: float = 'sampling.duration'
-    sample_interval: float = 'sampling.interval'
+    sample_duration: float | int = 'sampling.duration'
+    sample_interval: float | int = 'sampling.interval'
     sample_outlier_drop: int = 'sampling.drop_outliers'
 
     threshold_ram: int = 'thresholds.ram'
@@ -40,8 +40,8 @@ class WatcherConfig:
 class fallbacks:
     watch_interval = 300
 
-    sample_duration = 5.0
-    sample_interval = 1.0
+    sample_duration = 5
+    sample_interval = 1
     sample_outlier_drop = 1
 
     threshold_ram = 6

{serverwatcher-5.28 → serverwatcher-5.29}/src/serverwatcher/defaultconfigs/messages.yaml

@@ -43,6 +43,10 @@ bullet: '-'
 
 broadcast_restart_at: '{prefix} The server will restart at {time} CDT.'
 
+broadcast_templates:
+  minutes: '{prefix} Restart in {n} minute{s}!'
+  seconds: '{prefix} <red>Restarting in {n} second{s}!'
+
 broadcast_minutes: {}
 broadcast_seconds: {}
 

{serverwatcher-5.28 → serverwatcher-5.29}/src/serverwatcher/watcher.py

@@ -131,26 +131,35 @@ class ServerWatcher:
 
         self.router.broadcast(self.messages.broadcast_restart_at, time=time_str)
 
-        # minute callbacks
+        def plural(n):
+            return '' if n == 1 else 's'
+
+        # minute message generator
+        def minute_msg(n):
+            raw = self.messages.minute_template
+            return self.res(raw, n=n, s=plural(n))
+
+        # second message generator
+        def second_msg(n):
+            raw = self.messages.second_template
+            return self.res(raw, n=n, s=plural(n))
+
+        # minute callbacks using template
         minute_callbacks = {
-            int(k.split("_")[1]): (
-                lambda raw=self.messages.as_map()[k]:
-                    (self.router.broadcast(self.res(raw)),
-                     self.router.origin(raw))
-            )
-            for k in self.messages.as_map()
-            if k.startswith("minute_")
+            n: (lambda n=n: (
+                self.router.broadcast(minute_msg(n)),
+                self.router.origin(minute_msg(n))
+            ))
+            for n in self.watcherconfig.snap_minutes
         }
 
-        # second callbacks
+        # second callbacks using template
         second_callbacks = {
-            int(k.split("_")[1]): (
-                lambda raw=self.messages.as_map()[k]:
-                    (self.router.broadcast(self.res(raw)),
-                     self.router.origin(raw))
-            )
-            for k in self.messages.as_map()
-            if k.startswith("second_")
+            n: (lambda n=n: (
+                self.router.broadcast(second_msg(n)),
+                self.router.origin(second_msg(n))
+            ))
+            for n in range(1, 11)
         }
 
         utils.runCountdownEvents(
@@ -180,21 +189,15 @@ class ServerWatcher:
         no_restart_reasons = []
 
         if snap.ram >= self.watcherconfig.threshold_ram:
-            restart_reasons.append(
-                self.res(self.messages.reason_ram, ram=snap.ram, threshold=self.watcherconfig.threshold_ram)
-            )
+            restart_reasons.append(self.res(self.messages.reason_ram, ram=snap.ram, threshold=self.watcherconfig.threshold_ram))
             pro += int(round(snap.ram, 0) - (self.watcherconfig.threshold_ram - 1))
 
         if snap.cpu >= self.watcherconfig.threshold_cpu:
-            restart_reasons.append(
-                self.res(self.messages.reason_cpu, cpu=snap.cpu, threshold=self.watcherconfig.threshold_cpu)
-            )
+            restart_reasons.append(self.res(self.messages.reason_cpu, cpu=snap.cpu, threshold=self.watcherconfig.threshold_cpu))
             pro += self.watcherconfig.weight_cpu
 
         if snap.uptime // 3600 >= self.watcherconfig.threshold_uptime:
-            restart_reasons.append(
-                self.res(self.messages.reason_uptime, uptime=snap.uptime_formatted, threshold=self.watcherconfig.threshold_uptime)
-            )
+            restart_reasons.append(self.res(self.messages.reason_uptime, uptime=snap.uptime_formatted, threshold=self.watcherconfig.threshold_uptime))
             pro += self.watcherconfig.weight_uptime
 
         if (snap.tps if snap.tps is not None else 20) <= self.watcherconfig.threshold_tps:

{serverwatcher-5.28 → serverwatcher-5.29/src/serverwatcher.egg-info}/PKG-INFO

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