Garmelon/yaboli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename argstr to raw

Browse source
This commit is contained in:
Joscha 2019-04-12 00:28:08 +00:00
parent 8dd94b6ac8
commit 2bf512d8dc
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
yaboli/command.py
View file

@ -28,8 +28,8 @@ class FancyArgs(NamedTuple):
flags: Dict[str, int] flags: Dict[str, int]
class ArgumentData: class ArgumentData:
def __init__(self, argstr: str) -> None: def __init__(self, raw: str) -> None:
self._argstr = argstr self._raw = raw
self._basic: Optional[List[str]] = None self._basic: Optional[List[str]] = None
self._basic_escaped: Optional[List[str]] = None self._basic_escaped: Optional[List[str]] = None
@ -97,28 +97,28 @@ class ArgumentData:
raise NotImplementedError # TODO raise NotImplementedError # TODO
@property @property
def argstr(self) -> str: def raw(self) -> str:
return self._argstr return self._raw
def basic(self, escaped: bool = True) -> List[str]: def basic(self, escaped: bool = True) -> List[str]:
if escaped: if escaped:
if self._basic_escaped is None: if self._basic_escaped is None:
self._basic_escaped = self._split(self._argstr, escaped) self._basic_escaped = self._split(self._raw, escaped)
return self._basic_escaped return self._basic_escaped
else: else:
if self._basic is None: if self._basic is None:
self._basic = self._split(self._argstr, escaped) self._basic = self._split(self._raw, escaped)
return self._basic return self._basic
def fancy(self, escaped: bool = True) -> FancyArgs: def fancy(self, escaped: bool = True) -> FancyArgs:
if escaped: if escaped:
if self._fancy_escaped is None: if self._fancy_escaped is None:
basic = self._split(self._argstr, escaped) basic = self._split(self._raw, escaped)
self._fancy_escaped = self._parse_fancy(basic) self._fancy_escaped = self._parse_fancy(basic)
return self._fancy_escaped return self._fancy_escaped
else: else:
if self._fancy is None: if self._fancy is None:
basic = self._split(self._argstr, escaped) basic = self._split(self._raw, escaped)
self._fancy = self._parse_fancy(basic) self._fancy = self._parse_fancy(basic)
return self._fancy return self._fancy
@ -126,8 +126,8 @@ class ArgumentData:
return bool(self.basic()) # The list of arguments is empty return bool(self.basic()) # The list of arguments is empty
class SpecificArgumentData(ArgumentData): class SpecificArgumentData(ArgumentData):
def __init__(self, nick: str, argstr: str) -> None: def __init__(self, nick: str, raw: str) -> None:
super().__init__(argstr) super().__init__(raw)
self._nick = nick self._nick = nick