serverwatcher 4.0__tar.gz → 4.1__tar.gz

{serverwatcher-4.0/src/serverwatcher.egg-info → serverwatcher-4.1}/PKG-INFO

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

{serverwatcher-4.0 → serverwatcher-4.1}/pyproject.toml

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

{serverwatcher-4.0 → serverwatcher-4.1}/src/serverwatcher/configclasses/global_config.py

@@ -2,6 +2,8 @@ from dataclasses import dataclass
 
 @dataclass
 class GlobalConfig:
+    watch_interval: int
+
     panel_name: str
     panel_url: str
     panel_api_key: str
@@ -15,3 +17,11 @@ class GlobalConfig:
     rcon_port: int
     rcon_password: str
     tps_command: str
+    
+    do_logging: bool
+    logger_name: str
+    log_path: str
+    timezone: str
+
+    console_backspaces: int
+    clear_terminal: bool

{serverwatcher-4.0 → serverwatcher-4.1}/src/serverwatcher/configclasses/watcher.py

@@ -24,13 +24,4 @@ class WatcherConfig:
 
     restart_wait_seconds: int
     restart_online_timeout: int
-    restart_online_interval: int
-
-    logger_name_template: str
-    log_path: str
-    console_backspaces: int
-    timezone: str
-
-    # New values (will reorder later)
-    watch_interval: int
-    clear_terminal: bool
+    restart_online_interval: int

{serverwatcher-4.0 → serverwatcher-4.1}/src/serverwatcher/defaultconfigs/global.yaml

@@ -1,3 +1,5 @@
+watch_interval: 60
+
 panel:
   panel_name: My Panel
   panel_url: https://example.com
@@ -14,3 +16,13 @@ server:
   rcon_port: 25575
   rcon_password: password
   tps_command: ticks
+
+logging:
+  do_logging: True
+  logger_name: "Server Watcher"
+  log_path: "/home/container/logs/"
+  timezone: "America/Chicago"
+
+terminal:
+  console_backspaces: 8
+  clear_terminal: True

{serverwatcher-4.0 → serverwatcher-4.1}/src/serverwatcher/defaultconfigs/watcher.yaml

@@ -1,12 +1,3 @@
-logging:
-  logger_name_template: "Server Watcher"
-  log_path: "/home/container/logs/"
-  timezone: "America/Chicago"
-
-terminal_settings:
-  console_backspaces: 8
-  clear_terminal: True
-
 schedules:
   restart_soon_schedule_id: 0     # replace this with real schedule id
   origin_disable_schedule_id: 0   # replace this with real schedule id
@@ -33,7 +24,4 @@ gaps:
 restart_intervals:
   restart_wait_seconds: 45
   restart_online_timeout: 120
-  restart_online_interval: 2
-
-watcher_intervals:
-  watch_interval: 60 
+  restart_online_interval: 2

{serverwatcher-4.0 → serverwatcher-4.1}/src/serverwatcher/watcher.py

@@ -14,8 +14,9 @@ from hungerlib.addons import (
     loadConfig,
 )
 
-from serverwatcher import GlobalConfig, MessagesConfig, WatcherConfig
-
+from serverwatcher.configclasses.global_config import GlobalConfig
+from serverwatcher.configclasses.messages import MessagesConfig
+from serverwatcher.configclasses.watcher import WatcherConfig
 
 class ServerWatcher:
     def __init__(self):
@@ -63,18 +64,18 @@ class ServerWatcher:
             tpsCommand=self.global_cfg.tps_command,
         )
 
-        logger_name = self.cfg.logger_name_template.format(
+        logger_name = self.global_cfg.logger_name.format(
             server_name=self.global_cfg.server_name
         )
 
         self.log = HungerLogger(
             name=logger_name,
             server=self.server,
-            log_path=self.cfg.log_path,
-            console_backspaces=self.cfg.console_backspaces,
+            log_path=self.global_cfg.log_path,
+            console_backspaces=self.global_cfg.console_backspaces,
         )
 
-        self.tz = ZoneInfo(self.cfg.timezone)
+        self.tz = ZoneInfo(self.global_cfg.timezone)
 
     # utility
     def fmt(self, template: str, **kwargs):
@@ -100,7 +101,7 @@ class ServerWatcher:
 
         if alive:
             self.log.info(self.messages.server_back_online)
-            self.server.sendBroadcast(self.messages.server_back_online_broadcast)
+            self.server.sendBroadcast(f"{self.messages.server_back_online_broadcast}")
             self.origin.enableSchedule(self.cfg.origin_disable_schedule_id)
         else:
             self.log.error(self.messages.server_failed_restart)
@@ -238,10 +239,10 @@ class ServerWatcher:
 
     # main loop
     def run(self):
-        if self.cfg.clear_terminal:
+        if self.global_cfg.clear_terminal:
             clearTerminal()
         while True:
-            if self.cfg.clear_terminal:
+            if self.global_cfg.clear_terminal:
                 clearTerminal()
             self.evaluate()
-            time.sleep(self.cfg.watch_interval)
+            time.sleep(self.global_cfg.watch_interval)

{serverwatcher-4.0 → serverwatcher-4.1/src/serverwatcher.egg-info}/PKG-INFO

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