hungerlib 3.7.2__tar.gz → 3.8__tar.gz

{hungerlib-3.7.2/src/hungerlib.egg-info → hungerlib-3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hungerlib
-Version: 3.7.2
+Version: 3.8
 Summary: Powerful automation library for Pterodactyl.
 Author: iFamished
 License: MIT

{hungerlib-3.7.2 → hungerlib-3.8}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hungerlib"
-version = "3.7.2"
+version = "3.8"
 description = "Powerful automation library for Pterodactyl."
 readme = "README.md"
 requires-python = ">=3.9"

{hungerlib-3.7.2 → hungerlib-3.8}/src/hungerlib/datamap.py

@@ -1,20 +1,20 @@
 import re
 from dataclasses import dataclass, fields, is_dataclass
 
-_default_maps = []
+_GLOBAL_MAPS = []
 
-def set_default_maps(*maps):
-    global _default_maps
-    _default_maps = list(maps)
+def setGlobalMaps(*maps):
+    global _GLOBAL_MAPS
+    _GLOBAL_MAPS = list(maps)
 
-def get_default_maps():
-    return _default_maps
+def getGlobalMaps():
+    return _GLOBAL_MAPS
 
 class Syntax:
-    braces   = r"\{([^{}]+)\}"
-    dollars  = r"\$\{([^{}]+)\}"
-    angles   = r"<([^<>]+)>"
-    percents = r"%([^%]+)%"
+    braces   = r"\{([^{}]+)\}"       # {example}
+    dollars  = r"\$\{([^{}]+)\}"     # ${example}
+    angles   = r"<([^<>]+)>"         # <example>
+    percents = r"%([^%]+)%"          # %example%
 
 @dataclass
 class DataMap:
@@ -48,29 +48,17 @@ datamap.angles = datamap(syntax=Syntax.angles)
 datamap.dollars = datamap(syntax=Syntax.dollars)
 datamap.percents = datamap(syntax=Syntax.percents)
 
-def mapit(text: str, *maps, only_maps=None, disable=None, enable=None, **runtime):
-    # 1. FULL OVERRIDE MODE
-    if only_maps is not None:
-        maps_to_use = list(only_maps)
-
+def mapit(text: str, extra_maps=None, override_maps=None, **ctx):
+    # Determine maps to use
+    if override_maps is not None:
+        maps = list(override_maps)
     else:
-        # 2. Start with default maps
-        maps_to_use = list(get_default_maps())
-
-        # 3. Remove disabled maps
-        if disable:
-            maps_to_use = [m for m in maps_to_use if m not in disable]
-
-        # 4. Add positional maps
-        if maps:
-            maps_to_use.extend(maps)
+        maps = list(getGlobalMaps())
+        if extra_maps:
+            maps.extend(extra_maps)
 
-        # 5. Add enabled maps
-        if enable:
-            maps_to_use.extend(enable)
-
-    # 6. Apply maps in order
-    for m in maps_to_use:
+    # Apply maps in order
+    for m in maps:
         if isinstance(m, type) and is_dataclass(m):
             m = m()
 
@@ -83,7 +71,7 @@ def mapit(text: str, *maps, only_maps=None, disable=None, enable=None, **runtime
             d = m.as_dict()
 
         elif isinstance(m, dict):
-            pattern = runtime.get("syntax")
+            pattern = ctx.get("syntax")
             if not pattern:
                 continue
             d = m
@@ -97,10 +85,10 @@ def mapit(text: str, *maps, only_maps=None, disable=None, enable=None, **runtime
 
         text = re.sub(pattern, repl, text)
 
-    # 7. Runtime kwargs always apply last
-    if runtime:
+    # ctx vars always apply last
+    if ctx:
         pattern = Syntax.braces
-        d = runtime
+        d = ctx
 
         def repl(match):
             k = match.group(1)
@@ -109,4 +97,3 @@ def mapit(text: str, *maps, only_maps=None, disable=None, enable=None, **runtime
         text = re.sub(pattern, repl, text)
 
     return text
-

{hungerlib-3.7.2 → hungerlib-3.8}/src/hungerlib/messagerouter.py

@@ -17,7 +17,7 @@ class MessageRouter:
         file_maps:        list = [STRIP_COLOR_MAP],
 
         info_prefix:       str = "<white>[INFO]: ",
-        warn_prefix:       str = "<orange>[WARN]: ",
+        warn_prefix:       str = "<yellow>[WARN]: ",
         error_prefix:      str = "<red>[ERROR]: ",
     ):
 
@@ -55,8 +55,8 @@ class MessageRouter:
             self.logger.addHandler(handler)
 
     # internal utils
-    def _format(self, template, maps, **ctx):
-        return mapit(template, only_maps=maps, **ctx)
+    def _format(self, text, maps, **ctx):
+        return mapit(text, override_maps=maps, **ctx)
 
     def _merge_maps(self, base, extra):
         maps = list(base)
@@ -65,10 +65,10 @@ class MessageRouter:
         return maps
 
     # routing primitives
-    def origin(self, template, level="info", extra_maps=None, override_maps=None, **ctx):
+    def origin(self, text, level="info", extra_maps=None, override_maps=None, **ctx):
         # format
         maps = self._merge_maps(override_maps or self.origin_maps, extra_maps)
-        mapped = self._format(template, maps, **ctx)
+        mapped = self._format(text, maps, **ctx)
         if level == "info":    prefix = mapit(self.info_prefix, [ASCII_COLOR_MAP])
         elif level == "warn":  prefix = mapit(self.warn_prefix, [ASCII_COLOR_MAP])
         elif level == "error": prefix = mapit(self.error_prefix, [ASCII_COLOR_MAP])
@@ -79,10 +79,10 @@ class MessageRouter:
         print(msg)
         return msg
 
-    def destination(self, template, level="info", extra_maps=None, override_maps=None, **ctx):
+    def destination(self, text, level="info", extra_maps=None, override_maps=None, **ctx):
         # format
         maps = self._merge_maps(override_maps or self.destination_maps, extra_maps)
-        msg = self._format(template, maps, **ctx)
+        msg = self._format(text, maps, **ctx)
         
         # send
         for server in self.Servers:
@@ -90,10 +90,10 @@ class MessageRouter:
                 server.bridge.log(msg, level)
         return msg
 
-    def broadcast(self, template, extra_maps=None, override_maps=None, **ctx):
+    def broadcast(self, text, extra_maps=None, override_maps=None, **ctx):
         # format
         maps = self._merge_maps(override_maps or self.broadcast_maps, extra_maps)
-        msg = self._format(template, maps, **ctx)
+        msg = self._format(text, maps, **ctx)
 
         # send
         for server in self.Servers:
@@ -101,10 +101,10 @@ class MessageRouter:
                 server.sendBroadcast(msg)
         return msg
 
-    def filelog(self, template, level="info", extra_maps=None, override_maps=None, **ctx):
+    def filelog(self, text, level="info", extra_maps=None, override_maps=None, **ctx):
         # format
         maps = self._merge_maps(override_maps or self.file_maps, extra_maps)
-        msg = self._format(template, maps, **ctx)
+        msg = self._format(text, maps, **ctx)
 
         # send
         {
@@ -115,17 +115,17 @@ class MessageRouter:
         return msg
 
     # simple passthrough helpers (origin + file)
-    def info(self, template, extra_maps=None, override_maps=None, **ctx):
-        msg = self.origin(template=template, level="info", extra_maps=extra_maps, override_maps=override_maps, **ctx)
-        self.filelog(template=template, level="info", extra_maps=extra_maps, override_maps=override_maps, **ctx)
+    def info(self, text, extra_maps=None, override_maps=None, **ctx):
+        msg = self.origin(text=text, level="info", extra_maps=extra_maps, override_maps=override_maps, **ctx)
+        self.filelog(text=text, level="info", extra_maps=extra_maps, override_maps=override_maps, **ctx)
         return msg
 
-    def warn(self, template, extra_maps=None, override_maps=None, **ctx):
-        msg = self.origin(template=template, level="warn", extra_maps=extra_maps, override_maps=override_maps, **ctx)
-        self.filelog(template=template, level="warn", extra_maps=extra_maps, override_maps=override_maps, **ctx)
+    def warn(self, text, extra_maps=None, override_maps=None, **ctx):
+        msg = self.origin(text=text, level="warn", extra_maps=extra_maps, override_maps=override_maps, **ctx)
+        self.filelog(text=text, level="warn", extra_maps=extra_maps, override_maps=override_maps, **ctx)
         return msg
 
-    def error(self, template, extra_maps=None, override_maps=None, **ctx):
-        msg = self.origin(template=template, level="error", extra_maps=extra_maps, override_maps=override_maps, **ctx)
-        self.filelog(template=template, level="error", extra_maps=extra_maps, override_maps=override_maps, **ctx)
+    def error(self, text, extra_maps=None, override_maps=None, **ctx):
+        msg = self.origin(text=text, level="error", extra_maps=extra_maps, override_maps=override_maps, **ctx)
+        self.filelog(text=text, level="error", extra_maps=extra_maps, override_maps=override_maps, **ctx)
         return msg

{hungerlib-3.7.2 → hungerlib-3.8/src/hungerlib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hungerlib
-Version: 3.7.2
+Version: 3.8
 Summary: Powerful automation library for Pterodactyl.
 Author: iFamished
 License: MIT