serverwatcher 3.6.4__tar.gz → 3.7.1__tar.gz

{serverwatcher-3.6.4/src/serverwatcher.egg-info → serverwatcher-3.7.1}/PKG-INFO

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

{serverwatcher-3.6.4 → serverwatcher-3.7.1}/pyproject.toml

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

serverwatcher-3.7.1/src/serverwatcher/config/messages.py

@@ -0,0 +1,53 @@
+from dataclasses import dataclass, field
+
+@dataclass
+@dataclass
+class MessagesConfig:
+    prefix: str
+    broadcast_restart_at: str
+
+    # minute messages
+    minute_120: str
+    minute_60: str
+    minute_45: str
+    minute_30: str
+    minute_15: str
+    minute_5: str
+    minute_1: str
+
+    # second messages
+    second_10: str
+    second_9: str
+    second_8: str
+    second_7: str
+    second_6: str
+    second_5: str
+    second_4: str
+    second_3: str
+    second_2: str
+    second_1: str
+
+    # logging
+    log_start: str
+    log_validation_fail: str
+    log_validation_ok: str
+    log_immediate_restart: str
+    log_no_restart: str
+    log_scheduled: str
+    log_gap_low: str
+    log_gap_high: str
+
+    # reasons
+    reason_restart_soon: str
+    reason_ram: str
+    reason_cpu: str
+    reason_uptime: str
+    reason_tps: str
+    reason_low_uptime: str
+    reason_players: str
+
+    # restarts
+    restart_action_sent: str
+    server_back_online: str
+    server_back_online_broadcast: str
+    server_failed_restart: str

serverwatcher-3.7.1/src/serverwatcher/defaultconfigs/messages.yaml

@@ -0,0 +1,49 @@
+prefix: "<aqua>[Server Watcher]"
+
+broadcast_restart_at: "{prefix} The server will restart at {time} CDT."
+
+broadcast_minute:
+  minute_120: "{prefix} Restart in 2 hours!"
+  minute_60: "{prefix} Restart in 1 hour!"
+  minute_45: "{prefix} Restart in 45 minutes!"
+  minute_30: "{prefix} Restart in 30 minutes!"
+  minute_15: "{prefix} Restart in 15 minutes!"
+  minute_5: "{prefix} Restart in 5 minutes!"
+  minute_1: "{prefix} Restart in 1 minute!"
+
+broadcast_second:
+  second_10: "{prefix} Restart in 10 seconds!"
+  second_9: "{prefix} Restart in 9 seconds!"
+  second_8: "{prefix} Restart in 8 seconds!"
+  second_7: "{prefix} Restart in 7 seconds!"
+  second_6: "{prefix} Restart in 6 seconds!"
+  second_5: "{prefix} Restart in 5 seconds!"
+  second_4: "{prefix} Restart in 4 seconds!"
+  second_3: "{prefix} Restart in 3 seconds!"
+  second_2: "{prefix} Restart in 2 seconds!"
+  second_1: "{prefix} Restart in 1 second!"
+
+logging:
+  log_start: "ServerWatcher is running!"
+  log_validation_fail: "Validation FAILED."
+  log_validation_ok: "All validation checks succeeded."
+  log_immediate_restart: "Restarting immediately."
+  log_no_restart: "The server does not need to restart."
+  log_scheduled: "Restart needed, but anti-restart factors outweigh it."
+  log_gap_low: "Gap {gap}. Scheduling restart in 2 hours."
+  log_gap_high: "Gap {gap}. Scheduling restart in 1 hour."
+
+reasons:
+  reason_restart_soon: "The server is set to restart soon"
+  reason_ram: "RAM usage ({ram}) is higher than {threshold} GB"
+  reason_cpu: "CPU usage ({cpu}) is higher than {threshold}%"
+  reason_uptime: "Uptime {uptime} exceeds {threshold}h"
+  reason_tps: "TPS {tps} is lower than {threshold}"
+  reason_low_uptime: "Uptime {uptime} is shorter than 30m"
+  reason_players: "There {verb} {count} {plural} online"
+
+restarts:
+  restart_action_sent: "Restart action sent. Waiting..."
+  server_back_online: "Server is back online!"
+  server_back_online_broadcast: "{prefix} <green>Restart successful!"
+  server_failed_restart: "Server failed to restart!"

{serverwatcher-3.6.4 → serverwatcher-3.7.1}/src/serverwatcher/watcher.py

@@ -142,22 +142,40 @@ class ServerWatcher:
         local_time = scheduled.astimezone(self.tz)
         time_str = local_time.strftime("%I:%M %p")
 
+        # Broadcast the scheduled restart time
         self.server.sendBroadcast(
             self.fmt(self.messages.broadcast_restart_at, time=time_str)
         )
 
+        # Collect all minute_* keys
+        minute_keys = [
+            k for k in vars(self.messages)
+            if k.startswith("minute_")
+        ]
+
         minute_callbacks = {
-            m: (lambda msg=self.fmt(self.messages.broadcast_minute[m]):
-                self.server.sendBroadcast(msg))
-            for m in self.messages.broadcast_minute
+            int(k.split("_")[1]): (
+                lambda msg=self.fmt(getattr(self.messages, k)):
+                    self.server.sendBroadcast(msg)
+            )
+            for k in minute_keys
         }
 
+        # Collect all second_* keys
+        second_keys = [
+            k for k in vars(self.messages)
+            if k.startswith("second_")
+        ]
+
         second_callbacks = {
-            s: (lambda msg=self.fmt(self.messages.broadcast_second[s]):
-                self.server.sendBroadcast(msg))
-            for s in self.messages.broadcast_second
+            int(k.split("_")[1]): (
+                lambda msg=self.fmt(getattr(self.messages, k)):
+                    self.server.sendBroadcast(msg)
+            )
+            for k in second_keys
         }
 
+
         runCountdownEvents(
             target_time=scheduled,
             minute_callbacks=minute_callbacks,

{serverwatcher-3.6.4 → serverwatcher-3.7.1/src/serverwatcher.egg-info}/PKG-INFO

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

serverwatcher-3.6.4/src/serverwatcher/config/messages.py

@@ -1,30 +0,0 @@
-from dataclasses import dataclass, field
-
-@dataclass
-class MessagesConfig:
-    prefix: str
-    broadcast_restart_at: str
-    broadcast_minute: dict = field(default_factory=dict)
-    broadcast_second: dict = field(default_factory=dict)
-
-    log_start: str = ""
-    log_validation_fail: str = ""
-    log_validation_ok: str = ""
-    log_immediate_restart: str = ""
-    log_no_restart: str = ""
-    log_scheduled: str = ""
-    log_gap_low: str = ""
-    log_gap_high: str = ""
-
-    reason_restart_soon: str = ""
-    reason_ram: str = ""
-    reason_cpu: str = ""
-    reason_uptime: str = ""
-    reason_tps: str = ""
-    reason_low_uptime: str = ""
-    reason_players: str = ""
-
-    restart_action_sent: str = ""
-    server_back_online: str = ""
-    server_back_online_broadcast: str = ""
-    server_failed_restart: str = ""

serverwatcher-3.6.4/src/serverwatcher/defaultconfigs/messages.yaml

@@ -1,47 +0,0 @@
-prefix: "<aqua>[Server Watcher]"
-
-broadcast_restart_at: "{prefix} The server will restart at {time} CDT."
-
-broadcast_minute:
-  120: "{prefix} Restart in 2 hours!"
-  60: "{prefix} Restart in 1 hour!"
-  45: "{prefix} Restart in 45 minutes!"
-  30: "{prefix} Restart in 30 minutes!"
-  15: "{prefix} Restart in 15 minutes!"
-  5: "{prefix} Restart in 5 minutes!"
-  1: "{prefix} Restart in 1 minute!"
-
-broadcast_second:
-  10: "{prefix} Restart in 10 seconds!"
-  9: "{prefix} Restart in 9 seconds!"
-  8: "{prefix} Restart in 8 seconds!"
-  7: "{prefix} Restart in 7 seconds!"
-  6: "{prefix} Restart in 6 seconds!"
-  5: "{prefix} Restart in 5 seconds!"
-  4: "{prefix} Restart in 4 seconds!"
-  3: "{prefix} Restart in 3 seconds!"
-  2: "{prefix} Restart in 2 seconds!"
-  1: "{prefix} Restart in 1 second!"
-
-log_start: "ServerWatcher is running!"
-log_validation_fail: "Validation FAILED."
-log_validation_ok: "All validation checks succeeded."
-log_immediate_restart: "Restarting immediately."
-log_no_restart: "The server does not need to restart."
-log_scheduled: "Restart needed, but anti-restart factors outweigh it."
-log_gap_low: "Gap {gap}. Scheduling restart in 2 hours."
-log_gap_high: "Gap {gap}. Scheduling restart in 1 hour."
-
-reason_restart_soon: "The server is set to restart soon"
-reason_ram: "RAM usage ({ram}) is higher than {threshold} GB"
-reason_cpu: "CPU usage ({cpu}) is higher than {threshold}%"
-reason_uptime: "Uptime {uptime} exceeds {threshold}h"
-reason_tps: "TPS {tps} is lower than {threshold}"
-reason_low_uptime: "Uptime {uptime} is shorter than 30m"
-reason_players: "There {verb} {count} {plural} online"
-
-# New values, will reorder later
-restart_action_sent: "Restart action sent. Waiting..."
-server_back_online: "Server is back online!"
-server_back_online_broadcast: "{prefix} <green>Restart successful!"
-server_failed_restart: "Server failed to restart!"