serverwatcher 5.12.1__tar.gz → 5.14__tar.gz

{serverwatcher-5.12.1/src/serverwatcher.egg-info → serverwatcher-5.14}/PKG-INFO

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

{serverwatcher-5.12.1 → serverwatcher-5.14}/pyproject.toml

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

serverwatcher-5.14/src/serverwatcher/__main__.py

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

{serverwatcher-5.12.1 → serverwatcher-5.14}/src/serverwatcher/configclasses/config.py

@@ -23,5 +23,8 @@ class GlobalConfig:
     enable_logging: bool = "logger.enabled"
     logger_name: str = "logger.name"
     log_path: str = "logger.log_path"
+    info_prefix: str = "logger.prefixes.info"
+    warn_prefix: str = "logger.prefixes.warn"
+    error_prefix: str = "logger.prefixes.error"
 
     clear_terminal: bool = "terminal.enable_clearing"

{serverwatcher-5.12.1 → serverwatcher-5.14}/src/serverwatcher/defaultconfigs/config.yaml

@@ -23,6 +23,11 @@ logger:
   enabled: True
   name: 'Server Watcher'
   log_path: '/home/container/logs/'
+  
+  prefixes:
+    info: "<white>[INFO]: "
+    warn: "<yellow>[WARN]: "
+    error: "<red>[ERROR]: "
 
 terminal:
   enable_clearing: True

{serverwatcher-5.12.1 → serverwatcher-5.14}/src/serverwatcher/watcher.py

@@ -30,7 +30,7 @@ class ServerWatcher:
             WatcherConfig
         )
 
-        datamap_api.set_default_maps(
+        datamap_api.setGlobalMaps(
             utils.ASCII_COLOR_MAP,
             self.config,
             self.messages,
@@ -66,6 +66,15 @@ class ServerWatcher:
             name=logger_name,
             Servers=[self.server],
             log_path=self.config.log_path,
+
+            origin_maps = [utils.ASCII_COLOR_MAP],
+            destination_maps = [utils.ASCII_COLOR_MAP],
+            broadcast_maps = [utils.MC_COLOR_MAP],
+            file_maps = [utils.STRIP_COLOR_MAP],
+
+            info_prefix=self.messages.info_prefix,
+            warn_prefix=self.messages.warn_prefix,
+            error_prefix=self.messages.error_prefix,
         )
 
         self.tz = ZoneInfo(self.config.timezone)
@@ -91,13 +100,7 @@ class ServerWatcher:
 
         if alive:
             self.router.info(self.messages.server_back_online)
-            self.router.broadcast(
-                mapit(
-                    self.messages.server_back_online_broadcast,
-                    enable=[utils.MC_COLOR_MAP],
-                    disable=[utils.ASCII_COLOR_MAP]
-                )
-            )
+            self.router.broadcast(self.messages.server_back_online_broadcast)
         else:
             self.router.error(self.messages.server_failed_restart)
 
@@ -108,18 +111,11 @@ class ServerWatcher:
         local_time = scheduled.astimezone(self.tz)
         time_str = local_time.strftime("%I:%M %p")
 
-        self.router.broadcast(
-            mapit(
-                self.messages.broadcast_restart_at,
-                time=time_str,
-                enable=[utils.MC_COLOR_MAP],
-                disable=[utils.ASCII_COLOR_MAP]
-            )
-        )
+        self.router.broadcast(self.messages.broadcast_restart_at, time=time_str)
 
         minute_callbacks = {
             int(k.split("_")[1]): (
-                lambda msg=mapit(getattr(self.messages, k), enable=[utils.MC_COLOR_MAP], disable=[utils.ASCII_COLOR_MAP]):
+                lambda msg=getattr(self.messages, k):
                     self.router.broadcast(msg)
             )
             for k in vars(self.messages)
@@ -128,7 +124,7 @@ class ServerWatcher:
 
         second_callbacks = {
             int(k.split("_")[1]): (
-                lambda msg=mapit(getattr(self.messages, k), enable=[utils.MC_COLOR_MAP], disable=[utils.ASCII_COLOR_MAP]):
+                lambda msg=getattr(self.messages, k):
                     self.router.broadcast(msg)
             )
             for k in vars(self.messages)

{serverwatcher-5.12.1 → serverwatcher-5.14/src/serverwatcher.egg-info}/PKG-INFO

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

serverwatcher-5.12.1/src/serverwatcher/__main__.py

@@ -1,24 +0,0 @@
-# serverwatcher/__main__.py
-
-import argparse
-from .watcher import ServerWatcher
-from serverwatcher.validator import validate_all
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--init", action="store_true")
-    args = parser.parse_args()
-
-    if args.init:
-        # Create default configs
-        from .initializer import initialize
-        initialize()
-        return
-
-    validate_all()
-    
-    watcher = ServerWatcher()
-    watcher.run()
-
-if __name__ == "__main__":
-    main()