dshellInterpreter 0.1.2__tar.gz → 0.1.4__tar.gz

{dshellinterpreter-0.1.2 → dshellinterpreter-0.1.4}/Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -2,7 +2,7 @@ from asyncio import sleep
 from re import findall
 from typing import TypeVar, Union, Any, Optional, Callable
 
-from discord import AutoShardedBot, Embed, Colour
+from discord import AutoShardedBot, Embed, Colour, PermissionOverwrite, Permissions
 from discord.abc import GuildChannel, PrivateChannel
 
 from .._DshellTokenizer.dshell_keywords import *
@@ -23,7 +23,7 @@ class DshellInterpreteur:
         """
         Interpreter Dshell code or AST.
         """
-        self.ast: StartNode = parse(DshellTokenizer(ast_or_code).start(), StartNode([]))[0]
+        self.ast: list[ASTNode] = parse(DshellTokenizer(ast_or_code).start(), StartNode([]))[0]
         self.env: dict[str, Any] = {}
         self.ctx: context = ctx
         if debug:
@@ -33,8 +33,10 @@ class DshellInterpreteur:
         """
         Execute l'arbre syntaxique.
         """
+        if ast is None:
+            ast = self.ast
 
-        for node in self.ast:
+        for node in ast:
 
             if isinstance(node, StartNode):
                 await self.execute(node.body)
@@ -73,6 +75,9 @@ class DshellInterpreteur:
                 elif isinstance(first_node, EmbedNode):
                     self.env[node.name.value] = build_embed(first_node.body, first_node.fields, self)
 
+                elif isinstance(first_node, PermissionNode):
+                    self.env[node.name.value] = build_permission(first_node.body, self)
+
                 else:
                     self.env[node.name.value] = eval_expression(node.body, self)
 
@@ -91,6 +96,7 @@ class DshellInterpreteur:
 
                 await sleep(sleep_time)
 
+
             elif isinstance(node, EndNode):
                 raise RuntimeError(f"Execution interromput -> #end atteint")
 
@@ -108,6 +114,8 @@ class DshellInterpreteur:
             return float(token.value)
         elif token.type == DTT.BOOL:
             return token.value.lower() == "true"
+        elif token.type == DTT.NONE:
+            return None
         elif token.type == DTT.LIST:
             return ListNode(
                 [self.eval_data_token(tok) for tok in token.value])  # token.value contient déjà une liste de Token
@@ -188,7 +196,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) -> dict[Union[str, Token], list[Token]]:
+def regroupe_commandes(body: list[Token], interpreter: DshellInterpreteur) -> dict[Union[str, Token], list[Any]]:
     """
     Regroupe les arguments de la commande sous la forme d'un dictionnaire python.
     Sachant que l'on peut spécifier le paramètre que l'on souhaite passer via -- suivit du nom du paramètre. Mais ce n'est pas obligatoire !
@@ -219,7 +227,7 @@ def build_embed(body: list[Token], fields: list[FieldEmbedNode], interpreter: Ds
     """
     Construit un embed à partir des informations de la commande.
     """
-    args_main_embed: dict[Union[str, Token], list[Token]] = regroupe_commandes(body, interpreter)
+    args_main_embed: dict[Union[str, Token], list[Any]] = regroupe_commandes(body, interpreter)
     args_main_embed.pop('*')  # on enlève les paramètres non spécifié pour l'embed
     args_main_embed: dict[str, Token]  # on précise se qu'il contient dorénavant
 
@@ -240,6 +248,29 @@ def build_embed(body: list[Token], fields: list[FieldEmbedNode], interpreter: Ds
 
     return embed
 
+def build_permission(body: list[Token], interpreter: DshellInterpreteur) -> PermissionOverwrite:
+    """
+    Construit un dictionnaire de permissions à partir des informations de la commande.
+    """
+    args_permissions: dict[Union[str, Token], list[Any]] = regroupe_commandes(body, interpreter)
+    args_permissions.pop('*')  # on enlève les paramètres non spécifié pour les permissions
+    args_permissions: dict[str, Token]  # on précise se qu'il contient dorénavant
+
+    permissions = PermissionOverwrite()
+
+    for key, value in args_permissions.items():
+
+        if key == 'allowed':
+            permissions.update(**PermissionOverwrite.from_pair(Permissions(value), Permissions())._values)
+
+        elif key == 'denied':
+            permissions.update(**PermissionOverwrite.from_pair(Permissions(), Permissions(value))._values)
+
+        else:
+            permissions.update(**{key: value})
+
+    return permissions
+
 
 class DshellIterator:
     """

{dshellinterpreter-0.1.2 → dshellinterpreter-0.1.4}/Dshell/_DshellParser/ast_nodes.py

@@ -17,7 +17,8 @@ __all__ = [
     'EmbedNode',
     'SleepNode',
     'IdentOperationNode',
-    'ListNode'
+    'ListNode',
+    'PermissionNode'
 ]
 
 class ASTNode:
@@ -121,6 +122,13 @@ class EmbedNode(ASTNode):
     def __repr__(self):
         return f"<EMBED> - {self.body}"
 
+class PermissionNode(ASTNode):
+    def __init__(self, body: list[Token]):
+        self.body = body
+
+    def __repr__(self):
+        return f"<PERMISSION> - {self.body}"
+
 
 class SleepNode(ASTNode):
     def __init__(self, body: list[Token]):

{dshellinterpreter-0.1.2 → dshellinterpreter-0.1.4}/Dshell/_DshellParser/dshell_parser.py

@@ -21,6 +21,7 @@ from .ast_nodes import (ASTNode,
                         IdentOperationNode,
                         EmbedNode,
                         FieldEmbedNode,
+                        PermissionNode,
                         StartNode)
 from .._DshellTokenizer.dshell_token_type import DshellTokenType as DTT
 from .._DshellTokenizer.dshell_token_type import Token
@@ -157,6 +158,19 @@ def parse(token_lines: list[list[Token]], start_node: ASTNode) -> tuple[list[AST
                     raise SyntaxError(f'[FIELD] Aucun embed ouvert ligne {first_token_line.position} !')
                 last_block.fields.append(FieldEmbedNode(tokens_by_line[1:]))
 
+            elif first_token_line.value in ('perm', 'permission'):
+                perm_node = PermissionNode(body=[])
+                var_node = VarNode(tokens_by_line[1], body=[perm_node])
+                last_block.body.append(var_node)
+                _, p = parse(token_lines[pointeur + 1:], perm_node)
+                pointeur += p + 1
+
+            elif first_token_line.value in ('#perm', '#permission'):
+                if not isinstance(last_block, PermissionNode):
+                    raise SyntaxError(f'[#PERM] Aucun permission ouvert ligne {first_token_line.position} !')
+                blocks.pop()
+                return blocks, pointeur
+
         ############################## AUTRE ##############################
 
         elif first_token_line.type == DTT.IDENT:
@@ -271,7 +285,7 @@ def parse_postfix_expression(postfix_tokens: list[Token]) -> list[IdentOperation
     return stack
 
 
-def print_ast(ast: ASTNode, decalage: int = 0):
+def print_ast(ast: list[ASTNode], decalage: int = 0):
     for i in ast:
 
         if isinstance(i, StartNode):

{dshellinterpreter-0.1.2 → dshellinterpreter-0.1.4}/Dshell/_DshellTokenizer/dshell_keywords.py

@@ -14,10 +14,10 @@ dshell_keyword: set[str] = {
     'if', 'else', 'elif', 'loop', '#end', 'var', '#loop', '#if', 'sleep'
 }
 
+
 dshell_discord_keyword: set[str] = {
-    'embed', '#embed', 'field'
+    'embed', '#embed', 'field', 'perm', 'permission', '#perm', '#permission'
 }
-
 dshell_commands: dict[str, Callable] = {
     "sm": dshell_send_message,  # send message
     "dm": dshell_delete_message,

{dshellinterpreter-0.1.2 → dshellinterpreter-0.1.4}/Dshell/_DshellTokenizer/dshell_token_type.py

@@ -14,7 +14,8 @@ class DshellTokenType(Enum):
     INT = auto()
     FLOAT = auto()
     STR = auto()
-    BOOL = auto()
+    BOOL = auto(),
+    NONE = auto(),
     LIST = auto()
     CALL_ARGS = auto()
     DICT = auto()

{dshellinterpreter-0.1.2 → dshellinterpreter-0.1.4}/Dshell/_DshellTokenizer/dshell_tokenizer.py

@@ -29,6 +29,7 @@ table_regex: dict[DTT, Pattern] = {
     DTT.FLOAT: compile(r"(\d+\.\d+)"),
     DTT.INT: compile(r"(\d+)"),
     DTT.BOOL: compile(r"(True|False)", flags=IGNORECASE),
+    DTT.NONE: compile(r"(None)", flags=IGNORECASE),
     DTT.IDENT: compile(rf"([A-Za-z0-9_]+)")
 }
 

{dshellinterpreter-0.1.2 → dshellinterpreter-0.1.4}/PKG-INFO

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

{dshellinterpreter-0.1.2 → dshellinterpreter-0.1.4}/dshellInterpreter.egg-info/PKG-INFO

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

{dshellinterpreter-0.1.2 → dshellinterpreter-0.1.4}/setup.py

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