dshellInterpreter 1.1.3.2__tar.gz → 1.1.3.4__tar.gz

{dshellinterpreter-1.1.3.2 → dshellinterpreter-1.1.3.4}/Dshell/DISCORD_COMMANDS/dshell_member.py

@@ -1,3 +1,5 @@
+from discord import VoiceChannel
+
 from Dshell.full_import import (Message,
                            Embed,
                            MISSING,
@@ -338,7 +340,7 @@ async def dshell_check_permissions(ctx: Message, permissions, member=None):
     return False
 
 
-async def dshell_move_member(ctx: Message, member=None, channel=None, disconnect: bool = False, reason=None):
+async def dshell_move_member(ctx: Message, channel=None, member=None, disconnect: bool = False, reason=None):
     """
     Déplace un membre vers un autre canal vocal ou le déconnecte.
     

{dshellinterpreter-1.1.3.2 → dshellinterpreter-1.1.3.4}/Dshell/DISCORD_COMMANDS/utils/utils_list.py

@@ -1,4 +1,5 @@
 __all__ = [
+    "utils_convert_to_list",
     "utils_list_add",
     "utils_list_remove",
     "utils_list_clear",
@@ -9,11 +10,44 @@ __all__ = [
     "utils_list_get_value",
 ]
 
-from ...DshellParser.ast_nodes import ListNode
-
+from ...DshellParser.ast_nodes import ListNode, UiButtonNode, UiSelectNode, CodeNode
+from ...full_import import Any, Union
 from .utils_type_validation import (_validate_required_list_node,
                                     _validate_required_int,
-                                    _validate_required_bool)
+                                    _validate_required_bool,
+                                    _validate_optional_bool)
+
+async def utils_convert_to_list(ctx,
+                                value: Union[str, int, float, UiButtonNode, UiSelectNode, CodeNode],
+                                split: bool = False):
+    """
+    Make a list with any value
+    :param ctx:
+    :param value:
+    :param split: split the value into list
+    :return:
+    """
+    _CMD = 'list'
+    _validate_optional_bool(split, "split", _CMD)
+
+    if isinstance(value, str):
+        if split:
+            return ListNode([i for i in value])
+        return ListNode([value])
+
+    elif isinstance(value, int):
+        if split:
+            l = ListNode([])
+            while value != 0:
+                l.add(value % 10)
+                value //= 10
+            return l
+        return ListNode([value])
+
+    else:
+        return ListNode([value])
+
+
 
 async def utils_list_add(ctx, value: ListNode, *elements):
     """

{dshellinterpreter-1.1.3.2 → dshellinterpreter-1.1.3.4}/Dshell/DshellTokenizer/dshell_keywords.py

@@ -38,6 +38,7 @@ dshell_commands: dict[str, Callable] = {
     'random': utils_random,
 
     ## List utils
+    'list': utils_convert_to_list,
     'length': utils_len,
     'len': utils_len,
     'add': utils_list_add,
@@ -185,6 +186,7 @@ dshell_logical_word_operators: dict[str, tuple[Callable, int, int]] = {
 
 dshell_logical_operators: dict[str, tuple[Callable, int, int]] = {
 
+    r"==": (lambda a, b: a == b, 4, 2),
     r"<=": (lambda a, b: a <= b, 4, 2),
     r"=<": (lambda a, b: a <= b, 4, 2),
     r"!=": (lambda a, b: a != b, 4, 2),

{dshellinterpreter-1.1.3.2 → dshellinterpreter-1.1.3.4}/Dshell/DshellTokenizer/dshell_tokenizer.py

@@ -113,21 +113,25 @@ class DshellTokenizer:
 
             for token_type, pattern in table_regex.items():  # iterate the regex table to test all patterns on the line
 
+                if is_comment:
+                    is_comment = False
+                    break
+
                 if is_line_empty(line):
                     break
 
                 if not self.match_any_character and token_type == DTT.ANY_CHARACTER:
                     continue
 
-                if is_comment:
-                    is_comment = False
-                    break
-
                 for match in finditer(pattern, line):  # iterate the match results to get their positions
 
                     if token_type == DTT.COMMENT:  # if we encounter a comment, stop tokenizing the line
-                        is_comment = True
-                        break
+                        if len(match.group(0)) == len(line):
+                            is_comment = True
+                            break
+                        else:
+                            line = line[:match.start()]
+                            continue
 
                     start_match = match.start()  # start position of the match
 

{dshellinterpreter-1.1.3.2/dshellInterpreter.egg-info → dshellinterpreter-1.1.3.4}/PKG-INFO

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

{dshellinterpreter-1.1.3.2 → dshellinterpreter-1.1.3.4/dshellInterpreter.egg-info}/PKG-INFO

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

{dshellinterpreter-1.1.3.2 → dshellinterpreter-1.1.3.4}/setup.py

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