dshellInterpreter 1.2.7.5__tar.gz → 1.2.7.6__tar.gz

{dshellinterpreter-1.2.7.5 → dshellinterpreter-1.2.7.6}/Dshell/DISCORD_COMMANDS/dshell_file.py

@@ -27,9 +27,6 @@ async def dshell_get_message_files(ctx: Message, message: Union[StrNode, IntNode
 
     attachments_list: ListNode = ListNode([], bypass_limit_elt=True)
 
-    if isinstance(target_message, PartialMessage):
-        target_message = await target_message.fetch()
-
     for attachment in target_message.attachments:
         if attachment.content_type is not None and attachment.content_type.startswith("text/"):
             file = FileNode(name=attachment.filename,
@@ -91,7 +88,7 @@ async def dshell_write_file(ctx: Message,
     _validate_required_bool(append, 'append', 'wf')
     _validate_optional_string(filename, 'filename', 'wf')
 
-    target_file = file if isinstance(file, FileNode) else FileNode(filename if filename is not None else "unnamed_file.txt")
+    target_file = file if isinstance(file, FileNode) else FileNode(filename if filename is not None else StrNode("unnamed_file.txt"))
 
     target_file.description = description if description is not None else target_file.description
     target_file.spoiler = spoiler if spoiler is not None else target_file.spoiler

{dshellinterpreter-1.2.7.5 → dshellinterpreter-1.2.7.6}/Dshell/DshellParser/ast_nodes.py

@@ -1,4 +1,14 @@
-from Dshell.full_import import (Any, randint, Optional, Union, Embed, Member, Role, PermissionOverwrite, getsizeof, Permissions)
+from Dshell.full_import import (
+    Any,
+    randint,
+    Optional,
+    Union,
+    Embed,
+    Member,
+    Role,
+    PermissionOverwrite,
+    getsizeof,
+    Invite)
 from ..DshellTokenizer.dshell_token_type import Token
 from ..DshellInterpreteur.dshell_global_variables import MAX_STR_SIZE, MAX_LIST_SIZE, MAX_FILE_SIZE
 from .errors import *
@@ -9,7 +19,6 @@ __all__ = [
     'IntNode',
     'FloatNode',
     'BoolNode',
-    'LengthNode',
     'StartNode',
     'ElseNode',
     'ElifNode',
@@ -52,8 +61,13 @@ class ASTNode:
     def __getattr__(self, item):
         raise AttributeError(f"'{type(self).__name__}' node has no attribute '{item}'")
 
+class DATANode:
+    """
+    Base class for all Data nodes created during execution
+    """
+
 
-class StrNode(str, ASTNode):
+class StrNode(str, ASTNode, DATANode):
 
     def __new__(cls, value: Any):
         cls.pointer = 0
@@ -115,7 +129,7 @@ class StrNode(str, ASTNode):
     def __repr__(self):
         return StrNode(f"{super().__repr__()}")
 
-class IntNode(int, ASTNode):
+class IntNode(int, ASTNode, DATANode):
     def __new__(cls, value: Union[str, StrNode, int, "IntNode", float, "FloatNode"], base: int = 10):
         if isinstance(value, (int, IntNode, float, FloatNode)):
             return super().__new__(cls, value)
@@ -127,7 +141,7 @@ class IntNode(int, ASTNode):
     def __sizeof__(self):
         return getsizeof(IntNode)
 
-class FloatNode(float, ASTNode):
+class FloatNode(float, ASTNode, DATANode):
     def __new__(cls, value: Union[str, StrNode, float, "FloatNode", int, IntNode]):
         return super().__new__(cls, value)
 
@@ -137,7 +151,7 @@ class FloatNode(float, ASTNode):
     def __sizeof__(self):
         return getsizeof(FloatNode)
 
-class BoolNode(int, ASTNode):
+class BoolNode(int, ASTNode, DATANode):
     def __new__(cls, value: Union[str, StrNode, int, IntNode, bool, "BoolNode"]):
         return super().__new__(cls, int(bool(value)))
 
@@ -396,30 +410,6 @@ class VarNode(ASTNode):
             "body": [token.to_dict() for token in self.body]
         }
 
-class LengthNode(ASTNode):
-    """
-    Node representing the length operation in the AST.
-    """
-
-    def __init__(self, body: Token, line: int):
-        """
-        :param body: list of tokens representing the body of the length operation
-        """
-        super().__init__(line)
-        self.body = body
-
-    def __repr__(self):
-        return StrNode(f"<LENGTH> - {self.body}")
-
-    def to_dict(self):
-        """
-        Convert the LengthNode to a dictionary representation.
-        :return: Dictionary representation of the LengthNode.
-        """
-        return {
-            "type": "LengthNode",
-            "body": self.body.to_dict()
-        }
 
 class EndNode(ASTNode):
     """
@@ -558,6 +548,7 @@ class PermissionNode(ASTNode):
     def __repr__(self):
         return StrNode(f"<PERMISSION> - {self.value}")
 
+
 class SleepNode(ASTNode):
     """
     Node representing a sleep command in the AST.
@@ -841,7 +832,7 @@ class OptionUiSelectNode(ASTNode):
             "body": [token.to_dict() for token in self.body]
         }
 
-class FileNode(ASTNode):
+class FileNode(DATANode):
     def __init__(self, name: Optional[StrNode] = None, description: Optional[StrNode] = None, spoiler: bool = False):
         super().__init__(0)
         self.name = name
@@ -877,7 +868,7 @@ class FileNode(ASTNode):
     def __repr__(self):
         return StrNode(f"<FILE> - {self.name}")
 
-class FileStreamNode(ASTNode):
+class FileStreamNode(DATANode):
 
     def __init__(self, file: FileNode, separator: Optional[StrNode] = None):
         super().__init__(-1)
@@ -927,7 +918,7 @@ class FileStreamNode(ASTNode):
         return self.file.size()
 
 
-class ListNode(ASTNode):
+class ListNode(ASTNode, DATANode):
     """
     Node representing a list structure in the AST.
     Iterable class for browsing lists created from Dshell code.

{dshellinterpreter-1.2.7.5 → dshellinterpreter-1.2.7.6}/Dshell/DshellTokenizer/dshell_tokenizer.py

@@ -115,7 +115,7 @@ class DshellTokenizer:
                     tokens_per_line.append(token)
 
                     if token_type == DTT.STR:
-                        token.value = sub(backslash_pattern, lambda m: escape(m.group(1)), token.value)
+                        token.value = sub(backslash_pattern, r"\1", token.value)
 
                     len_match = len(match.group(0))
                     line = line[:start_match] + MASK_CHARACTER * len_match + line[end_match:]

{dshellinterpreter-1.2.7.5/dshellInterpreter.egg-info → dshellinterpreter-1.2.7.6}/PKG-INFO

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

{dshellinterpreter-1.2.7.5 → dshellinterpreter-1.2.7.6/dshellInterpreter.egg-info}/PKG-INFO

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

{dshellinterpreter-1.2.7.5 → dshellinterpreter-1.2.7.6}/setup.py

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