serverwatcher 5.5.1__tar.gz → 5.6.dev0__tar.gz

{serverwatcher-5.5.1/src/serverwatcher.egg-info → serverwatcher-5.6.dev0}/PKG-INFO

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

{serverwatcher-5.5.1 → serverwatcher-5.6.dev0}/pyproject.toml

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

{serverwatcher-5.5.1 → serverwatcher-5.6.dev0}/src/serverwatcher/watcher.py

@@ -1,7 +1,7 @@
 import os
 import time
+import re
 from zoneinfo import ZoneInfo
-from string import t
 
 from hungerlib import Panel, HungerLogger
 from hungerlib.servers import MinecraftServer, GenericServer
@@ -23,6 +23,23 @@ from serverwatcher.validator import validate_all
 
 validate_all()
 
+_T_EXPR = re.compile(r"{([^{}]+)}")
+
+def t_eval(template: str, /, **ctx):
+    """
+    Evaluate a t-string-like template with Python expressions inside { }.
+    Example:
+        t_eval("CPU: {snap.cpu}%", snap=snap)
+    """
+    def repl(match):
+        expr = match.group(1).strip()
+        try:
+            return str(eval(expr, {}, ctx))
+        except Exception as e:
+            return f"<err:{e}>"
+
+    return _T_EXPR.sub(repl, template)
+
 class ServerWatcher:
     def __init__(self):
 
@@ -80,9 +97,8 @@ class ServerWatcher:
 
         self.tz = ZoneInfo(self.config.timezone)
 
-    def fmt(self, template: str, **kwargs):
-        prefix = self.messages.prefix
-        return t(template)
+    def fmt(self, template: str, **fmt):
+        return t_eval(template, self=self, **fmt)
 
     def say(self, template, level="info", **fmt):
         if not template:

{serverwatcher-5.5.1 → serverwatcher-5.6.dev0/src/serverwatcher.egg-info}/PKG-INFO

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