serverwatcher 5.24.2__tar.gz → 5.26__tar.gz

{serverwatcher-5.24.2/src/serverwatcher.egg-info → serverwatcher-5.26}/PKG-INFO

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

{serverwatcher-5.24.2 → serverwatcher-5.26}/pyproject.toml

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

serverwatcher-5.26/src/serverwatcher/__main__.py

@@ -0,0 +1,34 @@
+from .watcher import ServerWatcher
+from .validator import validate_all
+from hungerlib.utils.exceptions import (
+    ValidationError,
+    FatalValidationError,
+    ValidationFallbacks,
+)
+import time
+
+def main():
+    try:
+        validate_all()
+
+    except FatalValidationError as e:
+        print("❌ FATAL CONFIG ERROR:")
+        print(e)
+        return  # fully cancel
+
+    except ValidationFallbacks as e:
+        print("⚠️ CONFIG DEFAULTS IN USE:")
+        print(e)
+        print("Continuing in 5 seconds...")
+        time.sleep(5)
+
+    except ValidationError as e:
+        print("❌ CONFIG ERROR:")
+        print(e)
+        return  # non-fatal but still cancel
+
+    watcher = ServerWatcher()
+    watcher.run()
+
+if __name__ == "__main__":
+    main()

{serverwatcher-5.24.2 → serverwatcher-5.26}/src/serverwatcher/validator.py

@@ -106,52 +106,15 @@ def validate_all():
     messages = loadConfig(MessagesConfig)
     watcherconfig = loadConfig(WatcherConfig)
 
-    # type checks
     v.validate_key_types(config, GlobalConfig)
     v.validate_key_types(messages, MessagesConfig)
     v.validate_key_types(watcherconfig, WatcherConfig)
 
-    # semantic checks
     validate_global_config(config)
     validate_watcher_config(watcherconfig)
     validate_messages_config(messages)
 
-    critical_default_keys = [
-        "panel_url",
-        "panel_api_key",
-        "server_id",
-        "server_domain",
-        "bridge_token",
-    ]
-    critical_defaults_used = [
-        d for d in v.defaults
-        if any(d.startswith(k) for k in critical_default_keys)
-    ]
-
-    if len(critical_defaults_used) >= 3:
-        print('❌ CONFIG VALIDATION FAILED:\nIt looks like you haven\'t configured this yet! Please change these defaults:')
-        for d in critical_defaults_used:
-            print(' -', d)
-        sys.exit(1)
-
-    if v.errors or v.defaults:
-        print('❌ CONFIG VALIDATION FAILED:')
-        for e in v.errors:
-            print(' -', e)
-        for d in v.defaults:
-            print(' -', d)
-        if v.warnings:
-            print('\nWarnings:')
-            for w in v.warnings:
-                print(' -', w)
-        sys.exit(1)
-
-    if v.warnings:
-        print('⚠️  CONFIG VALIDATION WARNINGS:')
-        for w in v.warnings:
-            print(' -', w)
-
-    print('✅ All configs are valid.')
+    return v.run(config, messages, watcherconfig)
 
 
 if __name__ == '__main__':

{serverwatcher-5.24.2 → serverwatcher-5.26}/src/serverwatcher/watcher.py

@@ -166,7 +166,7 @@ class ServerWatcher:
             self.shutdown()
 
         self.server.refresh()
-        snap = utils.Snapshot(self.server, 2, True)
+        snap = utils.Snapshot(self.server, duration=2.0, interval=1.0, drop_outliers=1, gb=True)
 
         pro = 0
         anti = 0

{serverwatcher-5.24.2 → serverwatcher-5.26/src/serverwatcher.egg-info}/PKG-INFO

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

serverwatcher-5.24.2/src/serverwatcher/__main__.py

@@ -1,11 +0,0 @@
-from .watcher import ServerWatcher
-from .validator import validate_all
-
-def main():
-    validate_all()
-    
-    watcher = ServerWatcher()
-    watcher.run()
-
-if __name__ == "__main__":
-    main()