mcserver-cli 4.0.0.dev0__py3-none-any.whl → 4.3.0__py3-none-any.whl

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 (53) hide show
  1. mcserver/__init__.py +1 -1
  2. mcserver/cli.py +131 -157
  3. mcserver/commands/__init__.py +18 -18
  4. mcserver/commands/add_projects.py +218 -127
  5. mcserver/commands/import_setup.py +1 -1
  6. mcserver/commands/initialize_server.py +39 -15
  7. mcserver/commands/list_projects.py +1 -1
  8. mcserver/commands/op_grant.py +1 -1
  9. mcserver/commands/op_list.py +1 -1
  10. mcserver/commands/op_revoke.py +1 -1
  11. mcserver/commands/print_help.py +1 -1
  12. mcserver/commands/remove_projects.py +1 -1
  13. mcserver/commands/search_projects.py +141 -71
  14. mcserver/commands/server_status.py +1 -1
  15. mcserver/commands/show_projects.py +94 -18
  16. mcserver/commands/start_server.py +26 -14
  17. mcserver/commands/stop_server.py +2 -10
  18. mcserver/commands/update_projects.py +1 -1
  19. mcserver/commands/whitelist_add.py +1 -1
  20. mcserver/commands/whitelist_list.py +10 -9
  21. mcserver/commands/whitelist_remove.py +31 -25
  22. mcserver/config.py +14 -3
  23. mcserver/fabricmc/meta.py +1 -1
  24. mcserver/metadata.py +16 -6
  25. mcserver/modrinth/apis/__init__.py +5 -5
  26. mcserver/modrinth/apis/get_project_informations.py +49 -44
  27. mcserver/modrinth/apis/get_project_versions.py +85 -40
  28. mcserver/modrinth/apis/search_projects.py +64 -27
  29. mcserver/modrinth/project_records.py +40 -28
  30. mcserver/modrinth/shared.py +22 -20
  31. mcserver/modrinth/slug_index.py +3 -7
  32. mcserver/modrinth/typings/__init__.py +26 -14
  33. mcserver/modrinth/typings/{project_informations.py → project_information.py} +5 -3
  34. mcserver/modrinth/typings/project_version.py +90 -0
  35. mcserver/mysterious.py +1 -1
  36. mcserver/networking.py +3 -0
  37. mcserver/paths.py +2 -1
  38. mcserver/resolver.py +47 -30
  39. mcserver/server_files/paths.py +3 -0
  40. mcserver/server_files/whitelist.py +102 -148
  41. mcserver/shared.py +29 -7
  42. {mcserver_cli-4.0.0.dev0.dist-info → mcserver_cli-4.3.0.dist-info}/METADATA +6 -5
  43. mcserver_cli-4.3.0.dist-info/RECORD +70 -0
  44. {mcserver_cli-4.0.0.dev0.dist-info → mcserver_cli-4.3.0.dist-info}/WHEEL +1 -1
  45. mcserver/mcserver_v2.0.0.py +0 -1119
  46. mcserver/modrinth/api.py +0 -768
  47. mcserver/modrinth/project_records/metadata.py +0 -0
  48. mcserver/modrinth/project_records/relationships.py +0 -205
  49. mcserver/modrinth/project_records/shared.py +0 -8
  50. mcserver_cli-4.0.0.dev0.dist-info/RECORD +0 -73
  51. /mcserver/{legacyfabric → legacy_fabric}/meta.py +0 -0
  52. {mcserver_cli-4.0.0.dev0.dist-info → mcserver_cli-4.3.0.dist-info}/entry_points.txt +0 -0
  53. {mcserver_cli-4.0.0.dev0.dist-info → mcserver_cli-4.3.0.dist-info}/licenses/LICENSE +0 -0
@@ -1,148 +1,239 @@
1
+ import logging
1
2
  from argparse import Namespace
2
3
 
4
+ from .. import config, paths, shared
5
+ from ..modrinth import apis as modrinth_apis
6
+ from ..modrinth import project_records
7
+ from ..resolver import (
8
+ Dependency,
9
+ human_to_resolver,
10
+ required_only,
11
+ resolve_dependencies,
12
+ )
3
13
 
4
- def main(args: Namespace) -> int:
14
+ logger = logging.getLogger(__name__)
15
+
16
+
17
+ def run(args: Namespace) -> int:
5
18
  projects: list[str] = args.projects
6
19
 
7
- # from ..modrinth.apis import get_project_versions
8
- from ..config import load_config
9
- from ..resolver import (
10
- Dependency,
11
- human_to_resolver,
12
- resolve_dependencies,
13
- resolver_to_human,
14
- )
20
+ if not (paths.configs_dir / "server.json").exists():
21
+ logger.error(
22
+ "Configuration file for server does not exist, is server initialized?"
23
+ )
15
24
 
16
- def get_project_versions(
17
- project_id, loader_names, game_versions, featured=None, include_changelog=True
18
- ):
19
- project_version = {
20
- "embeddium": {
21
- "dependencies": [
22
- {"project_id": "AANobbMI", "dependency_type": "incompatible"}
23
- ],
24
- "project_id": "sk9rgfiA",
25
- },
26
- "fabric-api": {"dependencies": [], "project_id": "P7dR8mSH"},
27
- "jade": {
28
- "dependencies": [
29
- {"project_id": "AANobbMI", "dependency_type": "required"},
30
- {"project_id": "u6dRKJwZ", "dependency_type": "optional"},
31
- ],
32
- "project_id": "nvQzSEkH",
33
- },
34
- "jei": {"dependencies": [], "project_id": "u6dRKJwZ"},
35
- "just-enough-resources-jer": {
36
- "dependencies": [
37
- {"project_id": "u6dRKJwZ", "dependency_type": "required"}
38
- ],
39
- "project_id": "uEfK2CXF",
40
- },
41
- "origins": {
42
- "dependencies": [
43
- {"project_id": "P7dR8mSH", "dependency_type": "required"}
44
- ],
45
- "project_id": "3BeIrqZR",
46
- },
47
- "pehkui": {
48
- "dependencies": [
49
- {"project_id": "P7dR8mSH", "dependency_type": "required"}
50
- ],
51
- "project_id": "t5W7Jfwy",
52
- },
53
- "podium": {
54
- "dependencies": [
55
- {"project_id": "AANobbMI", "dependency_type": "required"}
56
- ],
57
- "project_id": "fW8woQj4",
58
- },
59
- "sodium": {"dependencies": [], "project_id": "AANobbMI"},
60
- "thdilos-fox-origin-expanded": {
61
- "dependencies": [
62
- {"project_id": "9qGn08Dr", "dependency_type": "required"},
63
- {"project_id": "3BeIrqZR", "dependency_type": "required"},
64
- {"project_id": "t5W7Jfwy", "dependency_type": "required"},
65
- ],
66
- "project_id": "CbsRGXBx",
67
- },
68
- "thdilos-fox-origin": {
69
- "dependencies": [
70
- {"project_id": "3BeIrqZR", "dependency_type": "required"},
71
- {"project_id": "t5W7Jfwy", "dependency_type": "required"},
72
- ],
73
- "project_id": "9qGn08Dr",
74
- },
75
- }
76
-
77
- id_slug = {
78
- "3BeIrqZR": "origins",
79
- "9qGn08Dr": "thdilos-fox-origin",
80
- "AANobbMI": "sodium",
81
- "CbsRGXBx": "thdilos-fox-origin-expanded",
82
- "P7dR8mSH": "fabric-api",
83
- "fW8woQj4": "podium",
84
- "nvQzSEkH": "jade",
85
- "sk9rgfiA": "embeddium",
86
- "t5W7Jfwy": "pehkui",
87
- "u6dRKJwZ": "jei",
88
- "uEfK2CXF": "just-enough-resources-jer",
89
- }
90
-
91
- a = [
92
- (
93
- project_version[project_id]
94
- if project_id in project_version
95
- else project_version[id_slug[project_id]]
96
- )
97
- ]
98
- return a
99
-
100
- server_config = load_config("server")
101
- loader_name = server_config["loader"]["name"]
25
+ server_config = config.read_config(
26
+ "server", shared.default_configs["server"]["format_version"]
27
+ )
102
28
  game_version = server_config["game_version"]
29
+ loader_name = server_config["loader"]["name"]
103
30
 
104
- cached_project_versions = {}
105
- project_ids = []
31
+ if loader_name == "vanilla":
32
+ logger.error("Vanilla does not support mod or plugin.")
33
+ return 1
106
34
 
35
+ project_ids: list[str] = []
107
36
  for project in projects:
108
- project_version = get_project_versions(
109
- project, loader_name, game_version, include_changelog=False
110
- )[0]
111
-
112
- cached_project_versions[project_version["project_id"]] = project_version
113
- project_ids.append(project_version["project_id"])
37
+ modrinth_apis.get_project_versions(project, loader_name, game_version)
114
38
 
115
39
  def get_dependencies(project_id: str) -> dict[str, int]:
116
40
  dependencies: list[Dependency] = []
41
+ if project_records.record_exists(project_id):
42
+ project_record = project_records.read_record(project_id)
43
+ for dependency_id, dependency_type in project_record[
44
+ "dependencies"
45
+ ].items():
46
+ dependencies.append(
47
+ {"project_id": dependency_id, "dependency_type": dependency_type}
48
+ )
117
49
 
118
- # Get the latest version
119
- project_version = get_project_versions(
120
- project_id, loader_name, game_version, include_changelog=False
121
- )[0]
122
- if "dependencies" in project_version:
123
- project_dependencies = project_version["dependencies"]
124
- for dependency in project_dependencies:
125
- if not "project_id" in dependency:
126
- continue
50
+ else:
51
+ project_version = modrinth_apis.get_project_versions(
52
+ project_id, loader_name, game_version, include_changelog=False
53
+ )[0]
127
54
 
128
- if dependency["project_id"] is None:
129
- continue
55
+ if "dependencies" in project_version:
56
+ project_dependencies = project_version["dependencies"]
57
+ for dependency in project_dependencies:
58
+ if not "project_id" in dependency:
59
+ continue
130
60
 
131
- dependencies.append(
132
- {
133
- "project_id": dependency["project_id"],
134
- "dependency_type": dependency["dependency_type"],
135
- }
136
- )
61
+ if dependency["project_id"] is None:
62
+ continue
137
63
 
138
- return human_to_resolver(dependencies)
64
+ dependencies.append(
65
+ {
66
+ "project_id": dependency["project_id"],
67
+ "dependency_type": dependency["dependency_type"],
68
+ }
69
+ )
139
70
 
140
- def required_only(dependency_type: int) -> bool:
141
- return dependency_type == 2
71
+ return human_to_resolver(dependencies)
142
72
 
143
- print(
144
- resolver_to_human(
145
- resolve_dependencies(project_ids, get_dependencies, required_only, 2)
146
- )
73
+ resolved_dependencies = resolve_dependencies(
74
+ projects, get_dependencies, required_only
147
75
  )
76
+ print(resolved_dependencies)
148
77
  return 0
78
+
79
+ # # from ..modrinth.apis import get_project_versions
80
+
81
+ # def get_project_versions(
82
+ # project_id, loader_names, game_versions, featured=None, include_changelog=True
83
+ # ):
84
+ # project_version = {
85
+ # "embeddium": {
86
+ # "dependencies": [
87
+ # {"project_id": "AANobbMI", "dependency_type": "incompatible"}
88
+ # ],
89
+ # "project_id": "sk9rgfiA",
90
+ # },
91
+ # "fabric-api": {"dependencies": [], "project_id": "P7dR8mSH"},
92
+ # "jade": {
93
+ # "dependencies": [
94
+ # {"project_id": "AANobbMI", "dependency_type": "required"},
95
+ # {"project_id": "u6dRKJwZ", "dependency_type": "optional"},
96
+ # ],
97
+ # "project_id": "nvQzSEkH",
98
+ # },
99
+ # "jei": {"dependencies": [], "project_id": "u6dRKJwZ"},
100
+ # "just-enough-resources-jer": {
101
+ # "dependencies": [
102
+ # {"project_id": "u6dRKJwZ", "dependency_type": "required"}
103
+ # ],
104
+ # "project_id": "uEfK2CXF",
105
+ # },
106
+ # "origins": {
107
+ # "dependencies": [
108
+ # {"project_id": "P7dR8mSH", "dependency_type": "required"}
109
+ # ],
110
+ # "project_id": "3BeIrqZR",
111
+ # },
112
+ # "pehkui": {
113
+ # "dependencies": [
114
+ # {"project_id": "P7dR8mSH", "dependency_type": "required"}
115
+ # ],
116
+ # "project_id": "t5W7Jfwy",
117
+ # },
118
+ # "podium": {
119
+ # "dependencies": [
120
+ # {"project_id": "AANobbMI", "dependency_type": "required"}
121
+ # ],
122
+ # "project_id": "fW8woQj4",
123
+ # },
124
+ # "sodium": {"dependencies": [], "project_id": "AANobbMI"},
125
+ # "thdilos-fox-origin-expanded": {
126
+ # "dependencies": [
127
+ # {"project_id": "9qGn08Dr", "dependency_type": "required"},
128
+ # {"project_id": "3BeIrqZR", "dependency_type": "required"},
129
+ # {"project_id": "t5W7Jfwy", "dependency_type": "required"},
130
+ # ],
131
+ # "project_id": "CbsRGXBx",
132
+ # },
133
+ # "thdilos-fox-origin": {
134
+ # "dependencies": [
135
+ # {"project_id": "3BeIrqZR", "dependency_type": "required"},
136
+ # {"project_id": "t5W7Jfwy", "dependency_type": "required"},
137
+ # ],
138
+ # "project_id": "9qGn08Dr",
139
+ # },
140
+ # }
141
+
142
+ # id_slug = {
143
+ # "3BeIrqZR": "origins",
144
+ # "9qGn08Dr": "thdilos-fox-origin",
145
+ # "AANobbMI": "sodium",
146
+ # "CbsRGXBx": "thdilos-fox-origin-expanded",
147
+ # "P7dR8mSH": "fabric-api",
148
+ # "fW8woQj4": "podium",
149
+ # "nvQzSEkH": "jade",
150
+ # "sk9rgfiA": "embeddium",
151
+ # "t5W7Jfwy": "pehkui",
152
+ # "u6dRKJwZ": "jei",
153
+ # "uEfK2CXF": "just-enough-resources-jer",
154
+ # }
155
+
156
+ # a = [
157
+ # (
158
+ # project_version[project_id]
159
+ # if project_id in project_version
160
+ # else project_version[id_slug[project_id]]
161
+ # )
162
+ # ]
163
+ # return a
164
+
165
+ # server_config = config.read_config(
166
+ # "server", shared.default_configs["server"]["format_version"]
167
+ # )
168
+ # loader_name = server_config["loader"]["name"]
169
+ # game_version = server_config["game_version"]
170
+
171
+ # cached_project_versions = {}
172
+ # project_ids = []
173
+
174
+ # for project in projects:
175
+ # project_version = get_project_versions(
176
+ # project, loader_name, game_version, include_changelog=False
177
+ # )[0]
178
+
179
+ # cached_project_versions[project_version["project_id"]] = project_version
180
+ # project_ids.append(project_version["project_id"])
181
+
182
+ # id_to_slug: dict[str, str] = {}
183
+
184
+ # def get_dependencies(project_id: str) -> dict[str, int]:
185
+ # dependencies: list[Dependency] = []
186
+
187
+ # # Get the latest version
188
+ # project_version = get_project_versions(
189
+ # project_id, loader_name, game_version, include_changelog=False
190
+ # )[0]
191
+ # if "dependencies" in project_version:
192
+ # project_dependencies = project_version["dependencies"]
193
+ # for dependency in project_dependencies:
194
+ # if not "project_id" in dependency:
195
+ # continue
196
+
197
+ # if dependency["project_id"] is None:
198
+ # continue
199
+
200
+ # dependencies.append(
201
+ # {
202
+ # "project_id": dependency["project_id"],
203
+ # "dependency_type": dependency["dependency_type"],
204
+ # }
205
+ # )
206
+
207
+ # return human_to_resolver(dependencies)
208
+
209
+ # def required_only(dependency_type: int) -> bool:
210
+ # return dependency_type == 2
211
+
212
+ # resolved_projects = resolver_to_human(
213
+ # resolve_dependencies(project_ids, get_dependencies, required_only)
214
+ # )
215
+
216
+ # print(json.dumps(resolved_projects, indent=2))
217
+
218
+ # required_projects: set[str] = set()
219
+ # optional_projects: set[str] = set()
220
+ # incompatible_projects: set[str] = set()
221
+
222
+ # for project in resolved_projects:
223
+ # for dependent in project["dependents"]:
224
+ # match dependent["dependency_type"]:
225
+ # case "required":
226
+ # required_projects.add(project["project_id"])
227
+ # case "optional":
228
+ # optional_projects.add(project["project_id"])
229
+ # case "incompatible":
230
+ # incompatible_projects.add(project["project_id"])
231
+
232
+ # conflicting_projects: set[str] = required_projects & incompatible_projects
233
+
234
+ # if conflicting_projects:
235
+ # print(f"I think we have conflicting project -_-, like {conflicting_projects} are in required and incompatible")
236
+
237
+ # print(required_projects, optional_projects, incompatible_projects, conflicting_projects)
238
+
239
+ # return 0
@@ -1,7 +1,7 @@
1
1
  from argparse import Namespace
2
2
 
3
3
 
4
- def main(args: Namespace) -> int:
4
+ def run(args: Namespace) -> int:
5
5
  file: str = args.file
6
6
  import logging as log
7
7
 
@@ -1,7 +1,7 @@
1
1
  from argparse import Namespace
2
2
 
3
3
 
4
- def main(args: Namespace) -> int:
4
+ def run(args: Namespace) -> int:
5
5
  from ..modrinth.shared import SearchSortIndex
6
6
 
7
7
  # CLI Arguments
@@ -23,6 +23,19 @@ def main(args: Namespace) -> int:
23
23
  from .. import __version__, config, shared, state
24
24
  from ..metadata import metadata_file, set_metadata
25
25
 
26
+ if min_ram > max_ram:
27
+ log.error("Minimum RAM cannot be larger than maximum RAM")
28
+ return 1
29
+
30
+ # Is first initializing
31
+ is_first_initialize = not metadata_file.exists()
32
+
33
+ if not is_first_initialize:
34
+ log.info("Server is already initialized, exiting...")
35
+ return 1
36
+
37
+ shared.set_loader_context(loader_name)
38
+
26
39
  # Special loader version
27
40
  if loader_name == "vanilla":
28
41
  loader_version = None
@@ -33,9 +46,11 @@ def main(args: Namespace) -> int:
33
46
 
34
47
  match game_version:
35
48
  case "latest" | "latest-release":
49
+ log.info("Fetching the latest release version for Minecraft...")
36
50
  game_version = mojang_manifest.get_latest_release_version()
37
51
  log.info(f"Latest Minecraft release version is: {game_version}")
38
52
  case "latest-snapshot":
53
+ log.info("Fetching the latest snapshot version for Minecraft...")
39
54
  game_version = mojang_manifest.get_latest_snapshot_version()
40
55
  log.info(f"Latest Minecraft snapshot version is: {game_version}")
41
56
 
@@ -44,6 +59,7 @@ def main(args: Namespace) -> int:
44
59
  match loader_name:
45
60
  # Mod Loaders
46
61
  case "fabric":
62
+ log.info("Fetching the latest version for Fabric Loader...")
47
63
  from ..fabricmc import meta as fabricmc_meta
48
64
 
49
65
  loader_versions = fabricmc_meta.get_loader_versions()
@@ -53,9 +69,10 @@ def main(args: Namespace) -> int:
53
69
  break
54
70
 
55
71
  log.info(f"Latest Fabric loader version is: {loader_version}")
56
- case "legacyfabric":
57
- pass
72
+ # case "legacy_fabric":
73
+ # pass
58
74
  case "quilt":
75
+ log.info("Fetching the latest version for Quilt Loader...")
59
76
  from ..quiltmc import meta as quiltmc_meta
60
77
 
61
78
  loader_versions = quiltmc_meta.get_loader_versions()
@@ -64,6 +81,7 @@ def main(args: Namespace) -> int:
64
81
  log.info(f"Latest Quilt loader version is: {loader_version}")
65
82
  # Plugin Loader
66
83
  case "paper":
84
+ log.info("Fetching the latest version for Paper...")
67
85
  from ..papermc import api as papermc_api
68
86
 
69
87
  latest_paper_version = papermc_api.get_latest_project_build(
@@ -72,6 +90,7 @@ def main(args: Namespace) -> int:
72
90
  loader_version = str(latest_paper_version["build_id"])
73
91
  log.info(f"Latest Paper build version is: {loader_version}")
74
92
  case "purpur":
93
+ log.info("Fetching the latest version for Purpur...")
75
94
  from ..purpurmc import api as purpurmc_api
76
95
 
77
96
  latest_purpur_version = purpurmc_api.get_latest_project_build(
@@ -84,9 +103,9 @@ def main(args: Namespace) -> int:
84
103
  log.error(f"Unknown loader: {loader_name}")
85
104
  return 1
86
105
 
87
- # Is first initializing
88
- is_first_initialize = not metadata_file.exists()
89
- shared.set_loader_context(loader_name)
106
+ if loader_version == "latest":
107
+ log.error("No stable version found")
108
+ return 1
90
109
 
91
110
  shared.mcserver_dir.mkdir(exist_ok=True)
92
111
  state.set_state("initializing_server")
@@ -97,8 +116,9 @@ def main(args: Namespace) -> int:
97
116
  shared.loader_context["project_directory"].mkdir(exist_ok=True)
98
117
 
99
118
  # Write configuration to file
100
- for config_name in shared.default_configs.keys():
101
- default_config = copy.deepcopy(shared.default_configs[config_name])
119
+ for config_name in shared.default_configs:
120
+ configuration = shared.default_configs[config_name]
121
+ default_config = copy.deepcopy(configuration["config_data"])
102
122
 
103
123
  config_override: dict = {}
104
124
  match config_name:
@@ -119,14 +139,18 @@ def main(args: Namespace) -> int:
119
139
 
120
140
  config_data = shared.merge_dict(default_config, config_override)
121
141
  try:
122
- config.generate_config(config_name, config_data)
142
+ config.write_config(
143
+ config_name, configuration["format_version"], config_data
144
+ )
123
145
  except FileExistsError:
124
- log.debug(f"Configuration file {config_name} already exists")
146
+ if is_first_initialize:
147
+ log.debug(f"Configuration file {config_name} already exists")
148
+ else:
149
+ log.info(
150
+ f"Configuration for '{config_name}' already exist, skipping..."
151
+ )
125
152
 
126
- if is_first_initialize:
127
- set_metadata(__version__)
128
- log.info("Initialized server configurations.")
129
- else:
130
- log.info("Reinitialized server configurations.")
153
+ set_metadata(__version__)
154
+ log.info("Initialized server configurations.")
131
155
 
132
156
  return 0
@@ -1,7 +1,7 @@
1
1
  from argparse import Namespace
2
2
 
3
3
 
4
- def main(args: Namespace) -> int:
4
+ def run(args: Namespace) -> int:
5
5
  import logging as log
6
6
 
7
7
  log.error("Command is not implemented yet.")
@@ -1,7 +1,7 @@
1
1
  from argparse import Namespace
2
2
 
3
3
 
4
- def main(args: Namespace) -> int:
4
+ def run(args: Namespace) -> int:
5
5
  players: list[str] = args.players
6
6
  import logging as log
7
7
 
@@ -1,7 +1,7 @@
1
1
  from argparse import Namespace
2
2
 
3
3
 
4
- def main(args: Namespace) -> int:
4
+ def run(args: Namespace) -> int:
5
5
  import logging as log
6
6
 
7
7
  from ..server_files import ops
@@ -1,7 +1,7 @@
1
1
  from argparse import Namespace
2
2
 
3
3
 
4
- def main(args: Namespace) -> int:
4
+ def run(args: Namespace) -> int:
5
5
  players: list[str] = args.players
6
6
  import logging as log
7
7
 
@@ -1,7 +1,7 @@
1
1
  import argparse
2
2
 
3
3
 
4
- def main(args: argparse.Namespace) -> int:
4
+ def run(args: argparse.Namespace) -> int:
5
5
  parser: argparse.ArgumentParser = args.parser
6
6
  parser.print_help()
7
7
  return 0
@@ -1,7 +1,7 @@
1
1
  from argparse import Namespace
2
2
 
3
3
 
4
- def main(args: Namespace) -> int:
4
+ def run(args: Namespace) -> int:
5
5
  import logging as log
6
6
 
7
7
  log.error("Command is not implemented yet.")