dshellInterpreter 1.2.0.3__tar.gz → 1.2.0.5__tar.gz

{dshellinterpreter-1.2.0.3 → dshellinterpreter-1.2.0.5}/Dshell/DISCORD_COMMANDS/dshell_file.py

@@ -1,5 +1,6 @@
+
 from ..full_import import Message, Union, PartialMessage, Optional
-from ..DshellParser.ast_nodes import ListNode, FileNode, StrNode, BoolNode, IntNode
+from ..DshellParser.ast_nodes import ListNode, FileNode, StrNode, BoolNode, IntNode, FileStreamNode
 
 from .utils.utils_message import utils_get_message
 from .utils.utils_type_validation import (_validate_required_file_node,
@@ -11,6 +12,7 @@ __all__ = [
     "dshell_get_message_files",
     "dshell_write_file",
     "dshell_read_file",
+    "dshell_stream_file"
 ]
 
 async def dshell_get_message_files(ctx: Message, message: Union[StrNode, IntNode]) -> ListNode:
@@ -50,6 +52,25 @@ async def dshell_read_file(ctx: Message, file: FileNode) -> StrNode:
 
     return StrNode(file.read())
 
+async def dshell_stream_file(ctx: Message, file: FileNode, separator: Optional[StrNode] = None) -> FileStreamNode:
+    """
+    Stream le contenue d'un fichier. Si un séparateur est passé en paramètre,
+    le stream s'arrêtera à chaque fois que le séparateur est rencontré, sinon il streamera ligne par ligne
+    (MAX_STR_SIZE de la str max renvoyé)
+    :param ctx:
+    :param file:
+    :param separator:
+    :return:
+    """
+
+    _validate_optional_string(separator, 'separator', 'sf')
+
+    if separator is not None and len(separator) > 1:
+        raise Exception(f"Separator in stream file must be a single character, not '{separator}' !")
+
+    return file.stream(separator)
+
+
 async def dshell_write_file(ctx: Message,
                             message: StrNode,
                             append: BoolNode = BoolNode(False),

{dshellinterpreter-1.2.0.3 → dshellinterpreter-1.2.0.5}/Dshell/DshellInterpreteur/dshell_global_variables.py

@@ -2,6 +2,7 @@ from sys import getsizeof
 
 MAX_STR_SIZE = 10_000 # bytes
 MAX_LIST_SIZE = 500_000 # bytes
+MAX_FILE_SIZE = 1_000_000 # bytes
 # Constants for sleep time limits
 MAX_SLEEP_TIME_SECONDS = 3_600  # 1 hour
 MIN_SLEEP_TIME_SECONDS = 1

{dshellinterpreter-1.2.0.3 → dshellinterpreter-1.2.0.5}/Dshell/DshellInterpreteur/dshell_interpreter.py

@@ -3,7 +3,7 @@ from ..DshellTokenizer.dshell_token_type import DshellTokenType as DTT
 from ..DshellInterpreteur.errors import DshellInterpreterStopExecution
 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, Embed
+from Dshell.full_import import AutoShardedBot, Interaction, Message, PrivateChannel
 from ..DshellParser.dshell_parser import parse, print_ast
 from ..DshellTokenizer.dshell_tokenizer import DshellTokenizer
 from .cached_messages import dshell_cached_messages
@@ -150,6 +150,7 @@ class DshellInterpreteur:
             self.env.set(node.variable.name.value, i)
             await self.execute(node.body)
 
+
     async def _execute_var_node(self, node: VarNode):
         """Execute a variable assignment node."""
         first_node = node.body[0]
@@ -353,19 +354,43 @@ class DshellIterator:
     """
 
     def __init__(self, data):
-        self.data = data if isinstance(data, (StrNode, list, ListNode)) else range(int(data))
+        self.data = self._check_data(data)
         self.current = 0
 
     def __iter__(self):
         return self
 
     def __next__(self):
-        if self.current >= len(self.data):
-            self.current = 0
-            raise StopIteration
+        return next(self.data)
+
+    def _check_data(self, data: Any):
+
+        if not isinstance(data, (StrNode, ListNode, FloatNode, IntNode, FileNode, FileStreamNode)):
+            raise Exception(f"{data} can't be in a loop !")
+
+        if isinstance(data, FileNode):
+            return data.stream()
+
+        elif isinstance(data, (FloatNode, IntNode)):
+            return IntIterator(IntNode(data))
 
-        value = self.data[self.current]
-        self.current += 1
-        return value
+        else:
+            return data
+
+class IntIterator:
+
+    def __init__(self, max_iterator: IntNode):
+        self.max_iterator = max_iterator
+        self.pointer = IntNode(0)
 
+    def __iter__(self) -> "IntIterator":
+        return self
+
+    def __next__(self) -> IntNode:
+        if self.pointer >= self.max_iterator:
+            self.pointer = IntNode(0)
+            raise StopIteration
 
+        current = self.pointer
+        self.pointer += 1
+        return current

{dshellinterpreter-1.2.0.3 → dshellinterpreter-1.2.0.5}/Dshell/DshellParser/ast_nodes.py

@@ -1,6 +1,6 @@
 from Dshell.full_import import (Any, randint, Optional, Union, Embed, Member, Role, PermissionOverwrite)
 from ..DshellTokenizer.dshell_token_type import Token
-from ..DshellInterpreteur.dshell_global_variables import MAX_STR_SIZE, MAX_LIST_SIZE
+from ..DshellInterpreteur.dshell_global_variables import MAX_STR_SIZE, MAX_LIST_SIZE, MAX_FILE_SIZE
 
 from sys import getsizeof
 
@@ -36,7 +36,8 @@ __all__ = [
     'UiSelectNode',
     'OptionUiSelectNode',
     'ScanNode',
-    'FileNode'
+    'FileNode',
+    'FileStreamNode'
 ]
 
 
@@ -54,8 +55,17 @@ class ASTNode:
 class StrNode(str, ASTNode):
 
     def __new__(cls, value: Any):
+        cls.pointer = 0
         return super().__new__(cls, value)
 
+    def __next__(self):
+        if self.pointer >= len(self):
+            raise StopIteration
+
+        current = self[self.pointer]
+        self.pointer += 1
+        return current
+
     def __len__(self):
         return IntNode(super().__len__())
 
@@ -791,8 +801,8 @@ class FileNode(ASTNode):
 
     def write(self, content: bytearray, append: bool):
 
-        if self.size() + len(content) > 5 * 1024:
-            raise Exception("The file content cannot exceed 5 Ko !")
+        if self.size() + len(content) > MAX_FILE_SIZE:
+            raise Exception(f"The file content cannot exceed {MAX_FILE_SIZE} bytes !")
 
         if append:
             self.content += content
@@ -802,6 +812,10 @@ class FileNode(ASTNode):
     def read(self):
         return self.content.decode(encoding="utf-8", errors="ignore")
 
+    def stream(self, separator: Optional[StrNode] = None):
+        return FileStreamNode(self, separator)
+
+
     def size(self):
         return len(self.read())
 
@@ -811,6 +825,50 @@ class FileNode(ASTNode):
     def __sizeof__(self):
         return self.size()+getsizeof(FileNode)
 
+class FileStreamNode(ASTNode):
+
+    def __init__(self, file: FileNode, separator: Optional[StrNode] = None):
+        super().__init__(-1)
+        self.file: FileNode = file
+        self.content: str = file.read()
+        self.separator: Optional[StrNode] = separator
+        self.pointer: int = 0
+
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+
+        if self.pointer >= len(self.content):
+            self.pointer = 0
+            raise StopIteration()
+
+        buffer = ""
+
+        if self.separator is None:
+
+            while self.pointer < len(self.content) and self.content[self.pointer] != "\n":
+                if len(buffer.encode('utf-8', errors="ignore")) + len(
+                        self.content[self.pointer].encode('utf-8', errors="ignore")) > MAX_STR_SIZE:
+                    return StrNode(buffer)
+
+                buffer += self.content[self.pointer]
+                self.pointer += 1
+
+            self.pointer += 1  # Skip the newline character
+            return StrNode(buffer)
+
+        while self.pointer < len(self.content) and self.content[self.pointer] != self.separator:
+            if len(buffer.encode('utf-8', errors="ignore")) + len(
+                    self.content[self.pointer].encode('utf-8', errors="ignore")) > MAX_STR_SIZE:
+                return StrNode(buffer)
+
+            buffer += self.content[self.pointer]
+            self.pointer += 1
+        self.pointer += 1  # Skip the newline character
+        return StrNode(buffer)
+
+
 class ListNode(ASTNode):
     """
     Node representing a list structure in the AST.

{dshellinterpreter-1.2.0.3 → dshellinterpreter-1.2.0.5}/Dshell/DshellTokenizer/dshell_keywords.py

@@ -85,6 +85,7 @@ dshell_commands: dict[str, Callable] = {
 
     ## Files
     "rf": dshell_read_file,
+    "sf": dshell_stream_file,
     "wf": dshell_write_file,
     "gmfs": dshell_get_message_files,
 

{dshellinterpreter-1.2.0.3 → dshellinterpreter-1.2.0.5}/Dshell/full_import.py

@@ -1,5 +1,5 @@
 from asyncio import sleep
-from typing import TypeVar, Optional, Callable, Union, Any, TYPE_CHECKING
+from typing import *
 from copy import deepcopy
 from pycordViews import EasyModifiedViews, SelectMenu
 from pycordViews.views.errors import CustomIDNotFound

{dshellinterpreter-1.2.0.3/dshellInterpreter.egg-info → dshellinterpreter-1.2.0.5}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dshellInterpreter
-Version: 1.2.0.3
+Version: 1.2.0.5
 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.3 → dshellinterpreter-1.2.0.5}/setup.py

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