serverwatcher 5.8.dev33__py3-none-any.whl → 5.8.dev35__py3-none-any.whl

serverwatcher/configclasses/config.py

@@ -1,10 +1,10 @@
 from dataclasses import field
-from hungerlib import datamap, Syntax
+from hungerlib import datamap, datamap_api
 
 def yaml_key(path: str, default=None):
     return field(default=default, metadata={"yaml_key": path})
 
-@datamap(syntax=Syntax.braces)
+@datamap(syntax=datamap_api.braces)
 class GlobalConfig:
     timezone: str = yaml_key("timezone")
 

serverwatcher/configclasses/messages.py

@@ -1,10 +1,10 @@
 from dataclasses import field
-from hungerlib import datamap, Syntax
+from hungerlib import datamap, datamap_api
 
 def yaml_key(path: str, default=None):
     return field(default=default, metadata={"yaml_key": path})
 
-@datamap(syntax=Syntax.braces)
+@datamap(syntax=datamap_api.braces)
 class MessagesConfig:
     prefix: str = yaml_key("prefix", "<aqua>[Server Watcher]")
     bullet: str = yaml_key("bullet")

serverwatcher/configclasses/watcher.py

@@ -1,10 +1,10 @@
 from dataclasses import field
-from hungerlib import datamap, Syntax
+from hungerlib import datamap, datamap_api
 
 def yaml_key(path: str, default=None):
     return field(default=default, metadata={"yaml_key": path})
 
-@datamap(syntax=Syntax.braces)
+@datamap(syntax=datamap_api.braces)
 class WatcherConfig:
     watch_interval: int = yaml_key("watch_interval")
     schedule_control: bool = yaml_key("schedule_control.enabled")

serverwatcher/validator.py

@@ -1,12 +1,12 @@
 import sys
 from dataclasses import fields
-from hungerlib import loadConfig, clearTerminal
+from hungerlib import utils, loadConfig
 
 from serverwatcher.configclasses.config import GlobalConfig
 from serverwatcher.configclasses.messages import MessagesConfig
 from serverwatcher.configclasses.watcher import WatcherConfig
 
-clearTerminal()
+utils.clearTerminal()
 
 def deep_get_attr(obj, dotted):
     parts = dotted.split(".")

serverwatcher/watcher.py

@@ -2,20 +2,7 @@ import os
 import time
 from zoneinfo import ZoneInfo
 
-from hungerlib import (
-    Panel,
-    GenericServer,
-    MinecraftServer,
-    MessageRouter,
-    loadConfig,
-    clearTerminal,
-    set_default_maps,
-    ASCII_COLOR_MAP,
-    mapit,
-    validateAll,
-    Snapshot,
-    waitForOnline,
-)
+from hungerlib import servers, MessageRouter, loadConfig, utils, datamap_api, mapit
 
 from serverwatcher.configclasses.config import GlobalConfig
 from serverwatcher.configclasses.messages import MessagesConfig
@@ -45,26 +32,26 @@ class ServerWatcher:
             WatcherConfig
         )
 
-        set_default_maps(
-            ASCII_COLOR_MAP,
+        datamap_api.set_default_maps(
+            utils.ASCII_COLOR_MAP,
             self.config,
             self.messages,
             self.watcherconfig
         )
 
-        self.panel = Panel(
+        self.panel = servers.Panel(
             name=self.config.panel_name,
             url=self.config.panel_url,
             api_key=self.config.panel_api_key,
         )
 
-        self.origin = GenericServer(
+        self.origin = servers.Generic(
             name="Origin",
             panel=self.panel,
             server_id=self.config.origin_server_id
         )
 
-        self.server = MinecraftServer(
+        self.server = servers.Minecraft(
             name=self.config.server_name,
             panel=self.panel,
             server_id=self.config.server_id,
@@ -114,7 +101,7 @@ class ServerWatcher:
         time.sleep(self.watcherconfig.restart_wait_seconds)
 
         self.say(self.messages.status_check, level="warn")
-        alive = waitForOnline(
+        alive = utils.waitForOnline(
             self.server,
             timeout=self.watcherconfig.restart_timeout,
             interval=self.watcherconfig.restart_online_interval,
@@ -162,12 +149,12 @@ class ServerWatcher:
     def evaluate(self):
         self.say(self.messages.startup)
 
-        if not validateAll(self.panel, self.server):
+        if not utils.validateAll(self.panel, self.server):
             self.say(self.messages.validation_fail, level="error")
             self.shutdown()
 
         self.server.refresh()
-        snap = Snapshot(self.server, 2, True)
+        snap = utils.Snapshot(self.server, 2, True)
 
         pro = 0
         anti = 0
@@ -243,9 +230,9 @@ class ServerWatcher:
 
     def run(self):
         if self.config.clear_terminal:
-            clearTerminal()
+            utils.clearTerminal()
         while True:
             if self.config.clear_terminal:
-                clearTerminal()
+                utils.clearTerminal()
             self.evaluate()
             time.sleep(self.watcherconfig.watch_interval)

{serverwatcher-5.8.dev33.dist-info → serverwatcher-5.8.dev35.dist-info}/METADATA

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

serverwatcher-5.8.dev35.dist-info/RECORD

@@ -0,0 +1,15 @@
+serverwatcher/__init__.py,sha256=Q_afN0XU29n48d6Gf0-LT2lLo3RiTWlHRT6rC_fYbjw,486
+serverwatcher/validator.py,sha256=idMwKv63hDS-xOe90h9TCUItdLuZpnEe0vG8Yl6mdeA,4644
+serverwatcher/watcher.py,sha256=neHb0R5vB6m_estsKwtiBWqECkusGa7wsTSAB-6ffOM,8278
+serverwatcher/configclasses/__init__.py,sha256=YS0KhxtAJGdMcaiFstqTRNxIPLnR7s9v3Tkt5h2uKE4,182
+serverwatcher/configclasses/config.py,sha256=aMnAYEur2HpaY8CEV1hWSgw980JleVu_-Wv-Mvo4f-0,1108
+serverwatcher/configclasses/messages.py,sha256=twV4JwNRQR6K6CpkCgjSw6NVhDQ4pE6H3L_r1jpGelI,3360
+serverwatcher/configclasses/watcher.py,sha256=1p-JUzJ6dVw1mW-qdt36cY7N7l3pe5cHthp0RxgvJHg,1340
+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.dev35.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+serverwatcher-5.8.dev35.dist-info/METADATA,sha256=8H59XVrNsf-aDYdHVs8DdCs02oVuoQmtw6IDMjGSETo,1687
+serverwatcher-5.8.dev35.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+serverwatcher-5.8.dev35.dist-info/top_level.txt,sha256=8DJAf8WmmglgtZHkp8aoTriRJ2YPcS4F3DfOIkytASo,14
+serverwatcher-5.8.dev35.dist-info/RECORD,,

serverwatcher-5.8.dev33.dist-info/RECORD

@@ -1,15 +0,0 @@
-serverwatcher/__init__.py,sha256=Q_afN0XU29n48d6Gf0-LT2lLo3RiTWlHRT6rC_fYbjw,486
-serverwatcher/validator.py,sha256=voioKSn9I7iTpb7oa0yTOOYJNP3R9iwxrJqQytqYJps,4646
-serverwatcher/watcher.py,sha256=9yOzwrLO9dUC3O-4rItFTAhZ2esG7XCqaCknQSH0KtE,8369
-serverwatcher/configclasses/__init__.py,sha256=YS0KhxtAJGdMcaiFstqTRNxIPLnR7s9v3Tkt5h2uKE4,182
-serverwatcher/configclasses/config.py,sha256=t0RG7jrSMV7tYVeI0ceR9wffu05UvsvnQL0S_woXc14,1098
-serverwatcher/configclasses/messages.py,sha256=vXSDXIT5eKIvbLor1F4d4KRCPM5Tm4unHpM-LLjqcS4,3350
-serverwatcher/configclasses/watcher.py,sha256=mXmFx88_4J46P6NS6eSgXOzRe-Akdhq003jftuh6Ixc,1330
-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.dev33.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-serverwatcher-5.8.dev33.dist-info/METADATA,sha256=PGhzUt5xVLxhKOZ113GLrJvQ6sD7BgziSjJ-zw9Dfjc,1687
-serverwatcher-5.8.dev33.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-serverwatcher-5.8.dev33.dist-info/top_level.txt,sha256=8DJAf8WmmglgtZHkp8aoTriRJ2YPcS4F3DfOIkytASo,14
-serverwatcher-5.8.dev33.dist-info/RECORD,,