serverwatcher 5.8.dev6__tar.gz → 5.8.dev8__tar.gz

{serverwatcher-5.8.dev6/src/serverwatcher.egg-info → serverwatcher-5.8.dev8}/PKG-INFO

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

{serverwatcher-5.8.dev6 → serverwatcher-5.8.dev8}/pyproject.toml

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

{serverwatcher-5.8.dev6 → serverwatcher-5.8.dev8}/src/serverwatcher/configclasses/config.py

@@ -6,6 +6,7 @@ def yaml_key(path: str, default=None):
 @dataclass
 class GlobalConfig:
     watch_interval: int = yaml_key("watch_interval")
+    timezone: str = yaml_key("timezone")
 
     panel_name: str = yaml_key("panel.name")
     panel_url: str = yaml_key("panel.url")
@@ -25,7 +26,6 @@ class GlobalConfig:
     enable_logging: bool = yaml_key("logger.enabled")
     logger_name: str = yaml_key("logger.name")
     log_path: str = yaml_key("logger.log_path")
-    timezone: str = yaml_key("logger.timezone")
 
     console_backspaces: int = yaml_key("terminal.backspaces")
     clear_terminal: bool = yaml_key("terminal.enable_clearing")

serverwatcher-5.8.dev8/src/serverwatcher/configclasses/messages.py

@@ -0,0 +1,64 @@
+from dataclasses import dataclass, field
+
+def yaml_key(path: str, default=None):
+    return field(default=default, metadata={"yaml_key": path})
+
+@dataclass
+class MessagesConfig:
+    prefix: str = yaml_key("prefix", default="<aqua>[Server Watcher]")
+    broadcast_restart_at: str = yaml_key("broadcast_restart_at")
+    bullet: str = yaml_key("bullet")
+
+    # minute messages
+    minute_120: str = yaml_key("broadcast_minutes.120", default="{prefix} Restart in 2 hours!")
+    minute_60: str = yaml_key("broadcast_minutes.60", default="{prefix} Restart in 1 hour!")
+    minute_45: str = yaml_key("broadcast_minutes.45", default="{prefix} Restart in 45 minutes!")
+    minute_30: str = yaml_key("broadcast_minutes.30", default="{prefix} Restart in 30 minutes!")
+    minute_15: str = yaml_key("broadcast_minutes.15", default="{prefix} Restart in 15 minutes!")
+    minute_5: str = yaml_key("broadcast_minutes.5", default="{prefix} Restart in 5 minutes!")
+    minute_1: str = yaml_key("broadcast_minutes.1", default="{prefix} Restart in 1 minute!")
+
+    # second messages
+    second_10: str = yaml_key("broadcast_seconds.10", default="{prefix} Restart in 10 seconds!")
+    second_9:  str = yaml_key("broadcast_seconds.9",  default="{prefix} Restart in 9 seconds!")
+    second_8:  str = yaml_key("broadcast_seconds.8",  default="{prefix} Restart in 8 seconds!")
+    second_7:  str = yaml_key("broadcast_seconds.7",  default="{prefix} Restart in 7 seconds!")
+    second_6:  str = yaml_key("broadcast_seconds.6",  default="{prefix} Restart in 6 seconds!")
+    second_5:  str = yaml_key("broadcast_seconds.5",  default="{prefix} Restart in 5 seconds!")
+    second_4:  str = yaml_key("broadcast_seconds.4",  default="{prefix} Restart in 4 seconds!")
+    second_3:  str = yaml_key("broadcast_seconds.3",  default="{prefix} Restart in 3 seconds!")
+    second_2:  str = yaml_key("broadcast_seconds.2",  default="{prefix} Restart in 2 seconds!")
+    second_1:  str = yaml_key("broadcast_seconds.1",  default="{prefix} Restart in 1 second!")
+
+    # logging
+    startup: str = yaml_key("logging.startup", default="{prefix} Default test logging.startup")
+    status_check: str = yaml_key("logging.status_check")
+    validation_fail: str = yaml_key("logging.validation_fail")
+    validation_ok: str = yaml_key("logging.validation_ok")
+    shutdown: str = yaml_key("logging.shutdown")
+    immediate_restart: str = yaml_key("logging.immediate_restart")
+    no_restart: str = yaml_key("logging.no_restart")
+    scheduled: str = yaml_key("logging.scheduled")
+    gap_low: str = yaml_key("logging.gap_low")
+    gap_high: str = yaml_key("logging.gap_high")
+
+    # reasons
+    pro_restart_splash: str = yaml_key("reasons.pro_splash")
+    anti_restart_splash: str = yaml_key("reasons.anti_splash")
+
+    reason_restart_soon: str = yaml_key("reasons.restart_soon")
+    reason_ram: str = yaml_key("reasons.ram")
+    reason_cpu: str = yaml_key("reasons.cpu")
+    reason_uptime: str = yaml_key("reasons.uptime")
+    reason_tps: str = yaml_key("reasons.tps")
+    reason_low_uptime: str = yaml_key("reasons.low_uptime")
+    reason_players: str = yaml_key("reasons.players")
+
+    pro_restart_number: str = yaml_key("reasons.pro_restart_number")
+    anti_restart_number: str = yaml_key("reasons.anti_restart_number")
+
+    # restarts
+    restart_action_sent: str = yaml_key("restarts.restart_action_sent")
+    server_back_online: str = yaml_key("restarts.back_online")
+    server_back_online_broadcast: str = yaml_key("restarts.back_online_broadcast")
+    server_failed_restart: str = yaml_key("restarts.failed_restart")

{serverwatcher-5.8.dev6 → serverwatcher-5.8.dev8}/src/serverwatcher/defaultconfigs/config.yaml

@@ -1,4 +1,5 @@
 watch_interval: 300
+timezone: 'America/Chicago'
 
 panel:
   name: 'My Panel'
@@ -21,7 +22,6 @@ logger:
   enabled: True
   name: 'Server Watcher'
   log_path: '/home/container/logs/'
-  timezone: 'America/Chicago'
 
 terminal:
   backspaces: 8

{serverwatcher-5.8.dev6 → serverwatcher-5.8.dev8}/src/serverwatcher/defaultconfigs/messages.yaml

@@ -46,7 +46,7 @@ reasons:
   uptime: 'Uptime {uptime} exceeds {threshold}h'
   tps: 'TPS {tps} is lower than {threshold}'
   low_uptime: 'Uptime {uptime} is shorter than 30m'
-  players: 'There {verb} {count} {plural} online'
+  players: 'There {verb} {count} {plural} online'         # produces: "There are 2 players online" or "There is 1 player online"
 
   pro_restart_number: 'Pro-restart: '
   anti_restart_number: 'Anti-restart:'

{serverwatcher-5.8.dev6 → serverwatcher-5.8.dev8/src/serverwatcher.egg-info}/PKG-INFO

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

serverwatcher-5.8.dev6/src/serverwatcher/configclasses/messages.py

@@ -1,64 +0,0 @@
-from dataclasses import dataclass, field
-
-def yaml_key(path: str, default=None):
-    return field(default=default, metadata={"yaml_key": path})
-
-@dataclass
-class MessagesConfig:
-    prefix: str = yaml_key("prefix")
-    broadcast_restart_at: str = yaml_key("broadcast_restart_at")
-    bullet: str = yaml_key("bullet")
-
-    # minute messages
-    minute_120: str = yaml_key("broadcast_minutes.120")
-    minute_60: str = yaml_key("broadcast_minutes.60")
-    minute_45: str = yaml_key("broadcast_minutes.45")
-    minute_30: str = yaml_key("broadcast_minutes.30")
-    minute_15: str = yaml_key("broadcast_minutes.15")
-    minute_5: str = yaml_key("broadcast_minutes.5")
-    minute_1: str = yaml_key("broadcast_minutes.1")
-
-    # second messages
-    second_10: str = yaml_key("broadcast_seconds.10")
-    second_9: str = yaml_key("broadcast_seconds.9")
-    second_8: str = yaml_key("broadcast_seconds.8")
-    second_7: str = yaml_key("broadcast_seconds.7")
-    second_6: str = yaml_key("broadcast_seconds.6")
-    second_5: str = yaml_key("broadcast_seconds.5")
-    second_4: str = yaml_key("broadcast_seconds.4")
-    second_3: str = yaml_key("broadcast_seconds.3")
-    second_2: str = yaml_key("broadcast_seconds.2")
-    second_1: str = yaml_key("broadcast_seconds.1")
-
-    # logging
-    startup: str = yaml_key("logging.startup")
-    status_check: str = yaml_key("logging.status_check")
-    validation_fail: str = yaml_key("logging.validation_fail")
-    validation_ok: str = yaml_key("logging.validation_ok")
-    shutdown: str = yaml_key("logging.shutdown")
-    immediate_restart: str = yaml_key("logging.immediate_restart")
-    no_restart: str = yaml_key("logging.no_restart")
-    scheduled: str = yaml_key("logging.scheduled")
-    gap_low: str = yaml_key("logging.gap_low")
-    gap_high: str = yaml_key("logging.gap_high")
-
-    # reasons
-    pro_restart_splash: str = yaml_key("reasons.pro_splash")
-    anti_restart_splash: str = yaml_key("reasons.anti_splash")
-
-    reason_restart_soon: str = yaml_key("reasons.restart_soon")
-    reason_ram: str = yaml_key("reasons.ram")
-    reason_cpu: str = yaml_key("reasons.cpu")
-    reason_uptime: str = yaml_key("reasons.uptime")
-    reason_tps: str = yaml_key("reasons.tps")
-    reason_low_uptime: str = yaml_key("reasons.low_uptime")
-    reason_players: str = yaml_key("reasons.players")
-
-    pro_restart_number: str = yaml_key("reasons.pro_restart_number")
-    anti_restart_number: str = yaml_key("reasons.anti_restart_number")
-
-    # restarts
-    restart_action_sent: str = yaml_key("restarts.restart_action_sent")
-    server_back_online: str = yaml_key("restarts.back_online")
-    server_back_online_broadcast: str = yaml_key("restarts.back_online_broadcast")
-    server_failed_restart: str = yaml_key("restarts.failed_restart")