hungerlib 3.2.dev14__tar.gz → 3.3__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {hungerlib-3.2.dev14/src/hungerlib.egg-info → hungerlib-3.3}/PKG-INFO +1 -1
- {hungerlib-3.2.dev14 → hungerlib-3.3}/pyproject.toml +1 -1
- {hungerlib-3.2.dev14 → hungerlib-3.3}/src/hungerlib/configloader.py +6 -0
- {hungerlib-3.2.dev14 → hungerlib-3.3}/src/hungerlib/servers/generic.py +0 -24
- {hungerlib-3.2.dev14 → hungerlib-3.3}/src/hungerlib/servers/minecraft.py +0 -13
- {hungerlib-3.2.dev14 → hungerlib-3.3/src/hungerlib.egg-info}/PKG-INFO +1 -1
- {hungerlib-3.2.dev14 → hungerlib-3.3}/LICENSE +0 -0
- {hungerlib-3.2.dev14 → hungerlib-3.3}/README.md +0 -0
- {hungerlib-3.2.dev14 → hungerlib-3.3}/setup.cfg +0 -0
- {hungerlib-3.2.dev14 → hungerlib-3.3}/src/hungerlib/__init__.py +0 -0
- {hungerlib-3.2.dev14 → hungerlib-3.3}/src/hungerlib/api/__init__.py +0 -0
- {hungerlib-3.2.dev14 → hungerlib-3.3}/src/hungerlib/api/backups.py +0 -0
- {hungerlib-3.2.dev14 → hungerlib-3.3}/src/hungerlib/api/command.py +0 -0
- {hungerlib-3.2.dev14 → hungerlib-3.3}/src/hungerlib/api/databases.py +0 -0
- {hungerlib-3.2.dev14 → hungerlib-3.3}/src/hungerlib/api/filemanager.py +0 -0
- {hungerlib-3.2.dev14 → hungerlib-3.3}/src/hungerlib/api/schedule.py +0 -0
- {hungerlib-3.2.dev14 → hungerlib-3.3}/src/hungerlib/api/startup.py +0 -0
- {hungerlib-3.2.dev14 → hungerlib-3.3}/src/hungerlib/bridgeclient.py +0 -0
- {hungerlib-3.2.dev14 → hungerlib-3.3}/src/hungerlib/datamap.py +0 -0
- {hungerlib-3.2.dev14 → hungerlib-3.3}/src/hungerlib/messagerouter.py +0 -0
- {hungerlib-3.2.dev14 → hungerlib-3.3}/src/hungerlib/panel.py +0 -0
- {hungerlib-3.2.dev14 → hungerlib-3.3}/src/hungerlib/servers/__init__.py +0 -0
- {hungerlib-3.2.dev14 → hungerlib-3.3}/src/hungerlib/utils/__init__.py +0 -0
- {hungerlib-3.2.dev14 → hungerlib-3.3}/src/hungerlib/utils/colormaps.py +0 -0
- {hungerlib-3.2.dev14 → hungerlib-3.3}/src/hungerlib/utils/time.py +0 -0
- {hungerlib-3.2.dev14 → hungerlib-3.3}/src/hungerlib/utils/utils.py +0 -0
- {hungerlib-3.2.dev14 → hungerlib-3.3}/src/hungerlib.egg-info/SOURCES.txt +0 -0
- {hungerlib-3.2.dev14 → hungerlib-3.3}/src/hungerlib.egg-info/dependency_links.txt +0 -0
- {hungerlib-3.2.dev14 → hungerlib-3.3}/src/hungerlib.egg-info/requires.txt +0 -0
- {hungerlib-3.2.dev14 → hungerlib-3.3}/src/hungerlib.egg-info/top_level.txt +0 -0
|
@@ -81,6 +81,12 @@ def loadConfig(path, default_path, schema):
|
|
|
81
81
|
values[f.name] = convert_value(value, f.type)
|
|
82
82
|
continue
|
|
83
83
|
|
|
84
|
+
# --- UNIVERSAL YAML LOOKUP ---
|
|
85
|
+
yaml_value = raw.get(f.name)
|
|
86
|
+
if yaml_value is not None:
|
|
87
|
+
values[f.name] = convert_value(yaml_value, f.type)
|
|
88
|
+
continue
|
|
89
|
+
|
|
84
90
|
# --- FALLBACK: use dataclass default ---
|
|
85
91
|
if default is not MISSING:
|
|
86
92
|
values[f.name] = default
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
# Universal server class
|
|
2
2
|
from hungerlib.panel import Panel
|
|
3
|
-
from hungerlib.utils.colormaps import MC_COLOR_MAP, ASCII_COLOR_MAP
|
|
4
|
-
|
|
5
3
|
|
|
6
4
|
class GenericServer:
|
|
7
5
|
def __init__(
|
|
@@ -9,35 +7,13 @@ class GenericServer:
|
|
|
9
7
|
name,
|
|
10
8
|
panel,
|
|
11
9
|
server_id,
|
|
12
|
-
mc_color_map=MC_COLOR_MAP,
|
|
13
|
-
ascii_color_map=ASCII_COLOR_MAP
|
|
14
10
|
):
|
|
15
11
|
self.name = name
|
|
16
12
|
self.panel = panel
|
|
17
13
|
self.server_id = server_id
|
|
18
14
|
|
|
19
|
-
# Normalize maps
|
|
20
|
-
self.mc_color_map = (
|
|
21
|
-
mc_color_map.as_dict()
|
|
22
|
-
if hasattr(mc_color_map, "as_dict")
|
|
23
|
-
else mc_color_map
|
|
24
|
-
)
|
|
25
|
-
|
|
26
|
-
self.ascii_color_map = (
|
|
27
|
-
ascii_color_map.as_dict()
|
|
28
|
-
if hasattr(ascii_color_map, "as_dict")
|
|
29
|
-
else ascii_color_map
|
|
30
|
-
)
|
|
31
|
-
|
|
32
15
|
self._cached_resources = None
|
|
33
16
|
|
|
34
|
-
|
|
35
|
-
# internal helpers
|
|
36
|
-
def _translate_mc_colors(self, msg):
|
|
37
|
-
for tag, code in self.mc_color_map.items():
|
|
38
|
-
msg = msg.replace(tag, code)
|
|
39
|
-
return msg
|
|
40
|
-
|
|
41
17
|
# resource and status
|
|
42
18
|
def refresh(self):
|
|
43
19
|
r = self.panel.get(f"/api/client/servers/{self.server_id}/resources")
|
|
@@ -20,23 +20,10 @@ class MinecraftServer(GenericServer):
|
|
|
20
20
|
bridge_token,
|
|
21
21
|
tpsCommand='tt20 tps',
|
|
22
22
|
):
|
|
23
|
-
mc_map = (
|
|
24
|
-
mc_color_map.as_dict()
|
|
25
|
-
if hasattr(mc_color_map, "as_dict")
|
|
26
|
-
else mc_color_map
|
|
27
|
-
)
|
|
28
|
-
ascii_map = (
|
|
29
|
-
ascii_color_map.as_dict()
|
|
30
|
-
if hasattr(ascii_color_map, "as_dict")
|
|
31
|
-
else ascii_color_map
|
|
32
|
-
)
|
|
33
|
-
|
|
34
23
|
super().__init__(
|
|
35
24
|
name,
|
|
36
25
|
panel,
|
|
37
26
|
server_id,
|
|
38
|
-
mc_color_map=mc_map,
|
|
39
|
-
ascii_color_map=ascii_map
|
|
40
27
|
)
|
|
41
28
|
|
|
42
29
|
# Minecraft-specific fields
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|