serverwatcher 5.8.dev11__py3-none-any.whl → 5.8.dev12__py3-none-any.whl

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/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/defaultconfigs/config.yaml

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

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/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/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/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.dist-info → serverwatcher-5.8.dev12.dist-info}/METADATA

@@ -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.dev12.dist-info/RECORD

@@ -0,0 +1,15 @@
+serverwatcher/__init__.py,sha256=Q_afN0XU29n48d6Gf0-LT2lLo3RiTWlHRT6rC_fYbjw,486
+serverwatcher/validator.py,sha256=hsJQhK8grwGtkqUew_afOdcHmfzI7C4yLTtYNe3yTgw,4755
+serverwatcher/watcher.py,sha256=M-RrYnbUumVcrDIoyMotSySBBy16a3Z3gOHQQr26mfQ,9952
+serverwatcher/configclasses/__init__.py,sha256=YS0KhxtAJGdMcaiFstqTRNxIPLnR7s9v3Tkt5h2uKE4,182
+serverwatcher/configclasses/config.py,sha256=f7gXQksR4GYEgWrrhL3nit0H3lGVu1BO3nakPwQpBCc,1050
+serverwatcher/configclasses/messages.py,sha256=15OlzUij7Y7LMVd_g-rbeU8zsyWEGL1gJtePnJgU_i8,3538
+serverwatcher/configclasses/watcher.py,sha256=5JgQhrPmVsT1iJT1teqa8w59H7v0r7WrR8SNoi__4nw,1283
+serverwatcher/defaultconfigs/config.yaml,sha256=dd4us7FybIkx43h7RIWxCpMn-pQLMz0Gw1c8EA2yrCs,439
+serverwatcher/defaultconfigs/messages.yaml,sha256=EFqAyyBKKVN6egtjir6Wl1YzTBVzVlbp_BwX_X-SawI,1490
+serverwatcher/defaultconfigs/watcher.yaml,sha256=fsfU7G7yGhc4mzGOSQA1IEa5Ru6aouc9BZG2zTYWF7g,401
+serverwatcher-5.8.dev12.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+serverwatcher-5.8.dev12.dist-info/METADATA,sha256=gfplbOiDnu8hPfpCWSulbV87tWhKUnF5uspKd50u7uY,1687
+serverwatcher-5.8.dev12.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+serverwatcher-5.8.dev12.dist-info/top_level.txt,sha256=8DJAf8WmmglgtZHkp8aoTriRJ2YPcS4F3DfOIkytASo,14
+serverwatcher-5.8.dev12.dist-info/RECORD,,

serverwatcher-5.8.dev11.dist-info/RECORD

@@ -1,15 +0,0 @@
-serverwatcher/__init__.py,sha256=Q_afN0XU29n48d6Gf0-LT2lLo3RiTWlHRT6rC_fYbjw,486
-serverwatcher/validator.py,sha256=W1-RX8UQWeO2DKEe3vC1_U6xISe_WnAVXHYT0pf4uWc,4753
-serverwatcher/watcher.py,sha256=9fQevTcp-F2yZj5eYnVxhC6e9iBOX1FQnbZg8bGLNes,9951
-serverwatcher/configclasses/__init__.py,sha256=YS0KhxtAJGdMcaiFstqTRNxIPLnR7s9v3Tkt5h2uKE4,182
-serverwatcher/configclasses/config.py,sha256=g5QF_QxyQxcKRYagBCoozBYWT70ibpP684bpFg74SGM,1103
-serverwatcher/configclasses/messages.py,sha256=15OlzUij7Y7LMVd_g-rbeU8zsyWEGL1gJtePnJgU_i8,3538
-serverwatcher/configclasses/watcher.py,sha256=urQvRr8b7OjK0sm5eovSg9S3vo0LWZxE0cqpwX6NXbE,1230
-serverwatcher/defaultconfigs/config.yaml,sha256=7jAFWDkC6S68z6co0A_9H8vPYPDKDvDeopaaDHUX_Ks,459
-serverwatcher/defaultconfigs/messages.yaml,sha256=PQ5oMqinbUdEAaI0ViVvFGQta3fEwKj9cmSu_KOsPlY,2169
-serverwatcher/defaultconfigs/watcher.yaml,sha256=1XUr7p5qRiaZkSccULVgEAGvHMFOM2IPNBRxdnG86NA,380
-serverwatcher-5.8.dev11.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-serverwatcher-5.8.dev11.dist-info/METADATA,sha256=08sPGDLVW6EgXmw9Qhkk_uJF8G0YkKKmh3TE_mJHVUs,1687
-serverwatcher-5.8.dev11.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-serverwatcher-5.8.dev11.dist-info/top_level.txt,sha256=8DJAf8WmmglgtZHkp8aoTriRJ2YPcS4F3DfOIkytASo,14
-serverwatcher-5.8.dev11.dist-info/RECORD,,