mcserver-cli 4.3.0__py3-none-any.whl → 4.4.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.
- mcserver/__init__.py +1 -1
- mcserver/cli.py +16 -2
- mcserver/commands/op_list.py +20 -17
- mcserver/commands/op_revoke.py +38 -4
- mcserver/commands/whitelist_list.py +11 -11
- mcserver/commands/whitelist_remove.py +6 -4
- mcserver/server_files/ops.py +87 -116
- mcserver/server_files/paths.py +1 -0
- mcserver/server_files/whitelist.py +35 -71
- {mcserver_cli-4.3.0.dist-info → mcserver_cli-4.4.0.dist-info}/METADATA +14 -7
- {mcserver_cli-4.3.0.dist-info → mcserver_cli-4.4.0.dist-info}/RECORD +14 -14
- {mcserver_cli-4.3.0.dist-info → mcserver_cli-4.4.0.dist-info}/WHEEL +0 -0
- {mcserver_cli-4.3.0.dist-info → mcserver_cli-4.4.0.dist-info}/entry_points.txt +0 -0
- {mcserver_cli-4.3.0.dist-info → mcserver_cli-4.4.0.dist-info}/licenses/LICENSE +0 -0
mcserver/__init__.py
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
__version__ = "4.
|
|
1
|
+
__version__ = "4.4.0"
|
mcserver/cli.py
CHANGED
|
@@ -224,6 +224,18 @@ def main() -> int:
|
|
|
224
224
|
|
|
225
225
|
op_list_command.set_defaults(command_name="op_list")
|
|
226
226
|
|
|
227
|
+
# 'op revoke'
|
|
228
|
+
op_revoke_command = op_subcommands.add_parser(
|
|
229
|
+
"revoke",
|
|
230
|
+
help="Revoke operator players permission",
|
|
231
|
+
description="Revoke operator players permission.",
|
|
232
|
+
)
|
|
233
|
+
|
|
234
|
+
op_revoke_command.set_defaults(command_name="op_revoke")
|
|
235
|
+
op_revoke_command.add_argument(
|
|
236
|
+
"players", nargs="+", type=str, help="List of player names or UUIDs"
|
|
237
|
+
)
|
|
238
|
+
|
|
227
239
|
# 'search' command
|
|
228
240
|
search_command = commands.add_parser(
|
|
229
241
|
"search",
|
|
@@ -336,11 +348,13 @@ def main() -> int:
|
|
|
336
348
|
whitelist_remove_command = whitelist_subcommands.add_parser(
|
|
337
349
|
"remove",
|
|
338
350
|
help="Remove players from the whitelist",
|
|
339
|
-
description="
|
|
351
|
+
description="Remove players from the whitelist.",
|
|
340
352
|
)
|
|
341
353
|
|
|
342
354
|
whitelist_remove_command.set_defaults(command_name="whitelist_remove")
|
|
343
|
-
whitelist_remove_command.add_argument(
|
|
355
|
+
whitelist_remove_command.add_argument(
|
|
356
|
+
"players", nargs="+", type=str, help="List of player names or UUIDs"
|
|
357
|
+
)
|
|
344
358
|
|
|
345
359
|
args = parser.parse_args()
|
|
346
360
|
return args.func(args)
|
mcserver/commands/op_list.py
CHANGED
|
@@ -1,32 +1,35 @@
|
|
|
1
|
+
import logging
|
|
1
2
|
from argparse import Namespace
|
|
2
3
|
|
|
4
|
+
from ..server_files import ops
|
|
5
|
+
from ..shared import pluralize
|
|
3
6
|
|
|
4
|
-
|
|
5
|
-
import logging as log
|
|
7
|
+
logger = logging.getLogger(__name__)
|
|
6
8
|
|
|
7
|
-
from ..server_files import ops
|
|
8
|
-
from ..shared import pluralize
|
|
9
9
|
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
def run(args: Namespace) -> int:
|
|
11
|
+
ops_file = ops.ops_file_path
|
|
12
|
+
if not ops_file.exists():
|
|
13
|
+
logger.error(f"Operator file '{ops.ops_file_path}' not found.")
|
|
12
14
|
return 1
|
|
13
15
|
|
|
14
16
|
operator_players = ops.list_players()
|
|
15
17
|
|
|
16
|
-
|
|
18
|
+
player_count = len(operator_players)
|
|
19
|
+
if player_count == 0:
|
|
20
|
+
logger.info("There's no operator player.")
|
|
21
|
+
return 0
|
|
22
|
+
|
|
23
|
+
player_list: list[str] = []
|
|
17
24
|
for player in operator_players:
|
|
18
|
-
|
|
25
|
+
player_list.append(
|
|
19
26
|
f"{player['player_name']} ({player['player_uuid']}) Level: {player['permission_level']}"
|
|
20
27
|
)
|
|
21
28
|
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
player_count = len(operator_players)
|
|
26
|
-
if player_count == 0:
|
|
27
|
-
log.info("There's no operator player.")
|
|
28
|
-
return 0
|
|
29
|
+
logger.info(
|
|
30
|
+
f"There {pluralize('is', player_count)} {player_count} {pluralize('operator', player_count)}:"
|
|
31
|
+
)
|
|
29
32
|
|
|
30
|
-
|
|
31
|
-
print(
|
|
33
|
+
player_list.sort()
|
|
34
|
+
print("\n".join(player_list))
|
|
32
35
|
return 0
|
mcserver/commands/op_revoke.py
CHANGED
|
@@ -1,9 +1,43 @@
|
|
|
1
|
+
import logging
|
|
1
2
|
from argparse import Namespace
|
|
3
|
+
from uuid import UUID
|
|
4
|
+
|
|
5
|
+
from ..server_files import ops
|
|
6
|
+
from ..shared import pluralize
|
|
7
|
+
|
|
8
|
+
logger = logging.getLogger(__name__)
|
|
2
9
|
|
|
3
10
|
|
|
4
11
|
def run(args: Namespace) -> int:
|
|
5
|
-
|
|
6
|
-
|
|
12
|
+
player_identifiers: list[str] = args.players
|
|
13
|
+
|
|
14
|
+
player_uuids: list[UUID] = []
|
|
15
|
+
player_names: list[str] = []
|
|
16
|
+
for player in player_identifiers:
|
|
17
|
+
if len(player) > 16:
|
|
18
|
+
logger.debug(f"{player} is probably an UUID")
|
|
19
|
+
player_uuids.append(UUID(player))
|
|
20
|
+
else:
|
|
21
|
+
logger.debug(f"{player} is probably a name")
|
|
22
|
+
player_names.append(player)
|
|
23
|
+
|
|
24
|
+
removed_players = ops.remove_players(player_uuids, player_names)
|
|
25
|
+
|
|
26
|
+
player_count: int = len(removed_players)
|
|
27
|
+
if player_count == 0:
|
|
28
|
+
logger.info("No matching player found.")
|
|
29
|
+
return 0
|
|
30
|
+
|
|
31
|
+
player_list: list[str] = []
|
|
32
|
+
for player in removed_players:
|
|
33
|
+
player_list.append(
|
|
34
|
+
f"{player['player_name']} ({player['player_uuid']}) Level: {player['permission_level']}"
|
|
35
|
+
)
|
|
36
|
+
|
|
37
|
+
logger.info(
|
|
38
|
+
f"There {pluralize('is', player_count)} {player_count} operator {pluralize('player', player_count)} that {pluralize('is', player_count)} removed:"
|
|
39
|
+
)
|
|
7
40
|
|
|
8
|
-
|
|
9
|
-
|
|
41
|
+
player_list.sort()
|
|
42
|
+
print("\n".join(player_list))
|
|
43
|
+
return 0
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import argparse
|
|
2
1
|
import logging
|
|
2
|
+
from argparse import Namespace
|
|
3
3
|
|
|
4
4
|
from ..server_files import whitelist
|
|
5
5
|
from ..shared import pluralize
|
|
@@ -7,26 +7,26 @@ from ..shared import pluralize
|
|
|
7
7
|
logger = logging.getLogger(__name__)
|
|
8
8
|
|
|
9
9
|
|
|
10
|
-
def run(args:
|
|
10
|
+
def run(args: Namespace) -> int:
|
|
11
11
|
whitelist_file = whitelist.whitelist_file_path
|
|
12
12
|
if not whitelist_file.exists():
|
|
13
|
-
logger.error(f"Whitelist file ({whitelist_file})
|
|
13
|
+
logger.error(f"Whitelist file ({whitelist_file}) not found!")
|
|
14
14
|
return 1
|
|
15
15
|
|
|
16
16
|
whitelisted_players = whitelist.list_players()
|
|
17
17
|
|
|
18
|
+
player_count: int = len(whitelisted_players)
|
|
19
|
+
if player_count == 0:
|
|
20
|
+
logger.info("There are no whitelisted player.")
|
|
21
|
+
return 0
|
|
22
|
+
|
|
18
23
|
player_list: list[str] = []
|
|
19
24
|
for player in whitelisted_players:
|
|
20
25
|
player_list.append(f"{player['player_name']} ({player['player_uuid']})")
|
|
21
26
|
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
return 0
|
|
26
|
-
else:
|
|
27
|
-
logger.info(
|
|
28
|
-
f"There {pluralize('is', player_count)} whitelisted {pluralize('player', player_count)}:"
|
|
29
|
-
)
|
|
27
|
+
logger.info(
|
|
28
|
+
f"There {pluralize('is', player_count)} {player_count} whitelisted {pluralize('player', player_count)}:"
|
|
29
|
+
)
|
|
30
30
|
|
|
31
31
|
player_list.sort()
|
|
32
32
|
print("\n".join(player_list))
|
|
@@ -1,20 +1,22 @@
|
|
|
1
|
-
import argparse
|
|
2
1
|
import logging
|
|
2
|
+
from argparse import Namespace
|
|
3
|
+
from uuid import UUID
|
|
3
4
|
|
|
4
5
|
from ..server_files import whitelist
|
|
5
6
|
from ..shared import pluralize
|
|
6
7
|
|
|
7
8
|
logger = logging.getLogger(__name__)
|
|
8
9
|
|
|
9
|
-
|
|
10
|
+
|
|
11
|
+
def run(args: Namespace) -> int:
|
|
10
12
|
player_identifiers: list[str] = args.players
|
|
11
13
|
|
|
12
|
-
player_uuids: list[
|
|
14
|
+
player_uuids: list[UUID] = []
|
|
13
15
|
player_names: list[str] = []
|
|
14
16
|
for player in player_identifiers:
|
|
15
17
|
if len(player) > 16:
|
|
16
18
|
logger.debug(f"{player} is probably an UUID")
|
|
17
|
-
player_uuids.append(player)
|
|
19
|
+
player_uuids.append(UUID(player))
|
|
18
20
|
else:
|
|
19
21
|
logger.debug(f"{player} is probably a name")
|
|
20
22
|
player_names.append(player)
|
mcserver/server_files/ops.py
CHANGED
|
@@ -1,141 +1,112 @@
|
|
|
1
|
-
# Modules
|
|
2
|
-
# Standard
|
|
3
1
|
import json
|
|
4
|
-
|
|
5
|
-
from
|
|
2
|
+
import logging
|
|
3
|
+
from collections.abc import Sequence
|
|
4
|
+
from typing import TypedDict
|
|
6
5
|
from uuid import UUID
|
|
7
6
|
|
|
8
|
-
|
|
9
|
-
from
|
|
10
|
-
PlayerID,
|
|
11
|
-
PlayerUUID,
|
|
12
|
-
normalize_player_uuid,
|
|
13
|
-
)
|
|
7
|
+
from ..minecraft.player_identity import normalize_player_uuid
|
|
8
|
+
from .paths import ops_file_path
|
|
14
9
|
|
|
15
|
-
|
|
16
|
-
ops_file = Path("ops.json")
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
# TypedDicts
|
|
20
|
-
class OperatorEntry(TypedDict):
|
|
21
|
-
uuid: str
|
|
22
|
-
name: str
|
|
23
|
-
level: Literal[0, 1, 2, 3, 4]
|
|
24
|
-
bypassesPlayerLimit: bool
|
|
10
|
+
logger = logging.getLogger(__name__)
|
|
25
11
|
|
|
26
12
|
|
|
27
13
|
class OperatorPlayer(TypedDict):
|
|
28
|
-
player_uuid:
|
|
14
|
+
player_uuid: UUID
|
|
29
15
|
player_name: str
|
|
30
|
-
permission_level:
|
|
16
|
+
permission_level: int
|
|
31
17
|
bypasses_player_limit: bool
|
|
32
18
|
|
|
33
19
|
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
permission_level: Literal[0, 1, 2, 3, 4],
|
|
40
|
-
bypasses_player_limit: bool = False,
|
|
41
|
-
) -> None:
|
|
42
|
-
operator_player: OperatorPlayer = {
|
|
43
|
-
"player_uuid": player_uuid,
|
|
44
|
-
"player_name": player_name,
|
|
45
|
-
"permission_level": permission_level,
|
|
46
|
-
"bypasses_player_limit": bypasses_player_limit,
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
add_players(operator_player)
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
def add_players(operator_players: list[OperatorPlayer] | OperatorPlayer) -> None:
|
|
53
|
-
if not isinstance(operator_players, list):
|
|
54
|
-
operator_players = [operator_players]
|
|
55
|
-
|
|
56
|
-
with open(ops_file, mode="r+") as file:
|
|
57
|
-
ops_data: list[OperatorEntry] = json.load(file)
|
|
58
|
-
|
|
59
|
-
for player in operator_players:
|
|
60
|
-
permission_level = player["permission_level"]
|
|
61
|
-
if permission_level < 0 or permission_level > 4:
|
|
62
|
-
raise ValueError("Permission level must be between 0 and 4.")
|
|
63
|
-
|
|
64
|
-
operator_entry: OperatorEntry = {
|
|
65
|
-
"uuid": str(normalize_player_uuid(player["player_uuid"])),
|
|
66
|
-
"name": player["player_name"],
|
|
67
|
-
"level": permission_level,
|
|
68
|
-
"bypassesPlayerLimit": player["bypasses_player_limit"],
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
ops_data.append(operator_entry)
|
|
72
|
-
|
|
73
|
-
file.seek(0)
|
|
74
|
-
json.dump(ops_data, file, indent=2)
|
|
75
|
-
file.truncate()
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
# Remove Players
|
|
79
|
-
def remove_player(
|
|
80
|
-
player_uuid: PlayerUUID | None = None, player_name: str | None = None
|
|
81
|
-
) -> None:
|
|
82
|
-
if player_uuid is None and player_name is None:
|
|
83
|
-
raise ValueError(
|
|
84
|
-
"At least one of 'player_uuid' or 'player_name' must be provided"
|
|
85
|
-
)
|
|
86
|
-
|
|
87
|
-
player_id: PlayerID = {}
|
|
88
|
-
if player_uuid is not None:
|
|
89
|
-
player_id["player_uuid"] = normalize_player_uuid(player_uuid)
|
|
90
|
-
|
|
91
|
-
if player_name is not None:
|
|
92
|
-
player_id["player_name"] = player_name
|
|
93
|
-
|
|
94
|
-
remove_players(player_id)
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
def remove_players(player_ids: list[PlayerID] | PlayerID) -> None:
|
|
98
|
-
if not isinstance(player_ids, list):
|
|
99
|
-
player_ids = [player_ids]
|
|
100
|
-
|
|
101
|
-
player_uuids: set[PlayerUUID | None] = set()
|
|
102
|
-
player_names: set[str | None] = set()
|
|
103
|
-
|
|
104
|
-
for player_id in player_ids:
|
|
105
|
-
if "player_uuid" in player_id:
|
|
106
|
-
player_uuids.add(player_id["player_uuid"])
|
|
107
|
-
|
|
108
|
-
if "player_name" in player_id:
|
|
109
|
-
player_names.add(player_id["player_name"])
|
|
20
|
+
class OperatorFilePlayer(TypedDict):
|
|
21
|
+
uuid: str
|
|
22
|
+
name: str
|
|
23
|
+
level: int
|
|
24
|
+
bypassesPlayerLimit: bool
|
|
110
25
|
|
|
111
|
-
with open(ops_file, mode="r+") as file:
|
|
112
|
-
ops_data: list[OperatorEntry] = json.load(file)
|
|
113
26
|
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
27
|
+
def remove_players(
|
|
28
|
+
player_uuids: Sequence[UUID | str] | UUID | str | None = None,
|
|
29
|
+
player_names: list[str] | str | None = None,
|
|
30
|
+
) -> list[OperatorPlayer]:
|
|
31
|
+
"""Remove operator players that matches either by UUIDs or names
|
|
32
|
+
|
|
33
|
+
Args:
|
|
34
|
+
player_uuids: List of player UUIDs to be removed
|
|
35
|
+
player_names: List of player names to be removed
|
|
36
|
+
|
|
37
|
+
Raises:
|
|
38
|
+
ValueError: Must provide at least a player UUID or player name
|
|
39
|
+
|
|
40
|
+
Returns:
|
|
41
|
+
List of operator players that are removed"""
|
|
42
|
+
if player_uuids is None:
|
|
43
|
+
player_uuids = []
|
|
44
|
+
elif isinstance(player_uuids, (UUID, str)):
|
|
45
|
+
player_uuids = [player_uuids]
|
|
46
|
+
|
|
47
|
+
if player_names is None:
|
|
48
|
+
player_names = []
|
|
49
|
+
elif isinstance(player_names, str):
|
|
50
|
+
player_names = [player_names]
|
|
51
|
+
|
|
52
|
+
if not player_uuids and not player_names:
|
|
53
|
+
raise ValueError("Must provide at least a player UUID or player name")
|
|
54
|
+
|
|
55
|
+
names: set[str] = set(player_names)
|
|
56
|
+
|
|
57
|
+
uuids: set[UUID] = set()
|
|
58
|
+
for player_uuid in player_uuids:
|
|
59
|
+
uuids.add(normalize_player_uuid(player_uuid))
|
|
60
|
+
|
|
61
|
+
removed_players: list[OperatorPlayer] = []
|
|
62
|
+
with open(ops_file_path, mode="r+") as ops_file:
|
|
63
|
+
ops_data: list[OperatorFilePlayer] = json.load(ops_file)
|
|
64
|
+
|
|
65
|
+
new_ops_data: list[OperatorFilePlayer] = []
|
|
66
|
+
for operator_file_player in ops_data:
|
|
67
|
+
if (
|
|
68
|
+
UUID(operator_file_player["uuid"]) in uuids
|
|
69
|
+
or operator_file_player["name"] in names
|
|
70
|
+
):
|
|
71
|
+
logger.debug(
|
|
72
|
+
f"Operator player {operator_file_player['name']} ({operator_file_player['uuid']}) is removed"
|
|
73
|
+
)
|
|
74
|
+
operator_player: OperatorPlayer = {
|
|
75
|
+
"player_uuid": UUID(operator_file_player["uuid"]),
|
|
76
|
+
"player_name": operator_file_player["name"],
|
|
77
|
+
"permission_level": operator_file_player["level"],
|
|
78
|
+
"bypasses_player_limit": operator_file_player[
|
|
79
|
+
"bypassesPlayerLimit"
|
|
80
|
+
],
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
removed_players.append(operator_player)
|
|
117
84
|
continue
|
|
118
85
|
|
|
119
|
-
new_ops_data.append(
|
|
86
|
+
new_ops_data.append(operator_file_player)
|
|
120
87
|
|
|
121
|
-
|
|
122
|
-
json.dump(new_ops_data,
|
|
123
|
-
|
|
88
|
+
ops_file.seek(0)
|
|
89
|
+
json.dump(new_ops_data, ops_file, indent=2)
|
|
90
|
+
ops_file.truncate()
|
|
124
91
|
|
|
92
|
+
return removed_players
|
|
125
93
|
|
|
126
|
-
# TODO: add 'update_player' and 'update_players', just use plain dict.update() because it has no depth
|
|
127
94
|
|
|
128
|
-
|
|
129
|
-
# List Players
|
|
130
95
|
def list_players() -> list[OperatorPlayer]:
|
|
131
|
-
|
|
96
|
+
"""List all operator players
|
|
97
|
+
|
|
98
|
+
Returns:
|
|
99
|
+
List of operator players"""
|
|
100
|
+
logger.debug(f"Reading {ops_file_path}")
|
|
101
|
+
ops_json: list[OperatorFilePlayer] = json.loads(ops_file_path.read_text())
|
|
102
|
+
|
|
132
103
|
operator_players: list[OperatorPlayer] = []
|
|
133
|
-
for
|
|
104
|
+
for player in ops_json:
|
|
134
105
|
operator_player: OperatorPlayer = {
|
|
135
|
-
"player_uuid": UUID(
|
|
136
|
-
"player_name":
|
|
137
|
-
"permission_level":
|
|
138
|
-
"bypasses_player_limit":
|
|
106
|
+
"player_uuid": UUID(player["uuid"]),
|
|
107
|
+
"player_name": player["name"],
|
|
108
|
+
"permission_level": player["level"],
|
|
109
|
+
"bypasses_player_limit": player["bypassesPlayerLimit"],
|
|
139
110
|
}
|
|
140
111
|
|
|
141
112
|
operator_players.append(operator_player)
|
mcserver/server_files/paths.py
CHANGED
|
@@ -1,15 +1,17 @@
|
|
|
1
1
|
import json
|
|
2
2
|
import logging
|
|
3
|
+
from collections.abc import Sequence
|
|
3
4
|
from typing import TypedDict
|
|
5
|
+
from uuid import UUID
|
|
4
6
|
|
|
5
|
-
from ..minecraft.player_identity import
|
|
7
|
+
from ..minecraft.player_identity import normalize_player_uuid
|
|
6
8
|
from .paths import whitelist_file_path
|
|
7
9
|
|
|
8
10
|
logger = logging.getLogger(__name__)
|
|
9
11
|
|
|
10
12
|
|
|
11
13
|
class WhitelistedPlayer(TypedDict):
|
|
12
|
-
player_uuid:
|
|
14
|
+
player_uuid: UUID
|
|
13
15
|
player_name: str
|
|
14
16
|
|
|
15
17
|
|
|
@@ -17,54 +19,64 @@ class WhitelistedFilePlayer(TypedDict):
|
|
|
17
19
|
uuid: str
|
|
18
20
|
name: str
|
|
19
21
|
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
22
|
+
|
|
23
|
+
def remove_players(
|
|
24
|
+
player_uuids: Sequence[UUID | str] | UUID | str | None = None,
|
|
25
|
+
player_names: list[str] | str | None = None,
|
|
26
|
+
) -> list[WhitelistedPlayer]:
|
|
27
|
+
"""Remove players from the whitelist that matches either by UUIDs or names
|
|
28
|
+
|
|
23
29
|
Args:
|
|
24
30
|
player_uuids: List of player UUIDs to be removed
|
|
25
31
|
player_names: List of player names to be removed
|
|
26
|
-
|
|
32
|
+
|
|
27
33
|
Raises:
|
|
28
34
|
ValueError: Must provide at least a player UUID or player name
|
|
29
|
-
|
|
35
|
+
|
|
30
36
|
Returns:
|
|
31
37
|
List of whitelisted players that are removed"""
|
|
32
38
|
if player_uuids is None:
|
|
33
39
|
player_uuids = []
|
|
34
|
-
|
|
35
|
-
if player_names is None:
|
|
36
|
-
player_names = []
|
|
37
|
-
|
|
38
|
-
if isinstance(player_uuids, str):
|
|
40
|
+
elif isinstance(player_uuids, (UUID, str)):
|
|
39
41
|
player_uuids = [player_uuids]
|
|
40
42
|
|
|
41
|
-
if
|
|
43
|
+
if player_names is None:
|
|
44
|
+
player_names = []
|
|
45
|
+
elif isinstance(player_names, str):
|
|
42
46
|
player_names = [player_names]
|
|
43
47
|
|
|
44
48
|
if not player_uuids and not player_names:
|
|
45
49
|
raise ValueError("Must provide at least a player UUID or player name")
|
|
46
50
|
|
|
47
|
-
uuids: set[str] = set(player_uuids)
|
|
48
51
|
names: set[str] = set(player_names)
|
|
49
52
|
|
|
53
|
+
uuids: set[UUID] = set()
|
|
54
|
+
for player_uuid in player_uuids:
|
|
55
|
+
uuids.add(normalize_player_uuid(player_uuid))
|
|
56
|
+
|
|
50
57
|
removed_players: list[WhitelistedPlayer] = []
|
|
51
58
|
with open(whitelist_file_path, mode="r+") as whitelist_file:
|
|
52
59
|
whitelist_data: list[WhitelistedFilePlayer] = json.load(whitelist_file)
|
|
53
60
|
|
|
54
61
|
new_whitelist_data: list[WhitelistedFilePlayer] = []
|
|
55
62
|
for whitelisted_file_player in whitelist_data:
|
|
56
|
-
if
|
|
57
|
-
|
|
63
|
+
if (
|
|
64
|
+
UUID(whitelisted_file_player["uuid"]) in uuids
|
|
65
|
+
or whitelisted_file_player["name"] in names
|
|
66
|
+
):
|
|
67
|
+
logger.debug(
|
|
68
|
+
f"Whitelisted player {whitelisted_file_player['name']} ({whitelisted_file_player['uuid']}) is removed"
|
|
69
|
+
)
|
|
58
70
|
whitelisted_player: WhitelistedPlayer = {
|
|
59
|
-
"player_uuid": whitelisted_file_player["uuid"],
|
|
60
|
-
"player_name": whitelisted_file_player["name"]
|
|
71
|
+
"player_uuid": UUID(whitelisted_file_player["uuid"]),
|
|
72
|
+
"player_name": whitelisted_file_player["name"],
|
|
61
73
|
}
|
|
62
74
|
|
|
63
75
|
removed_players.append(whitelisted_player)
|
|
64
76
|
continue
|
|
65
77
|
|
|
66
78
|
new_whitelist_data.append(whitelisted_file_player)
|
|
67
|
-
|
|
79
|
+
|
|
68
80
|
whitelist_file.seek(0)
|
|
69
81
|
json.dump(new_whitelist_data, whitelist_file, indent=2)
|
|
70
82
|
whitelist_file.truncate()
|
|
@@ -72,64 +84,16 @@ def remove_players(player_uuids: list[str] | str | None = None, player_names: li
|
|
|
72
84
|
return removed_players
|
|
73
85
|
|
|
74
86
|
|
|
75
|
-
|
|
76
|
-
# def remove_players(player_ids: list[PlayerID] | PlayerID) -> None:
|
|
77
|
-
# """Remove player entries matching the exact UUIDs or names
|
|
78
|
-
|
|
79
|
-
# Args:
|
|
80
|
-
# player_ids: Player UUIDs and/or names object
|
|
81
|
-
|
|
82
|
-
# Returns:
|
|
83
|
-
# None: Returns nothing
|
|
84
|
-
|
|
85
|
-
# Raises:
|
|
86
|
-
# FileNotFoundError: The 'whitelist.json' file not found
|
|
87
|
-
# """
|
|
88
|
-
# if not isinstance(player_ids, list):
|
|
89
|
-
# player_ids = [player_ids]
|
|
90
|
-
|
|
91
|
-
# player_uuids: set[PlayerUUID | None] = set()
|
|
92
|
-
# player_names: set[str | None] = set()
|
|
93
|
-
# for player_id in player_ids:
|
|
94
|
-
# if "player_uuid" in player_id:
|
|
95
|
-
# player_uuids.add(player_id["player_uuid"])
|
|
96
|
-
|
|
97
|
-
# if "player_name" in player_id:
|
|
98
|
-
# player_names.add(player_id["player_name"])
|
|
99
|
-
|
|
100
|
-
# if not whitelist_file.exists():
|
|
101
|
-
# raise FileNotFoundError(f"File '{whitelist_file}' is not found.")
|
|
102
|
-
|
|
103
|
-
# with open(whitelist_file, mode="r+") as file:
|
|
104
|
-
# whitelist_data: list[WhitelistFileEntry] = json.load(file)
|
|
105
|
-
# new_whitelist_data: list[WhitelistFileEntry] = []
|
|
106
|
-
# for player in whitelist_data:
|
|
107
|
-
# player_uuid = player["uuid"]
|
|
108
|
-
# player_name = player["name"]
|
|
109
|
-
|
|
110
|
-
# if player_uuid in player_uuids or player_name in player_names:
|
|
111
|
-
# log.debug(
|
|
112
|
-
# f"Removed player '{player_name}' ({player_uuid}) from the whitelisted player list"
|
|
113
|
-
# )
|
|
114
|
-
# continue
|
|
115
|
-
|
|
116
|
-
# new_whitelist_data.append(player)
|
|
117
|
-
|
|
118
|
-
# file.seek(0)
|
|
119
|
-
# json.dump(new_whitelist_data, file, indent=2)
|
|
120
|
-
# file.truncate()
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
87
|
def list_players() -> list[WhitelistedPlayer]:
|
|
125
88
|
logger.debug(f"Reading whitelist file {whitelist_file_path}")
|
|
126
|
-
|
|
127
|
-
|
|
89
|
+
whitelist_data: list[WhitelistedFilePlayer] = json.loads(
|
|
90
|
+
whitelist_file_path.read_text()
|
|
91
|
+
)
|
|
128
92
|
|
|
129
93
|
whitelisted_players: list[WhitelistedPlayer] = []
|
|
130
94
|
for player in whitelist_data:
|
|
131
95
|
whitelisted_player: WhitelistedPlayer = {
|
|
132
|
-
"player_uuid": player["uuid"],
|
|
96
|
+
"player_uuid": UUID(player["uuid"]),
|
|
133
97
|
"player_name": player["name"],
|
|
134
98
|
}
|
|
135
99
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.5
|
|
2
2
|
Name: mcserver-cli
|
|
3
|
-
Version: 4.
|
|
3
|
+
Version: 4.4.0
|
|
4
4
|
Summary: A CLI tool to manage Minecraft: Java Edition servers.
|
|
5
5
|
Project-URL: Homepage, https://github.com/Othecat35/MCServer
|
|
6
6
|
Project-URL: Repository, https://github.com/Othecat35/MCServer.git
|
|
@@ -25,8 +25,7 @@ Supported platforms:
|
|
|
25
25
|
- JRE (depends on Minecraft version)
|
|
26
26
|
|
|
27
27
|
## How to install
|
|
28
|
-
- Using pip:
|
|
29
|
-
1. Run `pip install mcserver-cli`
|
|
28
|
+
- Using pip: Run `pip install mcserver-cli`
|
|
30
29
|
|
|
31
30
|
- System-wide (Requires root):
|
|
32
31
|
1. Download the `mcserver` script file from GitHub releases
|
|
@@ -44,28 +43,36 @@ Supported platforms:
|
|
|
44
43
|
## Usage
|
|
45
44
|
- Initialize a server: `mcserver init [options]`
|
|
46
45
|
- List operator players: `mcserver op list`
|
|
46
|
+
- Revoke operator players: `mcserver op revoke <players>`
|
|
47
|
+
- Search projects: `mcserver search [query] [options]`
|
|
47
48
|
- Show information about projects: `mcserver show <projects>`
|
|
48
49
|
- Start the server: `mcserver start`
|
|
49
|
-
- Stop the server: `mcserver stop
|
|
50
|
+
- Stop the server: `mcserver stop`
|
|
50
51
|
- List whitelisted players: `mcserver whitelist list`
|
|
52
|
+
- Remove whitelisted players: `mcserver whitelist remove <players>`
|
|
51
53
|
|
|
52
|
-
###
|
|
54
|
+
### Examples
|
|
53
55
|
- Create and start a Fabric 1.20.1 server on current directory
|
|
54
56
|
```bash
|
|
55
57
|
mcserver init --game-version=1.20.1 --loader=fabric
|
|
56
58
|
mcserver start
|
|
57
59
|
```
|
|
58
60
|
|
|
61
|
+
- Search top 50 Fabric mods for Minecraft 1.20.1 in modrinth
|
|
62
|
+
```bash
|
|
63
|
+
mcserver search --loader=fabric --game-version=1.20.1 --limit=50
|
|
64
|
+
```
|
|
65
|
+
|
|
59
66
|
- List all operator and whitelisted players on current directory
|
|
60
67
|
```bash
|
|
61
68
|
mcserver op list
|
|
62
69
|
mcserver whitelist list
|
|
63
70
|
```
|
|
64
71
|
|
|
65
|
-
- Stop
|
|
72
|
+
- Stop a server on current directory with sigterm
|
|
66
73
|
```bash
|
|
67
74
|
mcserver stop
|
|
68
75
|
```
|
|
69
76
|
|
|
70
77
|
## Note
|
|
71
|
-
This is a **Personal Project
|
|
78
|
+
This is a **Personal Project** by Othecat35, so don't expect much from me :>
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
mcserver/__init__.py,sha256=
|
|
1
|
+
mcserver/__init__.py,sha256=ZMEVsrDCFAaWRcxycPFTA5eXcNSdnxmLtUHTvt__4Tg,22
|
|
2
2
|
mcserver/__main__.py,sha256=3-WYJCtLQ8TbzmLMYBiAsm9PC89DwjXc6s_J-izMEz8,30
|
|
3
3
|
mcserver/app.py,sha256=giOF7rFvz9V1RG975l_nvFBMKebvzRsTUyq7wbz7HNU,777
|
|
4
4
|
mcserver/caching.py,sha256=oLIQuiBqlJLxSTCVyrtHoYEZvmtnb3duxhhE-P5bOR8,411
|
|
5
|
-
mcserver/cli.py,sha256=
|
|
5
|
+
mcserver/cli.py,sha256=cYqE5gnGwsnoNfxfAA2uy-aDie-Qnb90qK7ID3gHbFI,10221
|
|
6
6
|
mcserver/config.py,sha256=JlIATmTETwVTmXzrmONDBbYddj_aB4hcn8zYu5CQHTQ,2136
|
|
7
7
|
mcserver/constants.py,sha256=ME5f4dv1PbqyQ6G1lQkKtvHQ4b722De4xu5B5Vp1Hw8,480
|
|
8
8
|
mcserver/metadata.py,sha256=sPstt7jrtPh1_kthje-loQ6UYB2c5m496IOJFYeGxjI,977
|
|
@@ -18,8 +18,8 @@ mcserver/commands/import_setup.py,sha256=NbByM4seH0dAYo2QEj37VsL_J_Mtvg0S7NTsTFb
|
|
|
18
18
|
mcserver/commands/initialize_server.py,sha256=sjNRNot01joQrC7wp064h-rIkMSxfs229Dhj5Xfh0Is,5739
|
|
19
19
|
mcserver/commands/list_projects.py,sha256=XG7U6oMVxQrTuV_GFCsp5aYZJphjyYwFDZiiURnjzNw,155
|
|
20
20
|
mcserver/commands/op_grant.py,sha256=eWiNmnGfCNAIXCHFcsbnbYdtwJKbHv-Xd2uOUNpyg8w,193
|
|
21
|
-
mcserver/commands/op_list.py,sha256=
|
|
22
|
-
mcserver/commands/op_revoke.py,sha256=
|
|
21
|
+
mcserver/commands/op_list.py,sha256=HXzqVwSIcfbKH2NQQdSmst_SXIYt3WT4r4Qkj7xxrNc,919
|
|
22
|
+
mcserver/commands/op_revoke.py,sha256=xQIqTX__X901fKaU2j-UwBm-ZiO0sgUOE0Cm4xvoGnU,1268
|
|
23
23
|
mcserver/commands/print_help.py,sha256=aOb20JvvfEteXDI9Q8fd-2vNCRXgxP6rFGLXfSGeP_Q,147
|
|
24
24
|
mcserver/commands/remove_projects.py,sha256=XG7U6oMVxQrTuV_GFCsp5aYZJphjyYwFDZiiURnjzNw,155
|
|
25
25
|
mcserver/commands/search_projects.py,sha256=rNNejVL5o00m6CzTO36acKdJeoKFZ8anYAHIM9VQsFc,6248
|
|
@@ -29,8 +29,8 @@ mcserver/commands/start_server.py,sha256=Sbu6JQ2gP0G7Taxz_rTw1FwQ2IT71Hx36_gq3ta
|
|
|
29
29
|
mcserver/commands/stop_server.py,sha256=l3-OiInwPlj1ApWQ8ZTqBsMKmkAPCh1MAjoqYLnHnO4,555
|
|
30
30
|
mcserver/commands/update_projects.py,sha256=XG7U6oMVxQrTuV_GFCsp5aYZJphjyYwFDZiiURnjzNw,155
|
|
31
31
|
mcserver/commands/whitelist_add.py,sha256=eWiNmnGfCNAIXCHFcsbnbYdtwJKbHv-Xd2uOUNpyg8w,193
|
|
32
|
-
mcserver/commands/whitelist_list.py,sha256=
|
|
33
|
-
mcserver/commands/whitelist_remove.py,sha256=
|
|
32
|
+
mcserver/commands/whitelist_list.py,sha256=OiwFU-J71YGGLOJ4fn_2kn_VtzoVmCjH64e5HBC25p0,924
|
|
33
|
+
mcserver/commands/whitelist_remove.py,sha256=FzhFItzxrHqtnevA7Vboymdck_KDzpz3v7ysY3y458E,1213
|
|
34
34
|
mcserver/fabricmc/meta.py,sha256=aQl_qPKLic0wM-CdhJimLvkP277nunD_kcZQQN0p9So,1113
|
|
35
35
|
mcserver/legacy_fabric/meta.py,sha256=FRrPm4QZq3uuH7zscjyHPs-zoFW7uREIz3iWaX_Tqxs,911
|
|
36
36
|
mcserver/minecraft/api.py,sha256=7twGWNv6UytlzJJ5kSCpVZzkXjBVDxTMY-t3VoKNAzA,2704
|
|
@@ -58,13 +58,13 @@ mcserver/purpurmc/api.py,sha256=aG3roAXMtCG2PMQMHGAM4zlV18Myd-LOW5EHVi8iUvU,2556
|
|
|
58
58
|
mcserver/quiltmc/meta.py,sha256=BVbvGCfQ1_ft9i1KJFSFDnuvFoSoDz2lcWF-nr4nMdI,1385
|
|
59
59
|
mcserver/server_files/banned_ips.py,sha256=3kfG9fck8JLvSnrfWl9eVj-ztClsld3Z9G4RxCyPtUw,3581
|
|
60
60
|
mcserver/server_files/banned_players.py,sha256=qMSuwRdn_PzMCUD9CEOyy3plbfCmf_StauwbrgU5RXI,5050
|
|
61
|
-
mcserver/server_files/ops.py,sha256=
|
|
62
|
-
mcserver/server_files/paths.py,sha256
|
|
61
|
+
mcserver/server_files/ops.py,sha256=xEhbq93RtgiE8nhY8dvycUR9PVlnYaNovG7gLYB75Fg,3502
|
|
62
|
+
mcserver/server_files/paths.py,sha256=-VPGfBHy-c3_5va1yZII8pJ8rdZSAm_KwOjZuLzUq7c,127
|
|
63
63
|
mcserver/server_files/properties.py,sha256=5WPigqET70Xh61NIIP0KRaTyir9qwjpjC-HmkKrB6j4,1119
|
|
64
64
|
mcserver/server_files/usercaches.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
65
|
-
mcserver/server_files/whitelist.py,sha256=
|
|
66
|
-
mcserver_cli-4.
|
|
67
|
-
mcserver_cli-4.
|
|
68
|
-
mcserver_cli-4.
|
|
69
|
-
mcserver_cli-4.
|
|
70
|
-
mcserver_cli-4.
|
|
65
|
+
mcserver/server_files/whitelist.py,sha256=tlZeZs0Kc0q2Lr4CSg0Rfar7NFQyVug2Llihp6_11TU,3211
|
|
66
|
+
mcserver_cli-4.4.0.dist-info/METADATA,sha256=w8YY-TLYjQMsPph_mpo24uWiXZVnn4__vpZp_faknHg,2365
|
|
67
|
+
mcserver_cli-4.4.0.dist-info/WHEEL,sha256=2iZrJkDIkeDh0k9SikKMqFuRP-ua6mb4Ir1AsER4BEw,87
|
|
68
|
+
mcserver_cli-4.4.0.dist-info/entry_points.txt,sha256=p7uN6UdTzjea7nGIkhjiYDYd7wznkxz9amUPY_fpz24,47
|
|
69
|
+
mcserver_cli-4.4.0.dist-info/licenses/LICENSE,sha256=OzeasqJgwxVpwtMkEYOLoDPUnIDSbVcW62rk-voA3eI,1076
|
|
70
|
+
mcserver_cli-4.4.0.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|