cmds.CmdPkg: Rename pkg -> packages #33

Merged
Jan Lindemann merged 2 commits from jan/feature/20260625-cmds-cmdpkg-rename-pkg-packages into master 2026-06-25 10:44:41 +02:00 AGit
4 changed files with 41 additions and 8 deletions

View file

@ -6,12 +6,19 @@ from ..App import App as Parent
from ..CmdBase import CmdBase as Base
if TYPE_CHECKING:
from typing import Iterable
from ..lib.Distro import Distro
class Cmd(Base): # export
def __init__(self, parent: Parent, name: str, help: str) -> None:
super().__init__(parent, name, help)
def __init__(
self,
parent: Parent,
name: str,
help: str,
aliases: Iterable[str] | None = None
) -> None:
super().__init__(parent, name, help, aliases = aliases)
async def _run(self, args):
# Missing subcommand

View file

@ -10,7 +10,12 @@ if TYPE_CHECKING:
class CmdPkg(Cmd): # export
def __init__(self, parent: Parent) -> None:
super().__init__(parent, 'pkg', help = 'System package manager wrapper')
super().__init__(
parent,
'packages',
aliases = ['pkg'],
help = 'System package manager wrapper'
)
self.load_subcommands()
async def _run(self, args):

View file

@ -56,6 +56,7 @@ class App: # export
cmd.name,
help = cmd.help,
description = cmd.description,
aliases = cmd.aliases,
formatter_class = ArgumentDefaultsHelpFormatter,
)
parser.set_defaults(func = cmd.run)
@ -88,13 +89,21 @@ class App: # export
for cmd in cmds:
cmd.set_parent(parent)
scs[cmd.name] = SubCommand(cmd, add_cmd_to_parser(cmd, subparsers))
for alias in cmd.aliases:
scs[alias] = scs[cmd.name]
if all:
seen: set[int] = set()
for sc in scs.values():
add_cmds_to_parser(sc.cmd, sc.parser, sc.cmd.children, all = all)
if id(sc) not in seen:
seen.add(id(sc))
add_cmds_to_parser(
sc.cmd, sc.parser, sc.cmd.children, all = all
)
return
args, unknown = self.__parser.parse_known_args()
if args.command in scs:
sc = scs[args.command]
cmd_name = getattr(args, 'command', None)
if cmd_name in scs:
sc = scs[cmd_name]
add_cmds_to_parser(sc.cmd, sc.parser, sc.cmd.children, all = all)
from .Cmd import AbstractCmd

View file

@ -10,7 +10,7 @@ from .Types import LoadTypes, Types
if TYPE_CHECKING:
from argparse import ArgumentParser
from typing import Any
from typing import Any, Iterable
from .App import App
@ -150,6 +150,13 @@ class AbstractCmd(abc.ABC):
def description(self) -> str:
return self._description()
def _aliases(self) -> Iterable[str]:
return []
@property
def aliases(self) -> Iterable[str]:
return self._aliases()
class Cmd(AbstractCmd): # export
def __init__(
@ -157,12 +164,14 @@ class Cmd(AbstractCmd): # export
parent: App | Cmd,
name: str,
help: str,
description: str | None = None
description: str | None = None,
aliases: Iterable[str] | None = None
) -> None:
super().__init__(parent)
self.__name = name
self.__help = help
self.__description = description if description else help
self.__aliases = aliases if aliases else []
def _name(self) -> str:
return self.__name
@ -172,3 +181,6 @@ class Cmd(AbstractCmd): # export
def _description(self) -> str:
return self.__description
def _aliases(self) -> Iterable[str]:
return self.__aliases