dshellInterpreter 0.2.13.2__tar.gz → 0.2.13.4__tar.gz

{dshellinterpreter-0.2.13.2 → dshellinterpreter-0.2.13.4}/Dshell/DISCORD_COMMANDS/dshell_message.py

@@ -45,7 +45,7 @@ async def dshell_send_message(ctx: Message, message=None, delete=None, channel=N
     if isinstance(embeds, Embed):
         embeds = ListNode([embeds])
 
-    if not isinstance(channel_to_send, (EasyModifiedViews, NoneType)):
+    if not isinstance(view, (EasyModifiedViews, NoneType)):
         raise Exception(f'Channel must be an UI or None, not {type(channel_to_send)} !')
 
     sended_message = await channel_to_send.send(message,

{dshellinterpreter-0.2.13.2 → dshellinterpreter-0.2.13.4}/Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -311,7 +311,7 @@ async def call_function(function: Callable, args: ArgsCommandNode, interpreter:
     return await function(*absolute_args, **keyword_args)
 
 
-def regroupe_commandes(body: list[Token], interpreter: DshellInterpreteur) -> list[dict[str, list[Any]]]:
+def regroupe_commandes(body: list[Token], interpreter: DshellInterpreteur, normalise: bool = False) -> list[dict[str, list[Any]]]:
     """
     Groups the command arguments in the form of a python dictionary.
     Note that you can specify the parameter you wish to pass via -- followed by the parameter name. But this is not mandatory!
@@ -322,6 +322,7 @@ def regroupe_commandes(body: list[Token], interpreter: DshellInterpreteur) -> li
 
     :param body: The list of tokens to group.
     :param interpreter: The Dshell interpreter instance.
+    :param normalise: If True, normalises the arguments (make value lowercase).
     """
     tokens = {'*': [],
               '--*': {}}  # tokens to return
@@ -332,6 +333,9 @@ def regroupe_commandes(body: list[Token], interpreter: DshellInterpreteur) -> li
     i = 0
     while i < n:
 
+        if normalise and body[i].type == DTT.STR:
+            body[i].value = body[i].value.lower()
+
         if body[i].type == DTT.SEPARATOR and body[
             i + 1].type == DTT.IDENT:  # Check if it's a separator and if the next token is an IDENT
             current_arg = body[i + 1].value  # change the current argument. It will be impossible to return to '*'
@@ -419,12 +423,11 @@ def build_ui(ui_node: UiNode, interpreter: DshellInterpreteur) -> EasyModifiedVi
     view = EasyModifiedViews()
 
     for component in ui_node.buttons:
-        b = Button
-        args_button: dict[str, list[Any]] = regroupe_commandes(component.body, interpreter)[0]
+        args_button: dict[str, list[Any]] = regroupe_commandes(component.body, interpreter, normalise=True)[0]
         args_button.pop('--*', ())
         code = args_button.pop('code', None)
         args = args_button.pop('*', ())
-        b(*args, **args_button)
+        b = Button(*args, **args_button)
 
         custom_id = ''.join(choice(ascii_letters + digits) for _ in range(20))
         b.custom_id = custom_id

{dshellinterpreter-0.2.13.2 → dshellinterpreter-0.2.13.4}/Dshell/_DshellParser/ast_nodes.py

@@ -498,12 +498,11 @@ class UiNode(ASTNode):
     This is used to define UI elements for commands in Dshell.
     """
 
-    def __init__(self, body, buttons: Optional[list[UiButtonNode]] = None,
+    def __init__(self, buttons: Optional[list[UiButtonNode]] = None,
                  selects: Optional[list[UiSelectNode]] = None):
         """
         :param body: list of tokens representing the UI component
         """
-        self.body = body
         self.buttons = buttons or []
         self.selects = selects or []
 

{dshellinterpreter-0.2.13.2 → dshellinterpreter-0.2.13.4}/Dshell/_DshellParser/dshell_parser.py

@@ -205,15 +205,13 @@ def parse(token_lines: list[list[Token]], start_node: ASTNode) -> tuple[list[AST
                 if not isinstance(last_block, UiNode):
                     raise SyntaxError(f'[BUTTON] No UI open on line {first_token_line.position} !')
                 button_node = UiButtonNode(tokens_by_line[1:])
-                last_block.body.append(button_node)
-                pointeur += 1
+                last_block.buttons.append(button_node)
 
             elif first_token_line.value == 'select':
                 if not isinstance(last_block, UiNode):
                     raise SyntaxError(f'[SELECT] No UI open on line {first_token_line.position} !')
                 select_node = UiSelectNode(tokens_by_line[1:])
-                last_block.body.append(select_node)
-                pointeur += 1
+                last_block.selects.append(select_node)
 
         ############################## AUTRE ##############################
 

{dshellinterpreter-0.2.13.2/dshellInterpreter.egg-info → dshellinterpreter-0.2.13.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dshellInterpreter
-Version: 0.2.13.2
+Version: 0.2.13.4
 Summary: A Discord bot interpreter for creating custom commands and automations.
 Home-page: https://github.com/BOXERRMD/Dshell_Interpreter
 Author: Chronos

{dshellinterpreter-0.2.13.2 → dshellinterpreter-0.2.13.4/dshellInterpreter.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dshellInterpreter
-Version: 0.2.13.2
+Version: 0.2.13.4
 Summary: A Discord bot interpreter for creating custom commands and automations.
 Home-page: https://github.com/BOXERRMD/Dshell_Interpreter
 Author: Chronos

{dshellinterpreter-0.2.13.2 → dshellinterpreter-0.2.13.4}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name="dshellInterpreter",
-    version="0.2.13.2",
+    version="0.2.13.4",
     author="Chronos",
     author_email="vagabonwalybi@gmail.com",
     description="A Discord bot interpreter for creating custom commands and automations.",