dshellInterpreter 0.1.24__py3-none-any.whl → 0.1.26__py3-none-any.whl

Dshell/DISCORD_COMMANDS/dshell_message.py

@@ -42,17 +42,17 @@ async def dshell_send_message(ctx: Message, message=None, delete=None, channel=N
     return sended_message.id
 
 
-async def dshell_delete_message(ctx: Message, message, reason=None, delay=0):
+async def dshell_delete_message(ctx: Message, message=None, reason=None, delay=0):
     """
     Deletes a message
     """
 
-    delete_message = ctx.channel.get_partial_message(message)  # builds a reference to the message (even if it doesn't exist)
+    delete_message = ctx if message is None else ctx.channel.get_partial_message(message)  # builds a reference to the message (even if it doesn't exist)
 
     if delay > 3600:
         raise Exception(f'The message deletion delay is too long! ({delay} seconds)')
 
-    await delete_message.delete(delay=delay, reason=reason)
+    #await delete_message.delete(delay=delay, reason=reason)
 
 
 async def dshell_purge_message(ctx: Message, message_number, channel=None, reason=None):

Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -167,14 +167,27 @@ def get_params(node: ParamNode, interpreter: DshellInterpreteur) -> dict[str, An
     regrouped_args: dict[str, list] = regroupe_commandes(node.body, interpreter)[
         0]  # just regroup the commands, no need to do anything else
     regrouped_args.pop('*', ())
+    englobe_args = regrouped_args.pop('--*', {})  # get the arguments that are not mandatory
     obligate = [i for i in regrouped_args.keys() if regrouped_args[i] == '*']  # get the obligatory parameters
 
+
     g: list[list[Token]] = DshellTokenizer(interpreter.vars).start()
     env_give_variables = regroupe_commandes(g[0], interpreter)[0] if g else {}
 
     gived_variables = env_give_variables.pop('*', ())  # get the variables given in the environment
+    englobe_gived_variables: dict = env_give_variables.pop('--*', {})  # get the variables given in the environment that are not mandatory
+
     for key, value in zip(regrouped_args.keys(), gived_variables):
         regrouped_args[key] = value
+        gived_variables.pop(0)
+
+    if len(gived_variables) > 0:
+        for key in englobe_args.keys():
+            regrouped_args[key] = ' '.join([str(i) for i in gived_variables])
+
+    for key, englobe_gived_key, englobe_gived_value in zip(englobe_args.keys(), englobe_gived_variables.keys(), englobe_gived_variables.values()):
+        if key == englobe_gived_key:
+            regrouped_args[key] = englobe_gived_value
 
     for key, value in env_give_variables.items():
         if key in regrouped_args:
@@ -251,13 +264,13 @@ async def call_function(function: Callable, args: ArgsCommandNode, interpreter:
 
     # conversion des args en valeurs Python
     absolute_args = reformatted.pop('*', list())
+    englobe_args = reformatted.pop('--*', list())
 
     reformatted: dict[str, Token]
 
     absolute_args.insert(0, interpreter.ctx)
-    keyword_args = {
-        key: value for key, value in reformatted.items()
-    }
+    keyword_args = reformatted.copy()
+    keyword_args.update(englobe_args)
     return await function(*absolute_args, **keyword_args)
 
 
@@ -273,7 +286,8 @@ def regroupe_commandes(body: list[Token], interpreter: DshellInterpreteur) -> li
     :param body: The list of tokens to group.
     :param interpreter: The Dshell interpreter instance.
     """
-    tokens = {'*': []}  # tokens to return
+    tokens = {'*': [],
+              '--*': {}}  # tokens to return
     current_arg = '*'  # the argument keys are the types they belong to. '*' is for all arguments not explicitly specified by a separator and an IDENT
     n = len(body)
     list_tokens: list[dict] = [tokens]
@@ -301,7 +315,7 @@ def regroupe_commandes(body: list[Token], interpreter: DshellInterpreteur) -> li
               body[i + 2].type == DTT.IDENT and
               body[i + 3].type == DTT.ENGLOBE_SEPARATOR):
             current_arg = body[i + 2].value  # change the current argument
-            tokens[current_arg] = body[i + 3].value
+            tokens['--*'][current_arg] = body[i + 3].value
             i += 4
 
         else:
@@ -320,12 +334,14 @@ def build_embed(body: list[Token], fields: list[FieldEmbedNode], interpreter: Ds
     """
     args_main_embed: dict[str, list[Any]] = regroupe_commandes(body, interpreter)[0]
     args_main_embed.pop('*')  # remove unspecified parameters for the embed
+    args_main_embed.pop('--*')
     args_main_embed: dict[str, Token]  # specify what it contains from now on
 
     args_fields: list[dict[str, Token]] = []
     for field in fields:  # do the same for the fields
         a = regroupe_commandes(field.body, interpreter)[0]
         a.pop('*')
+        a.pop('--*')
         a: dict[str, Token]
         args_fields.append(a)
 

{dshellinterpreter-0.1.24.dist-info → dshellinterpreter-0.1.26.dist-info}/METADATA

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

{dshellinterpreter-0.1.24.dist-info → dshellinterpreter-0.1.26.dist-info}/RECORD

@@ -2,9 +2,9 @@ Dshell/__init__.py,sha256=UPvXnewe_8FX9aoevMA78UN1k8AY-u8LTY3vEVxaDxw,72
 Dshell/DISCORD_COMMANDS/__init__.py,sha256=unbZE4sxFCbUQ4Qptr1BhWu-nwhvI2oRzcDLtRmX6Ug,92
 Dshell/DISCORD_COMMANDS/dshell_channel.py,sha256=_qHfhVaeXLQMI926AJI3uYpjDXxVNF3sZ84EwWU-jz0,6450
 Dshell/DISCORD_COMMANDS/dshell_member.py,sha256=4cmpcu9RGHVUOGcF9pSnnxh7kEJQWAel4BBQ6Vicvbs,3126
-Dshell/DISCORD_COMMANDS/dshell_message.py,sha256=OPyKWKyGRdTB9KkgPW-WcxnPjNrDlJLNjgJm_KeHkD8,4427
+Dshell/DISCORD_COMMANDS/dshell_message.py,sha256=18wfw5ndTdGko_Q_XOxbxPTLGzlyXtD9oxpwIavXyxw,4461
 Dshell/_DshellInterpreteur/__init__.py,sha256=xy5-J-R3YmY99JF3NBHTRRLsComFxpjnCA5xacISctU,35
-Dshell/_DshellInterpreteur/dshell_interpreter.py,sha256=5TzoiFZWXKBKdLmUZrAqSoScAffp5qrlqFQZ0UMuvvk,19916
+Dshell/_DshellInterpreteur/dshell_interpreter.py,sha256=qlTsGX2iPQDxAjfVHs9HTRILrw0OgcwsRhYGq6C8BcY,20714
 Dshell/_DshellParser/__init__.py,sha256=ONDfhZMvClqP_6tE8SLjp-cf3pXL-auQYnfYRrHZxC4,56
 Dshell/_DshellParser/ast_nodes.py,sha256=-zFmSeb6FnvcXd2gB3koy93apVJ-PiCY8PTUFj-_bG8,15307
 Dshell/_DshellParser/dshell_parser.py,sha256=jCnwxY_J-_u1W_tEotQznp4_Y0aeAH4pTcPl6_Fx9f8,15525
@@ -12,8 +12,8 @@ Dshell/_DshellTokenizer/__init__.py,sha256=LIQSRhDx2B9pmPx5ADMwwD0Xr9ybneVLhHH8q
 Dshell/_DshellTokenizer/dshell_keywords.py,sha256=10VctszIRg8AX5Nsr7kwRIjdwzUgTfrrJYbD7QfYR5s,4253
 Dshell/_DshellTokenizer/dshell_token_type.py,sha256=pWzvmj6EFGkDwNHooOAjdyysi1vZRVEostFIZSW1Ais,1483
 Dshell/_DshellTokenizer/dshell_tokenizer.py,sha256=a4HJdeIT3HP0a5ekUwq5Nb9Wohnjk5A44yGEneCUBjQ,7020
-dshellinterpreter-0.1.24.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
-dshellinterpreter-0.1.24.dist-info/METADATA,sha256=Rof-lgx_E7h2BTbQ0wi3aLijbjS-vJFUph_0YPV9qcQ,1096
-dshellinterpreter-0.1.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dshellinterpreter-0.1.24.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
-dshellinterpreter-0.1.24.dist-info/RECORD,,
+dshellinterpreter-0.1.26.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
+dshellinterpreter-0.1.26.dist-info/METADATA,sha256=Qjpu-A6vBrirEmIB96XkRGertXahqp7cba1ruZwUv8I,1096
+dshellinterpreter-0.1.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dshellinterpreter-0.1.26.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
+dshellinterpreter-0.1.26.dist-info/RECORD,,