serverwatcher 5.8.dev11__tar.gz → 5.8.dev12__tar.gz

{serverwatcher-5.8.dev11/src/serverwatcher.egg-info → serverwatcher-5.8.dev12}/PKG-INFO

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

{serverwatcher-5.8.dev11 → serverwatcher-5.8.dev12}/pyproject.toml

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

{serverwatcher-5.8.dev11 → serverwatcher-5.8.dev12}/src/serverwatcher/configclasses/config.py

@@ -5,7 +5,6 @@ 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")

{serverwatcher-5.8.dev11 → serverwatcher-5.8.dev12}/src/serverwatcher/configclasses/watcher.py

@@ -5,6 +5,7 @@ def yaml_key(path: str, default=None):
 
 @dataclass
 class WatcherConfig:
+    watch_interval: int = yaml_key("watch_interval")
     schedule_control: bool = yaml_key("schedule_control.enabled")
     restart_soon_id: int = yaml_key("schedule_control.restart_soon_id")
 

{serverwatcher-5.8.dev11 → serverwatcher-5.8.dev12}/src/serverwatcher/defaultconfigs/config.yaml

@@ -1,4 +1,3 @@
-watch_interval: 300
 timezone: 'America/Chicago'
 
 panel:

{serverwatcher-5.8.dev11 → serverwatcher-5.8.dev12}/src/serverwatcher/defaultconfigs/messages.yaml

@@ -3,26 +3,8 @@ bullet: '-'
 
 broadcast_restart_at: '{prefix} The server will restart at {time} CDT.'
 
-broadcast_minutes:
-  '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_seconds:
-  '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!'
+broadcast_minutes: {}
+broadcast_seconds: {}
 
 logging:
   startup: 'ServerWatcher is running!'

{serverwatcher-5.8.dev11 → serverwatcher-5.8.dev12}/src/serverwatcher/defaultconfigs/watcher.yaml

@@ -1,3 +1,5 @@
+watch_interval: 300
+
 schedule_control:
   enabled: False
   restart_soon_id: 0     # replace this with a real schedule id

{serverwatcher-5.8.dev11 → serverwatcher-5.8.dev12}/src/serverwatcher/validator.py

@@ -50,8 +50,8 @@ def validate_dataclass(config_obj, schema, errors):
 
 
 def validate_global_config(config, errors):
-    if config.watch_interval < 1:
-        errors.append(f"watch_interval: must be >= 1 (got {config.watch_interval})")
+    if watcher.watch_interval < 1:
+        errors.append(f"watch_interval: must be >= 1 (got {watcher.watch_interval})")
 
     if config.server_port <= 0 or config.server_port > 65535:
         errors.append(f"server_port: must be 1–65535 (got {config.server_port})")

{serverwatcher-5.8.dev11 → serverwatcher-5.8.dev12}/src/serverwatcher/watcher.py

@@ -293,4 +293,4 @@ class ServerWatcher:
             if self.config.clear_terminal:
                 clearTerminal()
             self.evaluate()
-            time.sleep(self.config.watch_interval)
+            time.sleep(self.watcher.watch_interval)

{serverwatcher-5.8.dev11 → serverwatcher-5.8.dev12/src/serverwatcher.egg-info}/PKG-INFO

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