hungerlib 3.2.dev8__py3-none-any.whl → 3.2.dev10__py3-none-any.whl

hungerlib/datamap.py

@@ -48,33 +48,65 @@ datamap.angles = datamap(syntax=Syntax.angles)
 datamap.dollars = datamap(syntax=Syntax.dollars)
 datamap.percents = datamap(syntax=Syntax.percents)
 
-def mapit(text: str, *maps, **runtime):
-    maps = (*get_default_maps(), *maps)
-    for m in maps:
+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)
+
+    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)
+
+        # 5. Add enabled maps
+        if enable:
+            maps_to_use.extend(enable)
+
+    # 6. Apply maps in order
+    for m in maps_to_use:
         if isinstance(m, type) and is_dataclass(m):
             m = m()
+
         if is_dataclass(m):
             pattern = m.get_syntax()
             d = m.as_map()
+
         elif hasattr(m, "as_dict"):
             pattern = Syntax.angles
             d = m.as_dict()
+
         elif isinstance(m, dict):
             pattern = runtime.get("syntax")
             if not pattern:
                 continue
             d = m
+
         else:
             continue
+
         def repl(match):
             k = match.group(1)
             return str(d.get(k, match.group(0)))
+
         text = re.sub(pattern, repl, text)
+
+    # 7. Runtime kwargs always apply last
     if runtime:
         pattern = Syntax.braces
         d = runtime
+
         def repl(match):
             k = match.group(1)
             return str(d.get(k, match.group(0)))
+
         text = re.sub(pattern, repl, text)
+
     return text
+

hungerlib/messagerouter.py

@@ -1,10 +1,6 @@
-import inspect
 import logging
 from pathlib import Path
 from datetime import datetime
-from hungerlib.utils.colormaps import ASCII_COLOR_MAP, MC_COLOR_MAP
-from hungerlib.datamap import DataMap, Syntax, mapit
-
 
 class MessageRouter:
     def __init__(
@@ -15,11 +11,6 @@ class MessageRouter:
         formatter=None,
         console_backspaces=0,
 
-        origin_map=ASCII_COLOR_MAP,
-        destination_map=ASCII_COLOR_MAP,
-        broadcast_map=MC_COLOR_MAP,
-        log_map=None,
-
         info_prefix="<white>[INFO]: ",
         warn_prefix="<yellow>[WARN]: ",
         error_prefix="<red>[ERROR]: "
@@ -33,11 +24,6 @@ class MessageRouter:
 
         self.console_backspaces = "\b" * console_backspaces
 
-        self._origin_map = origin_map
-        self._destination_map = destination_map
-        self._broadcast_map = broadcast_map
-        self._log_map = log_map
-
         self.info_prefix = info_prefix
         self.warn_prefix = warn_prefix
         self.error_prefix = error_prefix
@@ -57,47 +43,27 @@ class MessageRouter:
             handler.setFormatter(formatter)
             self.logger.addHandler(handler)
 
-    # colormap getters/setters
-    def setOriginMap(self, cmap): self._origin_map = cmap
-    def getOriginMap(self): return self._origin_map
-
-    def setDestinationMap(self, cmap): self._destination_map = cmap
-    def getDestinationMap(self): return self._destination_map
-
-    def setBroadcastMap(self, cmap): self._broadcast_map = cmap
-    def getBroadcastMap(self): return self._broadcast_map
-
-    def setLogMap(self, cmap): self._log_map = cmap
-    def getLogMap(self): return self._log_map
-
-    # routing primatives
+    # routing primitives
     def origin(self, msg):
-        colored = mapit(msg, self._origin_map)
-        print(colored)
+        print(msg)
 
     def destination(self, msg):
         if not self.server or not hasattr(self.server, "_rcon_send"):
             return
-        colored = mapit(msg, self._destination_map)
         self.server._rcon_send(
-            f'logtellraw targetless "{self.console_backspaces}{colored}"'
+            f'logtellraw targetless "{self.console_backspaces}{msg}"'
         )
 
     def log(self, msg, level="INFO"):
-        clean = msg
-        if self._log_map:
-            for tag in self._log_map.as_dict().keys():
-                clean = clean.replace(tag, "")
         {
             "INFO": self.logger.info,
             "WARN": self.logger.warning,
             "ERROR": self.logger.error
-        }[level](clean)
+        }[level](msg)
 
     def broadcast(self, msg):
         if hasattr(self.server, "sendBroadcast"):
-            colored = mapit(msg, self._broadcast_map)
-            self.server.sendBroadcast(colored)
+            self.server.sendBroadcast(msg)
 
     # high level router
     def say(

{hungerlib-3.2.dev8.dist-info → hungerlib-3.2.dev10.dist-info}/METADATA

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

{hungerlib-3.2.dev8.dist-info → hungerlib-3.2.dev10.dist-info}/RECORD

@@ -1,7 +1,7 @@
 hungerlib/__init__.py,sha256=CTLIet8Tg8Gx3wWUrUNgIsHutv0JS1YzLelp1GLaLTs,2147
 hungerlib/configloader.py,sha256=TdEFqk2zG5nT-vJqdjA36DrbRinY66n0rgI8Z-EZmAk,2548
-hungerlib/datamap.py,sha256=TDIL67FH_D6nP8q3czKz2PZnjvs9J0NcC7Un8584xLs,2220
-hungerlib/messagerouter.py,sha256=1-4KeUT6AgTF0F53n3BtWt0ch0lnHHXYPOWvRtvUVKY,4344
+hungerlib/datamap.py,sha256=Tvcjc-n-tNO9SNQeh0k3dWzbxrRnnNVUmPnq0gap_8w,2807
+hungerlib/messagerouter.py,sha256=_Exn3zzwdnHCSDt8bvdCylq9atvhAyOK32a9TySKQCU,3098
 hungerlib/panel.py,sha256=LljDy3FZoabWotdrNhN89xHd2VcvbiQDshtZgMa0g08,2013
 hungerlib/api/__init__.py,sha256=xuPbWBXVTkr9Jtcmvk8PPiVvi8HDxrIOmb_gOcDZy-M,336
 hungerlib/api/backups.py,sha256=eJEaCot9QpyvaqB3qne6e94CYmjJahj9Tf9r8ogUQr0,642
@@ -17,8 +17,8 @@ hungerlib/utils/__init__.py,sha256=xyUldIwkVopZrp0Yp5g18vqGDUp3OOT4KknntLU4oes,5
 hungerlib/utils/colormaps.py,sha256=88eIDSI1hZYbtXmd7XujgmR1nhOXAkyB8ospQTqSHns,1240
 hungerlib/utils/time.py,sha256=lhLHMkL5NEP9f7j5k24k5brr1ZvAL22t07eV2rxTZ50,2354
 hungerlib/utils/utils.py,sha256=rGVXiK-ZaN1riNL_1QHKJZdOAX53vGlSDUzEP1Aqle4,1404
-hungerlib-3.2.dev8.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-hungerlib-3.2.dev8.dist-info/METADATA,sha256=s7zJxIBTVKk8M6zk5BPML7_fFqwY3Xo-1CKSODcSUU4,1535
-hungerlib-3.2.dev8.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-hungerlib-3.2.dev8.dist-info/top_level.txt,sha256=uHBMIM8b2Gt6daNkDF4uw-M2Hm2IpIVw1jOK9wC0fNQ,10
-hungerlib-3.2.dev8.dist-info/RECORD,,
+hungerlib-3.2.dev10.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+hungerlib-3.2.dev10.dist-info/METADATA,sha256=IW8CwHOl0HJabmx0VdqIGLQtqu0djU8ZFEH5Hz-tfUg,1536
+hungerlib-3.2.dev10.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+hungerlib-3.2.dev10.dist-info/top_level.txt,sha256=uHBMIM8b2Gt6daNkDF4uw-M2Hm2IpIVw1jOK9wC0fNQ,10
+hungerlib-3.2.dev10.dist-info/RECORD,,