mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-05-14 17:59:48 +00:00
Code Issues Projects Releases Wiki Activity

[commands] Respect ignore_extra for FlagConverter kw-only parameters

Browse Source
This commit is contained in:
Rapptz 2022-11-29 18:09:47 -05:00
parent a098867a4d
commit da317ad84b
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
discord/ext/commands/flags.py
View File

@ -33,7 +33,7 @@ from typing import TYPE_CHECKING, Any, Dict, Iterator, List, Literal, Optional,
from discord.utils import MISSING, maybe_coroutine, resolve_annotation from discord.utils import MISSING, maybe_coroutine, resolve_annotation
from .converter import run_converters from .converter import run_converters
from .errors import BadFlagArgument, MissingFlagArgument, MissingRequiredFlag, TooManyFlags from .errors import BadFlagArgument, MissingFlagArgument, MissingRequiredFlag, TooManyFlags, TooManyArguments
from .view import StringView from .view import StringView
__all__ = ( __all__ = (
@ -496,7 +496,7 @@ class FlagConverter(metaclass=FlagsMeta):
return f'<{self.__class__.__name__} {pairs}>' return f'<{self.__class__.__name__} {pairs}>'
@classmethod @classmethod
def parse_flags(cls, argument: str) -> Dict[str, List[str]]: def parse_flags(cls, argument: str, *, ignore_extra: bool = True) -> Dict[str, List[str]]:
result: Dict[str, List[str]] = {} result: Dict[str, List[str]] = {}
flags = cls.__commands_flags__ flags = cls.__commands_flags__
aliases = cls.__commands_flag_aliases__ aliases = cls.__commands_flag_aliases__
@ -531,9 +531,11 @@ class FlagConverter(metaclass=FlagsMeta):
last_position = end last_position = end
last_flag = flag last_flag = flag
# Add the remaining string to the last available flag # Get the remaining string, if applicable
if last_position and last_flag is not None:
value = argument[last_position:].strip() value = argument[last_position:].strip()
# Add the remaining string to the last available flag
if last_flag is not None:
if not value: if not value:
raise MissingFlagArgument(last_flag) raise MissingFlagArgument(last_flag)
@ -545,6 +547,9 @@ class FlagConverter(metaclass=FlagsMeta):
result[name] = [value] result[name] = [value]
else: else:
values.append(value) values.append(value)
elif value and not ignore_extra:
# If we're here then we passed extra arguments that aren't flags
raise TooManyArguments(f'Too many arguments passed to {cls.__name__}')
# Verification of values will come at a later stage # Verification of values will come at a later stage
return result return result
@ -572,7 +577,17 @@ class FlagConverter(metaclass=FlagsMeta):
:class:`FlagConverter` :class:`FlagConverter`
The flag converter instance with all flags parsed. The flag converter instance with all flags parsed.
""" """
arguments = cls.parse_flags(argument)
# Only respect ignore_extra if the parameter is a keyword-only parameter
ignore_extra = True
if (
ctx.command is not None
and ctx.current_parameter is not None
and ctx.current_parameter.kind == ctx.current_parameter.KEYWORD_ONLY
):
ignore_extra = ctx.command.ignore_extra
arguments = cls.parse_flags(argument, ignore_extra=ignore_extra)
flags = cls.__commands_flags__ flags = cls.__commands_flags__
self = cls.__new__(cls) self = cls.__new__(cls)