v0.3.9

argenta/command/entity.py

@@ -1,16 +1,15 @@
-from .params.flag.entity import Flag
-from .params.flag.flags_group.entity import FlagsGroup
+from argenta.command.flag.entity import Flag
+from argenta.command.flag.flags_group import FlagsGroup
 from .exceptions import (UnprocessedInputFlagException,
                          RepeatedInputFlagsException,
                          EmptyInputCommandException)
 
-from typing import Generic, TypeVar
+from typing import Generic, TypeVar, cast, Literal
+
+CommandType = TypeVar('CommandType')
 
 
-T = TypeVar('T')
-
-
-class Command(Generic[T]):
+class Command(Generic[CommandType]):
     def __init__(self, trigger: str,
                  description: str = None,
                  flags: Flag | FlagsGroup = None):
@@ -57,7 +56,7 @@ class Command(Generic[T]):
         return self._input_flags
 
     @staticmethod
-    def parse_input_command(raw_command: str) -> 'Command[T]':
+    def parse_input_command(raw_command: str) -> 'Command[CommandType]':
         if not raw_command:
             raise EmptyInputCommandException()
         list_of_tokens = raw_command.split()
@@ -67,7 +66,7 @@ class Command(Generic[T]):
         flags: FlagsGroup = FlagsGroup()
         current_flag_name = None
         current_flag_value = None
-        for _ in list_of_tokens:
+        for k, _ in enumerate(list_of_tokens):
             if _.startswith('-'):
                 flag_prefix_last_symbol_index = _.rfind('-')
                 if current_flag_name or len(_) < 2 or len(_[:flag_prefix_last_symbol_index]) > 3:
@@ -79,12 +78,15 @@ class Command(Generic[T]):
                     raise UnprocessedInputFlagException()
                 else:
                     current_flag_value = _
-            if current_flag_name and current_flag_value:
+            if current_flag_name:
+                if not len(list_of_tokens) == k+1:
+                    if not list_of_tokens[k+1].startswith('-'):
+                        continue
                 flag_prefix_last_symbol_index = current_flag_name.rfind('-')
                 flag_prefix = current_flag_name[:flag_prefix_last_symbol_index+1]
                 flag_name = current_flag_name[flag_prefix_last_symbol_index+1:]
                 input_flag = Flag(flag_name=flag_name,
-                                  flag_prefix=flag_prefix)
+                                  flag_prefix=cast(Literal['-', '--', '---'], flag_prefix))
                 input_flag.set_value(current_flag_value)
 
                 all_flags = [x.get_string_entity() for x in flags.get_flags()]

argenta/command/exceptions.py

@@ -1,4 +1,4 @@
-from .params.flag.entity import Flag
+from argenta.command.flag.entity import Flag
 
 
 class UnprocessedInputFlagException(Exception):

argenta/command/flag/defaults.py

@@ -0,0 +1,18 @@
+from argenta.command.flag import Flag
+import re
+
+
+help_flag = Flag(flag_name='help', possible_flag_values=False)
+short_help_flag = Flag(flag_name='h', flag_prefix='-', possible_flag_values=False)
+
+info_flag = Flag(flag_name='info', possible_flag_values=False)
+short_info_flag = Flag(flag_name='i', flag_prefix='-', possible_flag_values=False)
+
+all_flag = Flag(flag_name='all', possible_flag_values=False)
+short_all_flag = Flag(flag_name='a', flag_prefix='-', possible_flag_values=False)
+
+host_flag = Flag(flag_name='host', possible_flag_values=re.compile(r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$'))
+short_host_flag = Flag(flag_name='h', flag_prefix='-', possible_flag_values=re.compile(r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$'))
+
+port_flag = Flag(flag_name='port', possible_flag_values=re.compile(r'^\d{1,5}$'))
+short_port_flag = Flag(flag_name='p', flag_prefix='-', possible_flag_values=re.compile(r'^\d{1,5}$'))

argenta/command/flag/entity.py

@@ -4,12 +4,10 @@ from typing import Literal, Pattern
 class Flag:
     def __init__(self, flag_name: str,
                  flag_prefix: Literal['-', '--', '---'] = '--',
-                 ignore_flag_value_register: bool = False,
-                 possible_flag_values: list[str] | Pattern[str] = False):
+                 possible_flag_values: list[str] | Pattern[str] | False = True):
         self._flag_name = flag_name
         self._flag_prefix = flag_prefix
         self.possible_flag_values = possible_flag_values
-        self.ignore_flag_value_register = ignore_flag_value_register
 
         self._flag_value = None
 
@@ -29,23 +27,23 @@ class Flag:
     def set_value(self, value):
         self._flag_value = value
 
-    def validate_input_flag_value(self, input_flag_value: str):
-        if isinstance(self.possible_flag_values, Pattern):
+    def validate_input_flag_value(self, input_flag_value: str | None):
+        if self.possible_flag_values is False:
+            if input_flag_value is None:
+                return True
+            else:
+                return False
+        elif isinstance(self.possible_flag_values, Pattern):
             is_valid = bool(self.possible_flag_values.match(input_flag_value))
             if bool(is_valid):
                 return True
             else:
                 return False
 
-        if isinstance(self.possible_flag_values, list):
-            if self.ignore_flag_value_register:
-                if input_flag_value.lower() in [x.lower() for x in self.possible_flag_values]:
-                    return True
-                else:
-                    return False
+        elif isinstance(self.possible_flag_values, list):
+            if input_flag_value in self.possible_flag_values:
+                return True
             else:
-                if input_flag_value in self.possible_flag_values:
-                    return True
-                else:
-                    return False
-        return True
+                return False
+        else:
+            return True

argenta/command/flag/flags_group/__init__.py

@@ -0,0 +1 @@
+from .entity import FlagsGroup

argenta/command/flag/flags_group/entity.py

@@ -1,8 +1,8 @@
-from argenta.command.params.flag.entity import Flag
+from argenta.command.flag.entity import Flag
 
 
 class FlagsGroup:
-    def __init__(self, flags: list[Flag] = None):
+    def __init__(self, *flags: Flag):
         self._flags: list[Flag] = [] if not flags else flags
 
     def get_flags(self) -> list[Flag]: