serverwatcher 3.2__tar.gz → 3.4__tar.gz

{serverwatcher-3.2/src/serverwatcher.egg-info → serverwatcher-3.4}/PKG-INFO

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

{serverwatcher-3.2 → serverwatcher-3.4}/pyproject.toml

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

serverwatcher-3.4/src/serverwatcher/config/__init__.py

@@ -0,0 +1,9 @@
+from .global_config import GlobalConfig
+from .messages import MessagesConfig
+from .watcher import WatcherConfig
+
+__all__ = [
+    'GlobalConfig',
+    'MessagesConfig',
+    'WatcherConfig',
+]

{serverwatcher-3.2 → serverwatcher-3.4}/src/serverwatcher/config/messages.py

@@ -23,3 +23,8 @@ class MessagesConfig:
     reason_tps: str = ""
     reason_low_uptime: str = ""
     reason_players: str = ""
+
+    restart_action_sent: str = ""
+    server_back_online: str = ""
+    server_back_online_broadcast: str = ""
+    server_failed_restart: str = ""

{serverwatcher-3.2 → serverwatcher-3.4}/src/serverwatcher/config/watcher.py

@@ -30,3 +30,7 @@ class WatcherConfig:
     log_path: str
     console_backspaces: int
     timezone: str
+
+    # New values (will reorder later)
+    watch_interval: int
+    clear_terminal: bool

{serverwatcher-3.2 → serverwatcher-3.4}/src/serverwatcher/defaultconfigs/global.yaml

@@ -9,7 +9,7 @@ origin:
 server:
   name: My SMP
   server_id: CHANGE_ME
-  domain: mc.hungersmp.com
+  domain: mc.example.com
   port: 25565
   rcon_port: 25575
   rcon_password: password

{serverwatcher-3.2 → serverwatcher-3.4}/src/serverwatcher/defaultconfigs/messages.yaml

@@ -39,3 +39,9 @@ reason_uptime: "Uptime {uptime} exceeds {threshold}h"
 reason_tps: "TPS {tps} is lower than {threshold}"
 reason_low_uptime: "Uptime {uptime} is shorter than 30m"
 reason_players: "There {verb} {count} {plural} online"
+
+# New values, will reorder later
+restart_action_sent: "Restart action sent. Waiting..."
+server_back_online: "Server is back online!"
+server_back_online_broadcast: "{prefix} <green>Restart successful!"
+server_failed_restart: "Server failed to restart!"

{serverwatcher-3.2 → serverwatcher-3.4}/src/serverwatcher/defaultconfigs/watcher.yaml

@@ -26,3 +26,7 @@ logger_name_template: "Server Watcher"
 log_path: "/home/container/logs/"
 console_backspaces: 8
 timezone: "America/Chicago"
+
+# New values (will reorder later)
+watch_interval: 60
+clear_terminal: True

{serverwatcher-3.2 → serverwatcher-3.4}/src/serverwatcher/watcher.py

@@ -15,19 +15,13 @@ from hungerlib.addons import (
     map_to_dataclass,
 )
 
-# NEW CONFIG DATACLASSES
-from serverwatcher.config.global_config import GlobalConfig
-from serverwatcher.config.messages import MessagesConfig
-from serverwatcher.config.watcher import WatcherConfig
-
-# BASE DIRECTORY OF THIS PACKAGE
-# BASE_DIR = os.path.dirname(__file__)                               # OLD VERSION, may use later
-BASE_DIR = os.getcwd()                                               # NEW VERSION
+from serverwatcher.config import GlobalConfig, MessagesConfig, WatcherConfig
+
+# Set directory
+BASE_DIR = os.getcwd()
 PACKAGE_DIR = os.path.dirname(__file__)   
 
-# ---------------------------------------------------------
-# Utility: load config or copy default from defaultconfigs/
-# ---------------------------------------------------------
+# Load configs
 def load_or_default(path: str, default_path: str, schema):
     """
     Loads YAML from path. If missing, copies default_path → path.
@@ -46,12 +40,9 @@ def load_or_default(path: str, default_path: str, schema):
     return map_to_dataclass(raw, schema)
 
 
-# ---------------------------------------------------------
-# Main Watcher
-# ---------------------------------------------------------
+# Main watcher
 class ServerWatcher:
     def __init__(self):
-        # Load all 3 configs
         self.global_cfg: GlobalConfig = load_or_default(
             "config/global.yaml",
             "defaultconfigs/global.yaml",
@@ -70,7 +61,7 @@ class ServerWatcher:
             WatcherConfig
         )
 
-        # PANEL
+        # panel
         p = self.global_cfg.panel
         self.panel = Panel(
             name=p["name"],
@@ -78,7 +69,7 @@ class ServerWatcher:
             api_key=p["api_key"],
         )
 
-        # ORIGIN
+        # origin
         o = self.global_cfg.origin
         self.origin = GenericServer(
             name="Origin",
@@ -86,7 +77,7 @@ class ServerWatcher:
             server_id=o["server_id"],
         )
 
-        # SERVER
+        # server
         s = self.global_cfg.server
         self.server = MinecraftServer(
             name=s["name"],
@@ -99,7 +90,7 @@ class ServerWatcher:
             tpsCommand=s["tps_command"],
         )
 
-        # LOGGER (fully configurable)
+        # logger
         logger_name = self.cfg.logger_name_template.format(
             server_name=s["name"]
         )
@@ -111,29 +102,23 @@ class ServerWatcher:
             console_backspaces=self.cfg.console_backspaces,
         )
 
-        # TIMEZONE
+        # timezone
         self.tz = ZoneInfo(self.cfg.timezone)
 
-    # -----------------------------------------------------
-    # Utility: format messages with prefix
-    # -----------------------------------------------------
+    # format messages with prefix
     def fmt(self, template: str, **kwargs):
         return template.format(prefix=self.messages.prefix, **kwargs)
 
-    # -----------------------------------------------------
-    # Shutdown
-    # -----------------------------------------------------
+    # simple shutdown
     def shutdown(self):
         self.log.info("Shutting down ServerWatcher.")
         raise SystemExit
 
-    # -----------------------------------------------------
-    # Restart logic
-    # -----------------------------------------------------
+    # restart logic
     def restart_and_wait(self):
         self.origin.disableSchedule(self.cfg.restart_soon_schedule_id)
         self.server.restart()
-        self.log.info("Restart action sent. Waiting...")
+        self.log.info(f"{self.messages.restart_action_sent}")
         time.sleep(self.cfg.restart_wait_seconds)
 
         self.log.warn("Checking server status...")
@@ -144,17 +129,15 @@ class ServerWatcher:
         )
 
         if alive:
-            self.log.info("Server is back online!")
+            self.log.info(f"{self.messages.server_back_online}")
             self.server.sendBroadcast(
-                f"{self.messages.prefix}<green>Restart successful!"
+                f"{self.messages.server_back_online_broadcast}"
             )
             self.origin.enableSchedule(self.cfg.origin_disable_schedule_id)
         else:
-            self.log.error("Server failed to restart!")
+            self.log.error(f"{self.messages.server_failed_restart}")
 
-    # -----------------------------------------------------
-    # Schedule restart
-    # -----------------------------------------------------
+    # schedule restart
     def schedule_restart(self, minutes):
         info = snapSchedule(minimumMinutes=minutes)
         scheduled = info["scheduled"]
@@ -184,9 +167,7 @@ class ServerWatcher:
             second_callbacks=second_callbacks,
         )
 
-    # -----------------------------------------------------
-    # Main evaluation logic
-    # -----------------------------------------------------
+    # main evaluation logic
     def evaluate(self):
         self.log.info(self.messages.log_start)
 
@@ -202,7 +183,7 @@ class ServerWatcher:
         restart_reasons = []
         no_restart_reasons = []
 
-        # PRO-RESTART
+        # pro-restart
         if self.server.getSchedule(self.cfg.restart_soon_schedule_id)["is_active"]:
             restart_reasons.append(self.messages.reason_restart_soon)
             pro += self.cfg.weight_restart_soon
@@ -232,7 +213,7 @@ class ServerWatcher:
             )
             pro += self.cfg.weight_tps
 
-        # ANTI-RESTART
+        # anti-restart
         if snap.uptime // 60 < 30:
             no_restart_reasons.append(
                 self.fmt(self.messages.reason_low_uptime, uptime=snap.uptime_formatted)
@@ -247,7 +228,7 @@ class ServerWatcher:
             )
             anti += snap.players * self.cfg.weight_per_player
 
-        # LOGGING
+        # logging
         for r in restart_reasons:
             self.log.warn(f"- {r}")
         for r in no_restart_reasons:
@@ -282,7 +263,10 @@ class ServerWatcher:
     # Main loop
     # -----------------------------------------------------
     def run(self):
-        clearTerminal()
+        if self.cfg.clear_terminal:
+            clearTerminal()
         while True:
+            if self.cfg.clear_terminal:
+                clearTerminal()
             self.evaluate()
-            time.sleep(60)
+            time.sleep(self.cfg.watch_interval)

{serverwatcher-3.2 → serverwatcher-3.4/src/serverwatcher.egg-info}/PKG-INFO

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

{serverwatcher-3.2 → serverwatcher-3.4}/src/serverwatcher.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ src/serverwatcher.egg-info/SOURCES.txt
 src/serverwatcher.egg-info/dependency_links.txt
 src/serverwatcher.egg-info/requires.txt
 src/serverwatcher.egg-info/top_level.txt
+src/serverwatcher/config/__init__.py
 src/serverwatcher/config/global_config.py
 src/serverwatcher/config/messages.py
 src/serverwatcher/config/watcher.py