hungerlib 3.0.dev9__tar.gz → 3.0.dev11__tar.gz

{hungerlib-3.0.dev9/src/hungerlib.egg-info → hungerlib-3.0.dev11}/PKG-INFO

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

{hungerlib-3.0.dev9 → hungerlib-3.0.dev11}/pyproject.toml

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

{hungerlib-3.0.dev9 → hungerlib-3.0.dev11}/src/hungerlib/addons/__init__.py

@@ -1,13 +1,9 @@
-from .colormap import *
 from .snapshot import Snapshot
 from .scheduler import *
 from .utils import *
 from .configloader import *
 
 __all__ = [
-    'ColorMap',
-    'MC_COLOR_MAP',
-    'ASCII_COLOR_MAP',
     'runCountdownEvents',
     'waitForOnline',
     'waitForOffline',
@@ -23,7 +19,4 @@ __all__ = [
     'clearTerminal',
     'load_yaml',
     'loadConfig',
-    'clrz',
-    'set_default_colormap',
-    'get_default_colormap',
 ]

{hungerlib-3.0.dev9 → hungerlib-3.0.dev11}/src/hungerlib/datamap.py

@@ -11,7 +11,6 @@ def set_default_maps(*maps):
 def get_default_maps():
     return _default_maps
 
-
 # syntax patterns
 class Syntax:
     braces   = r"\{([^{}]+)\}"
@@ -19,24 +18,20 @@ class Syntax:
     angles   = r"<([^<>]+)>"
     percents = r"%([^%]+)%"
 
-
 # base datamap
 @dataclass(frozen=True)
 class DataMap:
     __syntax__: str = Syntax.braces
-
     def as_map(self):
         return {
             f.name: getattr(self, f.name)
             for f in fields(self)
             if f.init and f.name != "__syntax__"
         }
-
     @classmethod
     def get_syntax(cls):
         return getattr(cls, "__syntax__", Syntax.braces)
 
-
 # decorator
 def datamap(_cls=None, *, syntax=Syntax.braces):
     def wrap(cls):
@@ -45,36 +40,27 @@ def datamap(_cls=None, *, syntax=Syntax.braces):
         return dataclass(frozen=True)(cls)
     return wrap if _cls is None else wrap(_cls)
 
-
 # core templating
 def mapit(text: str, *maps, **runtime):
     maps = (*get_default_maps(), *maps)
-
     for m in maps:
         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)
-
     return text

{hungerlib-3.0.dev9 → hungerlib-3.0.dev11}/src/hungerlib/messagerouter.py

@@ -1,7 +1,8 @@
 import logging
 from pathlib import Path
 from datetime import datetime
-from hungerlib.addons import clrz, ASCII_COLOR_MAP, MC_COLOR_MAP
+from hungerlib.objects import ASCII_COLOR_MAP, MC_COLOR_MAP
+from hungerlib import DataMap, Syntax, mapit
 
 
 class MessageRouter:
@@ -70,13 +71,13 @@ class MessageRouter:
 
     # routing primatives
     def origin(self, msg):
-        colored = clrz(msg, cmap=self._origin_map)
+        colored = mapit(msg, self._origin_map)
         print(colored)
 
     def destination(self, msg):
         if not self.server or not hasattr(self.server, "_rcon_send"):
             return
-        colored = clrz(msg, cmap=self._destination_map)
+        colored = mapit(msg, self._destination_map)
         self.server._rcon_send(
             f'logtellraw targetless "{self.console_backspaces}{colored}"'
         )
@@ -94,7 +95,7 @@ class MessageRouter:
 
     def broadcast(self, msg):
         if hasattr(self.server, "sendBroadcast"):
-            colored = clrz(msg, cmap=self._broadcast_map)
+            colored = mapit(msg, self._broadcast_map)
             self.server.sendBroadcast(colored)
 
     # high level router

hungerlib-3.0.dev11/src/hungerlib/objects/__init__.py

@@ -0,0 +1,11 @@
+from .servers.generic import GenericServer
+from .servers.minecraft import MinecraftServer
+from .datamaps.colormaps import ColorMap, ASCII_COLOR_MAP, MC_COLOR_MAP
+
+__all__ = [
+    "GenericServer",
+    "MinecraftServer",
+    "ColorMap",
+    "ASCII_COLOR_MAP",
+    "MC_COLOR_MAP",
+]

hungerlib-3.0.dev9/src/hungerlib/maps/ascii.py → hungerlib-3.0.dev11/src/hungerlib/objects/datamaps/colormaps.py

@@ -1,7 +1,6 @@
 from hungerlib import datamap, Syntax, mapit, set_default_maps
 
-# ascii colormap
-@datamap(syntax=Syntax.angles)
+@datamap(syntax=Syntax.angles) # produces <>
 class ColorMap:
     black: str = "\033[30m"
     dark_blue: str = "\033[34m"
@@ -26,5 +25,28 @@ class ColorMap:
     def as_dict(self):
         return {f"<{k}>": getattr(self, k) for k in self.__dataclass_fields__}
 
-
+# ASCII color map
 ASCII_COLOR_MAP = ColorMap()
+
+# Minecraft color map
+MC_COLOR_MAP = ColorMap(
+    black="§0",
+    dark_blue="§1",
+    dark_green="§2",
+    dark_aqua="§3",
+    dark_red="§4",
+    dark_purple="§5",
+    gold="§6",
+    gray="§7",
+    dark_gray="§8",
+    blue="§9",
+    green="§a",
+    aqua="§b",
+    red="§c",
+    light_purple="§d",
+    yellow="§e",
+    white="§f",
+    reset="§r",
+    bold="§l",
+    italic="§o"
+)

{hungerlib-3.0.dev9 → hungerlib-3.0.dev11/src/hungerlib.egg-info}/PKG-INFO

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

{hungerlib-3.0.dev9 → hungerlib-3.0.dev11}/src/hungerlib.egg-info/SOURCES.txt

@@ -11,7 +11,6 @@ src/hungerlib.egg-info/dependency_links.txt
 src/hungerlib.egg-info/requires.txt
 src/hungerlib.egg-info/top_level.txt
 src/hungerlib/addons/__init__.py
-src/hungerlib/addons/colormap.py
 src/hungerlib/addons/configloader.py
 src/hungerlib/addons/mchelpers.py
 src/hungerlib/addons/scheduler.py
@@ -24,8 +23,7 @@ src/hungerlib/api/databases.py
 src/hungerlib/api/filemanager.py
 src/hungerlib/api/schedule.py
 src/hungerlib/api/startup.py
-src/hungerlib/maps/__init__.py
-src/hungerlib/maps/ascii.py
-src/hungerlib/servers/__init__.py
-src/hungerlib/servers/generic.py
-src/hungerlib/servers/minecraft.py
+src/hungerlib/objects/__init__.py
+src/hungerlib/objects/datamaps/colormaps.py
+src/hungerlib/objects/servers/generic.py
+src/hungerlib/objects/servers/minecraft.py

hungerlib-3.0.dev9/src/hungerlib/addons/colormap.py

@@ -1,96 +0,0 @@
-# Environment-based color translation and mapping
-from dataclasses import dataclass, field
-
-
-@dataclass(frozen=True)
-class ColorMap:
-    black: str
-    dark_blue: str
-    dark_green: str
-    dark_aqua: str
-    dark_red: str
-    dark_purple: str
-    gold: str
-    gray: str
-    dark_gray: str
-    blue: str
-    green: str
-    aqua: str
-    red: str
-    light_purple: str
-    yellow: str
-    white: str
-    reset: str
-    bold: str
-    italic: str
-
-    def as_dict(self):
-        """Convert dataclass to dict with <tags> as keys."""
-        return {
-            f"<{field}>": getattr(self, field)
-            for field in self.__dataclass_fields__
-        }
-
-
-MC_COLOR_MAP = ColorMap(
-    black="§0",
-    dark_blue="§1",
-    dark_green="§2",
-    dark_aqua="§3",
-    dark_red="§4",
-    dark_purple="§5",
-    gold="§6",
-    gray="§7",
-    dark_gray="§8",
-    blue="§9",
-    green="§a",
-    aqua="§b",
-    red="§c",
-    light_purple="§d",
-    yellow="§e",
-    white="§f",
-    reset="§r",
-    bold="§l",
-    italic="§o"
-)
-
-ASCII_COLOR_MAP = ColorMap(
-    black="\033[30m",
-    dark_blue="\033[34m",
-    dark_green="\033[32m",
-    dark_aqua="\033[36m",
-    dark_red="\033[31m",
-    dark_purple="\033[35m",
-    gold="\033[33m",
-    gray="\033[37m",
-    dark_gray="\033[90m",
-    blue="\033[94m",
-    green="\033[92m",
-    aqua="\033[96m",
-    red="\033[91m",
-    light_purple="\033[95m",
-    yellow="\033[93m",
-    white="\033[97m",
-    reset="\033[0m",
-    bold="\033[1m",
-    italic="\033[3m"
-)
-
-_DEFAULT_COLORMAP = ASCII_COLOR_MAP
-
-def set_default_colormap(cmap):
-    global _DEFAULT_COLORMAP
-    _DEFAULT_COLORMAP = cmap
-
-def get_default_colormap():
-    return _DEFAULT_COLORMAP
-
-def clrz(text: str, cmap=None):
-    if cmap is None:
-        cmap = get_default_colormap()
-    if hasattr(cmap, "as_dict"):
-        cmap = cmap.as_dict()
-    for tag, code in cmap.items():
-        text = text.replace(tag, code)
-    reset = cmap.get("<reset>", "")
-    return text + reset

hungerlib-3.0.dev9/src/hungerlib/maps/__init__.py

@@ -1,6 +0,0 @@
-from .ascii import ColorMap, ASCII_COLOR_MAP
-
-__all__ = [
-    'ColorMap',
-    'ASCII_COLOR_MAP',
-]

hungerlib-3.0.dev9/src/hungerlib/servers/__init__.py

@@ -1,7 +0,0 @@
-from .generic import GenericServer
-from .minecraft import MinecraftServer
-
-__all__ = [
-    "GenericServer",
-    "MinecraftServer",
-]