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

mcserver/__init__.py

@@ -1 +1 @@
-__version__ = "4.0.0.dev0"
+__version__ = "4.3.0"

mcserver/cli.py

@@ -1,114 +1,119 @@
-def main() -> int:
-    import argparse
-    import sys
-
-    from . import __version__
-    from .modrinth.shared import search_sort_index
-    from .shared import loader_list
-
-    def bound_int(min_integer: int, max_integer: int | None = None):
-        def parse(cli_string: str):
-            try:
-                integer = int(cli_string)
-            except TypeError:
-                raise argparse.ArgumentTypeError(f"{cli_string} is not an integer")
-
-            if integer <= min_integer:
-                raise argparse.ArgumentTypeError(
-                    f"{integer} must be higher than or equal to {min_integer}"
-                )
-            if max_integer is not None and integer >= max_integer:
-                raise argparse.ArgumentTypeError(
-                    f"{integer} must be between {min_integer} and {max_integer} (inclusive)"
-                )
-            return integer
-
-        return parse
-
-    def command_function(args: argparse.Namespace) -> int:
-        command_name: str = args.command_name
-
-        match command_name:
-            case "add":
-                from .commands import add_projects
-
-                return add_projects(args)
-            case "import":
-                from .commands import import_setup
-
-                return import_setup(args)
-            case "help":
-                from .commands import print_help
-
-                return print_help(args)
-            case "init":
-                from .commands import initialize_server
-
-                return initialize_server(args)
-            case "list":
-                from .commands import list_projects
-
-                return list_projects(args)
-            case "op_grant":
-                from .commands import op_grant
-
-                return op_grant(args)
-            case "op_list":
-                from .commands import op_list
-
-                return op_list(args)
-            case "op_revoke":
-                from .commands import op_revoke
-
-                return op_revoke(args)
-            case "remove":
-                from .commands import remove_projects
-
-                return remove_projects(args)
-            case "search":
-                from .commands import search_projects
-
-                return search_projects(args)
-            case "show":
-                from .commands import show_projects
-
-                return show_projects(args)
-            case "start":
-                from .commands import start_server
-
-                return start_server(args)
-            case "status":
-                from .commands import server_status
-
-                return server_status(args)
-            case "stop":
-                from .commands import stop_server
-
-                return stop_server(args)
-            case "update":
-                from .commands import update_projects
-
-                return update_projects(args)
-            case "whitelist_add":
-                from .commands import whitelist_add
-
-                return whitelist_add(args)
-            case "whitelist_list":
-                from .commands import whitelist_list
-
-                return whitelist_list(args)
-            case "whitelist_remove":
-                from .commands import whitelist_remove
-
-                return whitelist_remove(args)
-            case _:
-                import logging as log
-
-                log.error(f"Unknown command: {command_name}")
-                return 1
+import argparse
+import sys
+from types import FunctionType
 
-    # Parser Setup
+from . import __version__
+from .modrinth.shared import search_sort_index
+from .shared import loader_list
+
+
+def bound_int(min_integer: int, max_integer: int | None = None) -> FunctionType:
+    def parse(cli_string: str) -> int:
+        try:
+            integer = int(cli_string)
+        except ValueError:
+            raise argparse.ArgumentTypeError(f"{cli_string} is not an integer")
+
+        if integer < min_integer:
+            raise argparse.ArgumentTypeError(
+                f"{integer} must be higher than or equal to {min_integer}"
+            )
+        if max_integer is not None and integer > max_integer:
+            raise argparse.ArgumentTypeError(
+                f"{integer} must be between {min_integer} and {max_integer} (inclusive)"
+            )
+        return integer
+
+    return parse
+
+
+def command_function(args: argparse.Namespace) -> int:
+    command_name: str = args.command_name
+
+    match command_name:
+        case "add":
+            from .commands import add_projects
+
+            return add_projects(args)
+        case "import":
+            from .commands import import_setup
+
+            return import_setup(args)
+        case "help":
+            from .commands import print_help
+
+            return print_help(args)
+        case "init":
+            from .commands import initialize_server
+
+            return initialize_server(args)
+        case "list":
+            from .commands import list_projects
+
+            return list_projects(args)
+        case "op_grant":
+            from .commands import op_grant
+
+            return op_grant(args)
+        case "op_list":
+            from .commands import op_list
+
+            return op_list(args)
+        case "op_revoke":
+            from .commands import op_revoke
+
+            return op_revoke(args)
+        case "remove":
+            from .commands import remove_projects
+
+            return remove_projects(args)
+        case "search":
+            from .commands import search_projects
+
+            return search_projects(args)
+        case "show":
+            from .commands import show_projects
+
+            return show_projects(args)
+        case "start":
+            from .commands import start_server
+
+            return start_server(args)
+        case "status":
+            from .commands import server_status
+
+            return server_status(args)
+        case "stop":
+            from .commands import stop_server
+
+            return stop_server(args)
+        case "update":
+            from .commands import update_projects
+
+            return update_projects(args)
+        case "whitelist_add":
+            from .commands import whitelist_add
+
+            return whitelist_add(args)
+        case "whitelist_list":
+            from .commands import whitelist_list
+
+            return whitelist_list(args)
+        case "whitelist_remove":
+            from .commands import whitelist_remove
+
+            return whitelist_remove(args)
+        case _:
+            import logging
+
+            logger = logging.getLogger(__name__)
+
+            logger.error(f"Unknown command: {command_name}")
+            return 1
 
+
+def main() -> int:
+    # Parser Setup
     parser = argparse.ArgumentParser(
         prog="mcserver",
         description="A CLI tool for managing Minecraft: Java Edition servers.",
@@ -134,28 +139,6 @@ def main() -> int:
 
     commands = parser.add_subparsers(title="Commands")
 
-    # 'add' command
-    add_command = commands.add_parser(
-        "add",
-        help="Add Modrinth projects to the server",
-        description="Add Modrinth mods/plugins to the server",
-    )
-
-    add_command.set_defaults(command_name="add")
-    add_command.add_argument(
-        "projects", nargs="+", type=str, help="Modrinth project slugs or IDs"
-    )
-
-    # 'import' command
-    import_command = commands.add_parser(
-        "import",
-        help="Import a Modrinth modpack",
-        description="Import a Modrinth modpack from a file.",
-    )
-
-    import_command.set_defaults(command_name="import")
-    import_command.add_argument("file", type=str, help="The Modrinth modpack file")
-
     # 'init' command
     init_command = commands.add_parser(
         "init",
@@ -193,15 +176,15 @@ def main() -> int:
     init_command.add_argument(
         "--min-ram",
         default=512,
-        type=bound_int(1024),
-        help="Minimum RAM for the server (in MebiBytes) (minimum value: 1024)",
+        type=bound_int(512),
+        help="Minimum RAM for the server (in MebiBytes) (minimum value: 512)",
         metavar="Size",
     )
 
     init_command.add_argument(
         "--max-ram",
-        default=bound_int(1024),
-        type=int,
+        default=1024,
+        type=bound_int(1024),
         help="Maximum RAM for the server (in MebiBytes) (minimum value: 1024)",
         metavar="Size",
     )
@@ -222,16 +205,9 @@ def main() -> int:
         choices=search_sort_index,
         help="Default search sort index",
         metavar="Index",
-        dest="search_limit",
-    )
-
-    # 'list' command
-    list_command = commands.add_parser(
-        "list", help="List all added projects", description="List all added projects."
+        dest="sort_index",
     )
 
-    list_command.set_defaults(command_name="list")
-
     # 'op' command
     op_command = commands.add_parser(
         "op", help="Manage operator players", description="Manage the operator status."
@@ -248,16 +224,6 @@ def main() -> int:
 
     op_list_command.set_defaults(command_name="op_list")
 
-    # 'remove' command
-    remove_command = commands.add_parser(
-        "remove", help="Remove projects", description="Remove projects"
-    )
-
-    remove_command.set_defaults(command_name="remove")
-    remove_command.add_argument(
-        "projects", nargs="+", type=str, help="Modrinth project slugs or IDs"
-    )
-
     # 'search' command
     search_command = commands.add_parser(
         "search",
@@ -272,7 +238,6 @@ def main() -> int:
 
     search_command.add_argument(
         "--limit",
-        default=20,
         type=bound_int(1, 100),
         help="Search projects per page (value between (inclusive): 1-100)",
         metavar="Number",
@@ -289,13 +254,11 @@ def main() -> int:
     )
 
     search_command.add_argument(
-        "--sort",
-        default="relevance",
+        "--sort-index",
         type=str,
         choices=search_sort_index,
         help="Sort by index",
         metavar="Index",
-        dest="sort_index",
     )
 
     search_command.add_argument(
@@ -348,6 +311,7 @@ def main() -> int:
 
     stop_command.set_defaults(command_name="stop")
 
+    # update is not going to be implemented in this version
     # 'whitelist' command
     whitelist_command = commands.add_parser(
         "whitelist",
@@ -368,5 +332,15 @@ def main() -> int:
 
     whitelist_list_command.set_defaults(command_name="whitelist_list")
 
+    # 'whitelist remove'
+    whitelist_remove_command = whitelist_subcommands.add_parser(
+        "remove",
+        help="Remove players from the whitelist",
+        description="List all whitelisted players.",
+    )
+
+    whitelist_remove_command.set_defaults(command_name="whitelist_remove")
+    whitelist_remove_command.add_argument("players", nargs="+", type=str, help="List of player names or UUIDs")
+
     args = parser.parse_args()
     return args.func(args)

mcserver/commands/__init__.py

@@ -1,21 +1,21 @@
-from .add_projects import main as add_projects
-from .import_setup import main as import_setup
-from .initialize_server import main as initialize_server
-from .list_projects import main as list_projects
-from .op_grant import main as op_grant
-from .op_list import main as op_list
-from .op_revoke import main as op_revoke
-from .print_help import main as print_help
-from .remove_projects import main as remove_projects
-from .search_projects import main as search_projects
-from .server_status import main as server_status
-from .show_projects import main as show_projects
-from .start_server import main as start_server
-from .stop_server import main as stop_server
-from .update_projects import main as update_projects
-from .whitelist_add import main as whitelist_add
-from .whitelist_list import main as whitelist_list
-from .whitelist_remove import main as whitelist_remove
+from .add_projects import run as add_projects
+from .import_setup import run as import_setup
+from .initialize_server import run as initialize_server
+from .list_projects import run as list_projects
+from .op_grant import run as op_grant
+from .op_list import run as op_list
+from .op_revoke import run as op_revoke
+from .print_help import run as print_help
+from .remove_projects import run as remove_projects
+from .search_projects import run as search_projects
+from .server_status import run as server_status
+from .show_projects import run as show_projects
+from .start_server import run as start_server
+from .stop_server import run as stop_server
+from .update_projects import run as update_projects
+from .whitelist_add import run as whitelist_add
+from .whitelist_list import run as whitelist_list
+from .whitelist_remove import run as whitelist_remove
 
 __all__ = [
     "add_projects",