dshellInterpreter 0.2.13.11__tar.gz → 0.2.13.13__tar.gz

{dshellinterpreter-0.2.13.11 → dshellinterpreter-0.2.13.13}/Dshell/DISCORD_COMMANDS/__init__.py

@@ -3,4 +3,5 @@ from .dshell_message import *
 from .dshell_member import *
 from .dshell_pastbin import *
 from .dshell_role import *
+from .dshell_interaction import *
 from .utils import *

dshellinterpreter-0.2.13.13/Dshell/DISCORD_COMMANDS/dshell_interaction.py

@@ -0,0 +1,42 @@
+__all__ = [
+    'dshell_respond_interaction'
+]
+
+from types import NoneType
+from discord import Interaction, Embed
+from pycordViews import EasyModifiedViews
+
+
+async def dshell_respond_interaction(ctx: Interaction, content: str = None, delete=None, mention: bool = None, embeds=None, view=None):
+    """
+    Responds to a message interaction on Discord
+    """
+
+    if delete is not None and not isinstance(delete, (int, float)):
+        raise Exception(f'Delete parameter must be a number (seconds) or None, not {type(delete)} !')
+
+    mention_author = mention if mention is not None else False
+
+    from .._DshellParser.ast_nodes import ListNode
+
+    if not isinstance(embeds, (ListNode, Embed, NoneType)):
+        raise Exception(f'Embeds must be a list of Embed objects or a single Embed object, not {type(embeds)} !')
+
+    if embeds is None:
+        embeds = ListNode([])
+
+    elif isinstance(embeds, Embed):
+        embeds = ListNode([embeds])
+
+    if not isinstance(view, (EasyModifiedViews, NoneType)):
+        raise Exception(f'Channel must be an UI or None, not {type(view)} !')
+
+    sended_message = await ctx.response.send_message(
+                                     content=str(content),
+                                     ephemeral=not mention_author,
+                                     delete_after=delete,
+                                     embeds=embeds,
+                                     view=view)
+
+    return sended_message.id
+

{dshellinterpreter-0.2.13.11 → dshellinterpreter-0.2.13.13}/Dshell/DISCORD_COMMANDS/dshell_message.py

@@ -11,7 +11,6 @@ from .._utils import NoneType
 __all__ = [
     'dshell_send_message',
     'dshell_respond_message',
-    'dshell_respond_interaction',
     'dshell_delete_message',
     'dshell_purge_message',
     'dshell_edit_message',
@@ -88,39 +87,6 @@ async def dshell_respond_message(ctx: Message, message=None, content: str = None
 
     return sended_message.id
 
-async def dshell_respond_interaction(ctx: Interaction, content: str = None, delete=None, mention: bool = None, embeds=None, view=None):
-    """
-    Responds to a message interaction on Discord
-    """
-
-    if delete is not None and not isinstance(delete, (int, float)):
-        raise Exception(f'Delete parameter must be a number (seconds) or None, not {type(delete)} !')
-
-    mention_author = mention if mention is not None else False
-
-    from .._DshellParser.ast_nodes import ListNode
-
-    if not isinstance(embeds, (ListNode, Embed, NoneType)):
-        raise Exception(f'Embeds must be a list of Embed objects or a single Embed object, not {type(embeds)} !')
-
-    if embeds is None:
-        embeds = ListNode([])
-
-    elif isinstance(embeds, Embed):
-        embeds = ListNode([embeds])
-
-    if not isinstance(view, (EasyModifiedViews, NoneType)):
-        raise Exception(f'Channel must be an UI or None, not {type(view)} !')
-
-    sended_message = await ctx.response.send_message(
-                                     content=str(content),
-                                     ephemeral=not mention_author,
-                                     delete_after=delete,
-                                     embeds=embeds,
-                                     view=view)
-
-    return sended_message.id
-
 async def dshell_delete_message(ctx: Message, message=None, reason=None, delay=0):
     """
     Deletes a message

{dshellinterpreter-0.2.13.11 → dshellinterpreter-0.2.13.13}/Dshell/_DshellTokenizer/dshell_keywords.py

@@ -15,6 +15,7 @@ from ..DISCORD_COMMANDS.dshell_member import *
 from ..DISCORD_COMMANDS.dshell_message import *
 from ..DISCORD_COMMANDS.dshell_pastbin import *
 from ..DISCORD_COMMANDS.dshell_role import *
+from ..DISCORD_COMMANDS.dshell_interaction import *
 
 dshell_keyword: set[str] = {
     'if', 'else', 'elif', 'loop', '#end', 'var', '#loop', '#if', 'sleep', 'param', '#param'

{dshellinterpreter-0.2.13.11 → dshellinterpreter-0.2.13.13}/Dshell/_DshellTokenizer/dshell_tokenizer.py

@@ -14,9 +14,9 @@ from .dshell_token_type import Token
 MASK_CHARACTER = '§'
 
 table_regex: dict[DTT, Pattern] = {
-    DTT.COMMENT: compile(r"::(.*?)"),
     DTT.ENGLOBE_SEPARATOR: compile(rf"--\*\w+\s*(.*?)\s*(?=--|$)"),
-    DTT.STR: compile(r'"(.*?)"', flags=DOTALL),
+    DTT.STR: compile(r'"((?:[^\\"]|\\.)*)"', flags=DOTALL),
+    DTT.COMMENT: compile(r"::(.*?)$"),
     DTT.LIST: compile(r"\[(.*?)\]"),
     DTT.CALL_ARGS: compile(r"\((.*?)\)"),
     DTT.MENTION: compile(r'<(?:@!?|@&|#)([0-9]+)>'),
@@ -76,23 +76,26 @@ class DshellTokenizer:
                         token = Token(token_type, match.group(1), (line_number, start_match))  # on enregistre son token
                         tokens_par_ligne.append(token)
 
-                    if token_type in (
-                            DTT.LIST,
-                            DTT.CALL_ARGS):  # si c'est un regroupement de donnée, on tokenize ce qu'il contient
-                        result = self.tokenizer([token.value])
-                        token.value = result[0] if len(
-                            result) > 0 else result  # gère si la structure de donnée est vide ou non
+                        if token_type == DTT.STR:
+                            token.value = token.value.replace(r'\"', '"')
 
-                        for token_in_list in token.value:
-                            token_in_list.position = (line_number, token_in_list.position[1])
+                        if token_type in (
+                                DTT.LIST,
+                                DTT.CALL_ARGS):  # si c'est un regroupement de donnée, on tokenize ce qu'il contient
+                            result = self.tokenizer([token.value])
+                            token.value = result[0] if len(
+                                result) > 0 else result  # gère si la structure de donnée est vide ou non
 
-                        for token_in_line in range(len(tokens_par_ligne)-1):
-                            if tokens_par_ligne[token_in_line].position[1] > start_match:
-                                str_tokens_in_list = tokens_par_ligne[token_in_line:-1]
-                                tokens_par_ligne = tokens_par_ligne[:token_in_line] + [tokens_par_ligne[-1]]
-                                token.value.extend(str_tokens_in_list)
-                                token.value.sort(key=lambda t: t.position[1])  # trie les tokens par rapport à leur position
-                                break
+                            for token_in_list in token.value:
+                                token_in_list.position = (line_number, token_in_list.position[1])
+
+                            for token_in_line in range(len(tokens_par_ligne)-1):
+                                if tokens_par_ligne[token_in_line].position[1] > start_match:
+                                    str_tokens_in_list = tokens_par_ligne[token_in_line:-1]
+                                    tokens_par_ligne = tokens_par_ligne[:token_in_line] + [tokens_par_ligne[-1]]
+                                    token.value.extend(str_tokens_in_list)
+                                    token.value.sort(key=lambda t: t.position[1])  # trie les tokens par rapport à leur position
+                                    break
 
                     len_match = len(match.group(0))  # longueur du match trouvé
                     ligne = ligne[:start_match] + (MASK_CHARACTER * len_match) + ligne[
@@ -112,6 +115,7 @@ class DshellTokenizer:
         str]:
         """
         Sépare les commandes en une liste en respectant les chaînes entre guillemets.
+        Echapper les caractères regroupants avec un antislash (\) pour les inclure dans la chaîne.
         :param commande: La chaîne de caractères à découper.
         :param global_split: Le séparateur utilisé (par défaut '\n').
         :param garder_carractere_regroupant: Si False, enlève les guillemets autour des chaînes.
@@ -121,14 +125,13 @@ class DshellTokenizer:
 
         commandes: str = commande.strip()
         remplacement_temporaire = '[REMPLACER]'
-        entre_caractere_regroupant = findall(fr'({carractere_regroupant}.*?{carractere_regroupant})', commandes,
-                                             flags=DOTALL)  # repère les parties entre guillemets et les save
-
-        # current_command_text = [i[1: -1] for i in
-        # entre_carractere_regroupant.copy()]  # enregistre les parties entre guillemets pour cette commande
+        pattern_find_regrouped_part = compile(fr'({carractere_regroupant}(?:[^\\{carractere_regroupant}]|\\.)*{carractere_regroupant})', flags=DOTALL)
+        entre_caractere_regroupant = findall(pattern_find_regrouped_part, commandes)  # repère les parties entre guillemets et les save
 
-        res = sub(fr'({carractere_regroupant}.*?{carractere_regroupant})', remplacement_temporaire, commandes,
-                  flags=DOTALL)  # remplace les parties entre guillemets
+        res = sub(pattern_find_regrouped_part,
+                  remplacement_temporaire,
+                  commandes,
+                  )  # remplace les parties entre guillemets
 
         res = res.split(global_split)  # split les commandes sans les guillemets
 

{dshellinterpreter-0.2.13.11/dshellInterpreter.egg-info → dshellinterpreter-0.2.13.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dshellInterpreter
-Version: 0.2.13.11
+Version: 0.2.13.13
 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.11 → dshellinterpreter-0.2.13.13/dshellInterpreter.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dshellInterpreter
-Version: 0.2.13.11
+Version: 0.2.13.13
 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.11 → dshellinterpreter-0.2.13.13}/dshellInterpreter.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ Dshell/__init__.py
 Dshell/_utils.py
 Dshell/DISCORD_COMMANDS/__init__.py
 Dshell/DISCORD_COMMANDS/dshell_channel.py
+Dshell/DISCORD_COMMANDS/dshell_interaction.py
 Dshell/DISCORD_COMMANDS/dshell_member.py
 Dshell/DISCORD_COMMANDS/dshell_message.py
 Dshell/DISCORD_COMMANDS/dshell_pastbin.py

{dshellinterpreter-0.2.13.11 → dshellinterpreter-0.2.13.13}/setup.py

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