dshellInterpreter 1.2.0.21__tar.gz → 1.2.1.0__tar.gz

{dshellinterpreter-1.2.0.21 → dshellinterpreter-1.2.1.0}/Dshell/DISCORD_COMMANDS/dshell_channel.py

@@ -75,12 +75,15 @@ async def dshell_get_channels(ctx: Message, name: Optional[StrNode]=None, regex:
     channels = ListNode([])
 
     for channel in ctx.channel.guild.channels:
-        if name is not None and channel.name == StrNode(name):
+        if name is not None and channel.name == name:
             channels.add(IntNode(channel.id))
 
         elif regex is not None and search(regex, channel.name):
             channels.add(IntNode(channel.id))
 
+        else:
+            channels.add(IntNode(channel.id))
+
     return channels
 
 async def dshell_get_channels_in_category(ctx: Message,
@@ -155,13 +158,15 @@ async def dshell_create_text_channel(ctx: Message,
 
     channel_category = ctx.channel.category if category is None else ctx.channel.guild.get_channel(category)
 
+    final_permissions = permissions.value if not isinstance(permissions, _MissingSentinel) else permissions
+
     created_channel = await ctx.guild.create_text_channel(str(name),
                                                           category=channel_category,
                                                           position=position,
                                                           slowmode_delay=slowmode,
                                                           topic=topic,
                                                           nsfw=nsfw,
-                                                          overwrites=permissions.value,
+                                                          overwrites=final_permissions,
                                                           reason=reason)
 
     return IntNode(created_channel.id)
@@ -193,19 +198,21 @@ async def dshell_create_voice_channel(ctx: Message,
 
     channel_category = ctx.channel.category if category is None else ctx.channel.guild.get_channel(category)
 
+    final_permissions = permissions.value if not isinstance(permissions, _MissingSentinel) else permissions
+
     created_channel = await ctx.guild.create_voice_channel(StrNode(name),
                                                            category=channel_category,
                                                            position=position,
                                                            bitrate=bitrate,
-                                                           overwrites=permissions.value,
+                                                           overwrites=final_permissions,
                                                            reason=reason)
 
     return IntNode(created_channel.id)
 
 
 async def dshell_delete_channel(ctx: Message,
-                                channel=None,
-                                reason=None,
+                                channel: Optional[IntNode]=None,
+                                reason: Optional[StrNode]=None,
                                 timeout: FloatNode = FloatNode(0)):
     """
     Deletes a channel.
@@ -285,7 +292,7 @@ async def dshell_edit_text_channel(ctx: Message,
     _validate_optional_string(reason, "Reason", _CMD)
 
     channel_to_edit = ctx.channel if channel is None else ctx.channel.guild.get_channel(channel)
-    new_categoy = ctx.channel.category if isinstance(category, _MissingSentinel) else ctx.channel.guild.get_channel(category)
+    new_categoy = ctx.channel.category if category is MISSING else ctx.channel.guild.get_channel(category)
 
     if channel_to_edit is None:
         raise Exception(f"Channel {channel} not found !")
@@ -303,13 +310,13 @@ async def dshell_edit_text_channel(ctx: Message,
 
 
 async def dshell_edit_voice_channel(ctx: Message,
-                                    channel=None,
+                                    channel: Optional[IntNode]=None,
                                     name: Optional[StrNode]=None,
                                     category: IntNode = MISSING,
                                     position: IntNode = MISSING,
                                     bitrate: IntNode = MISSING,
                                     permissions: PermissionNode = MISSING,
-                                    reason=None):
+                                    reason: Optional[StrNode]=None):
     """
     Edits a voice channel on the server
     """
@@ -330,7 +337,7 @@ async def dshell_edit_voice_channel(ctx: Message,
     _validate_optional_string(reason, "Reason", _CMD)
 
     channel_to_edit = ctx.channel if channel is None else ctx.channel.guild.get_channel(channel)
-    new_categoy = ctx.channel.category if isinstance(category, _MissingSentinel) else ctx.channel.guild.get_channel(category)
+    new_categoy = ctx.channel.category if category is MISSING else ctx.channel.guild.get_channel(category)
 
     if channel_to_edit is None:
         raise Exception(f"Channel {channel} not found !")
@@ -356,7 +363,7 @@ async def dshell_create_thread_message(ctx: Message,
 
     _CMD = "ct"
 
-    message = ctx if message is None else await utils_get_message(ctx, message)
+    final_message = ctx if message is None else await utils_get_message(ctx, message)
 
     _validate_required_string(name, "Name", _CMD)
 
@@ -372,7 +379,7 @@ async def dshell_create_thread_message(ctx: Message,
     if isinstance(slowmode, IntNode) and slowmode < 0:
         raise Exception("Slowmode delay must be a positive integer !")
 
-    thread = await message.create_thread(name=name,
+    thread = await final_message.create_thread(name=name,
                     auto_archive_duration=archive,
                     slowmode_delay=slowmode)
 
@@ -394,7 +401,7 @@ async def dshell_edit_thread(ctx: Message,
     if thread is None:
         raise Exception("Thread must be specified !")
 
-    thread = await utils_get_thread(ctx, thread)
+    final_thread = await utils_get_thread(ctx, thread)
 
     _validate_missing_or_type(name, "Name", StrNode, _CMD)
 
@@ -410,12 +417,12 @@ async def dshell_edit_thread(ctx: Message,
     if isinstance(slowmode, IntNode) and slowmode < 0:
         raise Exception("Slowmode delay must be a positive integer !")
 
-    await thread.edit(name=name if name is not None else thread.name,
+    await final_thread.edit(name=name if name is not None else thread.name,
                       auto_archive_duration=archive if archive is not MISSING else thread.auto_archive_duration,
                       slowmode_delay=slowmode if slowmode is not MISSING else thread.slowmode_delay,
                       reason=reason)
 
-    return IntNode(thread.id)
+    return IntNode(final_thread.id)
 
 
 async def dshell_get_thread(ctx: Message, message: Optional[Union[IntNode, StrNode]] = None):
@@ -425,13 +432,13 @@ async def dshell_get_thread(ctx: Message, message: Optional[Union[IntNode, StrNo
 
     _CMD = "gt"
 
-    message = ctx if message is None else await utils_get_message(ctx, message)
+    final_message = ctx if message is None else await utils_get_message(ctx, message)
 
     # Return None if message doesn't have thread attribute (not raising error for this case)
     if not hasattr(message, 'thread'):
         return None
 
-    thread = message.thread
+    thread = final_message.thread
 
     if thread is None:
         return None
@@ -486,7 +493,7 @@ async def dshell_create_category(ctx: Message,
     return IntNode(created_category.id)
 
 async def dshell_edit_category(ctx: Message,
-                                category,
+                                category: IntNode,
                                 name: Optional[StrNode]=None,
                                 position=MISSING,
                                 permissions: PermissionNode = MISSING,

{dshellinterpreter-1.2.0.21 → dshellinterpreter-1.2.1.0}/Dshell/DshellInterpreteur/dshell_interpreter.py

@@ -1,6 +1,6 @@
 from ..DshellTokenizer.dshell_token_type import Token
 from ..DshellTokenizer.dshell_token_type import DshellTokenType as DTT
-from ..DshellInterpreteur.errors import DshellInterpreterStopExecution
+from ..DshellInterpreteur.errors import DshellInterpreterStopExecution, DshellInterpreterError
 from Dshell.full_import import TypeVar, Union, Optional, Any, Callable, sleep, findall
 from ..DshellParser.ast_nodes import *
 from Dshell.full_import import AutoShardedBot, Interaction, Message, PrivateChannel
@@ -120,6 +120,7 @@ class DshellInterpreteur:
             print_ast(self.ast)
 
         self.raise_error = False
+        self.end_program: bool = False
 
     async def _execute_command_node(self, node: CommandNode):
         """Execute a command node."""
@@ -155,6 +156,9 @@ class DshellInterpreteur:
                 self.env.set('__break__', BoolNode(0))
                 break
 
+            if self.end_program:
+                break
+
     async def _execute_break_node(self, node: BreakNode):
         """Execute a break node."""
         self.env.set('__break__', BoolNode(1))
@@ -223,9 +227,14 @@ class DshellInterpreteur:
 
         for node in ast:
 
+            # cut the current program if an EndNode is encountred with the parameter "error_message" to False
+            if self.end_program:
+                return
+
             try:
                 if isinstance(node, StartNode):
                     await self.execute(node.body)
+                    return
 
                 if isinstance(node, CommandNode):
                     await self._execute_command_node(node)
@@ -260,7 +269,7 @@ class DshellInterpreteur:
                     if await self.eval_data_token(node.error_message):
                         raise RuntimeError("Execution stopped - EndNode encountered")
                     else:
-                        raise DshellInterpreterStopExecution("Execution stopped without error")
+                        self.end_program = True
 
             except Exception as e:
                 if not self.raise_error:

{dshellinterpreter-1.2.0.21 → dshellinterpreter-1.2.1.0}/Dshell/DshellParser/ast_nodes.py

@@ -35,7 +35,6 @@ __all__ = [
     'UiButtonNode',
     'UiSelectNode',
     'OptionUiSelectNode',
-    'ScanNode',
     'FileNode',
     'FileStreamNode'
 ]
@@ -337,26 +336,6 @@ class ArgsCommandNode(ASTNode):
             "body": [token.to_dict() for token in self.body]
         }
 
-class ScanNode(ASTNode):
-    """
-    Node representing a scan message in the AST
-    """
-    def __init__(self, body: ArgsCommandNode, line: int):
-        super().__init__(line)
-        self.body = body
-
-    def __repr__(self):
-        return StrNode(f"<SCAN> - {self.body}")
-
-    def to_dict(self):
-        """
-        Convert the ScanNode to a dictionary representation.
-        :return: Dictionary representation of the ScanNode.
-        """
-        return {
-            "type": "ScanNode",
-            "body": self.body.to_dict()
-        }
 
 class CommandNode(ASTNode):
     """

{dshellinterpreter-1.2.0.21 → dshellinterpreter-1.2.1.0}/Dshell/DshellParser/dshell_parser.py

@@ -221,18 +221,14 @@ def parse(token_lines: list[list[Token]], start_node: ASTNode) -> tuple[list[AST
                 return_node = ReturnNode(body=tokens_by_line[1:], line=line)
                 last_block.body.append(return_node)
 
-            elif first_token_line.value == 'scan':
-                scan_node = ScanNode(ArgsCommandNode(body=tokens_by_line[1:], line=line), line=line)
-                last_block.body.append(scan_node)
-
             elif first_token_line.value == '#end':  # node pour arrêter le programme si elle est rencontré
-                error_message = True
+                error_message = BoolNode(1)
                 if len_tokens_by_line_since_command_name > 0:
                     if tokens_by_line[1].type != DTT.BOOL:
                         raise TypeError(f'[#END] the variable given must be a boolean, not {tokens_by_line[1].type}')
                     else:
                         error_message = tokens_by_line[1]
-                end_node = EndNode(error_message)
+                end_node = EndNode(line=line, error_message=error_message)
                 last_block.body.append(end_node)
 
         ############################## DISCORD KEYWORDS ##############################

{dshellinterpreter-1.2.0.21 → dshellinterpreter-1.2.1.0}/Dshell/DshellTokenizer/dshell_keywords.py

@@ -11,7 +11,6 @@ __all__ = [
 from ..DISCORD_COMMANDS import *
 
 from Dshell.full_import import Callable
-from ..DISCORD_COMMANDS.dshell_file import dshell_read_file, dshell_write_file, dshell_get_message_files
 
 dshell_keyword: set[str] = {
     'if', 'else', 'elif', 'loop', '#end', 'var', '#loop', '#if', 'sleep', 'param', '#param', 'code', '#code', 'eval', 'return', 'break'
@@ -184,6 +183,8 @@ dshell_mathematical_operators: dict[str, tuple[Callable, int, int, int]] = {
     r"%": (lambda a, b: a % b, 7, 2, 2),
     r"-": (lambda a, b=None: a-b if b is not None else -a, 6, 1, 2),
     r"+": (lambda a, b: a + b, 6, 2, 2),
+    r"..": (lambda a, b: ListNode([IntNode(i) for i in range(IntNode(a), IntNode(b))])
+                if a <= b else ListNode([IntNode(i) for i in range(IntNode(a), IntNode(b), -1)]), 5, 2, 2)
     # warning: ambiguity between unary and binary to be handled in your parser
 
 }

{dshellinterpreter-1.2.0.21/dshellInterpreter.egg-info → dshellinterpreter-1.2.1.0}/PKG-INFO

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

{dshellinterpreter-1.2.0.21 → dshellinterpreter-1.2.1.0/dshellInterpreter.egg-info}/PKG-INFO

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

{dshellinterpreter-1.2.0.21 → dshellinterpreter-1.2.1.0}/setup.py

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