serverwatcher 3.1.11__tar.gz → 3.3__tar.gz

{serverwatcher-3.1.11/src/serverwatcher.egg-info → serverwatcher-3.3}/PKG-INFO

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

{serverwatcher-3.1.11 → serverwatcher-3.3}/pyproject.toml

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

{serverwatcher-3.1.11 → serverwatcher-3.3}/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.1.11 → serverwatcher-3.3}/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.1.11 → serverwatcher-3.3}/src/serverwatcher/watcher.py

@@ -23,6 +23,7 @@ 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
+PACKAGE_DIR = os.path.dirname(__file__)   
 
 # ---------------------------------------------------------
 # Utility: load config or copy default from defaultconfigs/
@@ -34,7 +35,7 @@ def load_or_default(path: str, default_path: str, schema):
     """
 
     abs_path = os.path.join(BASE_DIR, path)
-    abs_default = os.path.join(BASE_DIR, default_path)
+    abs_default = os.path.join(PACKAGE_DIR, default_path)
 
     if not os.path.exists(abs_path):
         os.makedirs(os.path.dirname(abs_path), exist_ok=True)
@@ -132,7 +133,7 @@ class ServerWatcher:
     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...")
@@ -143,13 +144,13 @@ 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

{serverwatcher-3.1.11 → serverwatcher-3.3/src/serverwatcher.egg-info}/PKG-INFO

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