serverwatcher 3.5.1__tar.gz → 3.6__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.
Files changed (21) hide show
  1. {serverwatcher-3.5.1/src/serverwatcher.egg-info → serverwatcher-3.6}/PKG-INFO +1 -1
  2. {serverwatcher-3.5.1 → serverwatcher-3.6}/pyproject.toml +1 -1
  3. serverwatcher-3.6/src/serverwatcher/config/global_config.py +17 -0
  4. {serverwatcher-3.5.1 → serverwatcher-3.6}/src/serverwatcher/watcher.py +13 -15
  5. {serverwatcher-3.5.1 → serverwatcher-3.6/src/serverwatcher.egg-info}/PKG-INFO +1 -1
  6. serverwatcher-3.5.1/src/serverwatcher/config/global_config.py +0 -7
  7. {serverwatcher-3.5.1 → serverwatcher-3.6}/LICENSE +0 -0
  8. {serverwatcher-3.5.1 → serverwatcher-3.6}/README.md +0 -0
  9. {serverwatcher-3.5.1 → serverwatcher-3.6}/setup.cfg +0 -0
  10. {serverwatcher-3.5.1 → serverwatcher-3.6}/src/serverwatcher/__init__.py +0 -0
  11. {serverwatcher-3.5.1 → serverwatcher-3.6}/src/serverwatcher/config/__init__.py +0 -0
  12. {serverwatcher-3.5.1 → serverwatcher-3.6}/src/serverwatcher/config/messages.py +0 -0
  13. {serverwatcher-3.5.1 → serverwatcher-3.6}/src/serverwatcher/config/watcher.py +0 -0
  14. {serverwatcher-3.5.1 → serverwatcher-3.6}/src/serverwatcher/defaultconfigs/global.yaml +0 -0
  15. {serverwatcher-3.5.1 → serverwatcher-3.6}/src/serverwatcher/defaultconfigs/messages.yaml +0 -0
  16. {serverwatcher-3.5.1 → serverwatcher-3.6}/src/serverwatcher/defaultconfigs/watcher.yaml +0 -0
  17. {serverwatcher-3.5.1 → serverwatcher-3.6}/src/serverwatcher/schema.py +0 -0
  18. {serverwatcher-3.5.1 → serverwatcher-3.6}/src/serverwatcher.egg-info/SOURCES.txt +0 -0
  19. {serverwatcher-3.5.1 → serverwatcher-3.6}/src/serverwatcher.egg-info/dependency_links.txt +0 -0
  20. {serverwatcher-3.5.1 → serverwatcher-3.6}/src/serverwatcher.egg-info/requires.txt +0 -0
  21. {serverwatcher-3.5.1 → serverwatcher-3.6}/src/serverwatcher.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: serverwatcher
3
- Version: 3.5.1
3
+ Version: 3.6
4
4
  Summary: A HungerLib-powered Minecraft server automation engine.
5
5
  Author: iFamished
6
6
  License: GPL-3.0
@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
7
7
 
8
8
  [project]
9
9
  name = "serverwatcher"
10
- version = "3.5.1"
10
+ version = "3.6"
11
11
  description = "A HungerLib-powered Minecraft server automation engine."
12
12
  readme = "README.md"
13
13
  requires-python = ">=3.10"
@@ -0,0 +1,17 @@
1
+ from dataclasses import dataclass
2
+
3
+ @dataclass
4
+ class GlobalConfig:
5
+ panel_name: str
6
+ panel_url: str
7
+ panel_api_key: str
8
+
9
+ origin_server_id: str
10
+
11
+ server_name: str
12
+ server_server_id: str
13
+ server_domain: str
14
+ server_port: int
15
+ server_rcon_port: int
16
+ server_rcon_password: str
17
+ server_tps_command: str
@@ -65,34 +65,32 @@ class ServerWatcher:
65
65
  )
66
66
 
67
67
  # panel
68
- p = self.global_cfg.panel
69
68
  self.panel = Panel(
70
- name=p["name"],
71
- url=p["url"],
72
- api_key=p["api_key"],
69
+ name=self.global_cfg.panel_name,
70
+ url=self.global_cfg.panel_url,
71
+ api_key=self.global_cfg.panel_api_key,
73
72
  )
74
73
 
74
+
75
75
  # origin
76
- o = self.global_cfg.origin
77
76
  self.origin = GenericServer(
78
77
  name="Origin",
79
78
  panel=self.panel,
80
- server_id=o["server_id"],
79
+ server_id=self.global_cfg.origin_server_id
81
80
  )
82
81
 
83
- # server
84
- s = self.global_cfg.server
85
82
  self.server = MinecraftServer(
86
- name=s["name"],
83
+ name=self.global_cfg.name,
87
84
  panel=self.panel,
88
- server_id=s["server_id"],
89
- server_domain=s["domain"],
90
- server_port=s["port"],
91
- rcon_port=s["rcon_port"],
92
- rcon_password=s["rcon_password"],
93
- tpsCommand=s["tps_command"],
85
+ server_id=self.global_cfg.server_id,
86
+ server_domain=self.global_cfg.domain,
87
+ server_port=self.global_cfg.port,
88
+ rcon_port=self.global_cfg.rcon_port,
89
+ rcon_password=self.global_cfg.rcon_password,
90
+ tpsCommand=self.global_cfg.tps_command,
94
91
  )
95
92
 
93
+
96
94
  # logger
97
95
  logger_name = self.cfg.logger_name_template.format(
98
96
  server_name=s["name"]
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: serverwatcher
3
- Version: 3.5.1
3
+ Version: 3.6
4
4
  Summary: A HungerLib-powered Minecraft server automation engine.
5
5
  Author: iFamished
6
6
  License: GPL-3.0
@@ -1,7 +0,0 @@
1
- from dataclasses import dataclass
2
-
3
- @dataclass
4
- class GlobalConfig:
5
- panel: dict
6
- origin: dict
7
- server: dict
File without changes
File without changes
File without changes