liveConsole 1.7.0__tar.gz → 1.7.2__tar.gz

{liveconsole-1.7.0/src/liveConsole.egg-info → liveconsole-1.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: liveConsole
-Version: 1.7.0
+Version: 1.7.2
 Summary: An IDLE-like debugger to allow for real-time command injection for debugging and testing python code
 Author-email: Tzur Soffer <tzur.soffer@gmail.com>
 License: MIT

{liveconsole-1.7.0 → liveconsole-1.7.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "liveConsole"
-version = "1.7.0"
+version = "1.7.2"
 description = "An IDLE-like debugger to allow for real-time command injection for debugging and testing python code"
 authors = [{ name="Tzur Soffer", email="tzur.soffer@gmail.com" }]
 license = {text = "MIT"}

{liveconsole-1.7.0 → liveconsole-1.7.2/src/liveConsole.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: liveConsole
-Version: 1.7.0
+Version: 1.7.2
 Summary: An IDLE-like debugger to allow for real-time command injection for debugging and testing python code
 Author-email: Tzur Soffer <tzur.soffer@gmail.com>
 License: MIT

{liveconsole-1.7.0 → liveconsole-1.7.2}/src/pysole/pysole.py

@@ -39,8 +39,9 @@ class InteractiveConsole(ctk.CTk):
     """Main console window application."""
 
     def __init__(self, userGlobals=None, userLocals=None, callerFrame=None,
-                 defaultSize=None, primaryPrompt=None,
-                 runRemainingCode=False, printStartupCode=True):
+                 defaultSize=None, primaryPrompt=None, font=None, fontSize=None,
+                 runRemainingCode=False, printStartupCode=False,
+                 removeWaterMark=False):
         super().__init__()
         with open(settingsPath, "r") as f:
             settings = json.load(f)
@@ -52,6 +53,10 @@ class InteractiveConsole(ctk.CTk):
             self.BEHAVIOR["PRIMARY_PROMPT"] = primaryPrompt
         if defaultSize != None:
             self.BEHAVIOR["DEFAULT_SIZE"] = defaultSize
+        if font != None:
+            self.FONT["FONT"] = font
+        if fontSize != None:
+            self.FONT["FONT_SIZE"] = fontSize
 
         self.title("Live Interactive Console")
         self.geometry(self.BEHAVIOR["DEFAULT_SIZE"])
@@ -79,7 +84,10 @@ class InteractiveConsole(ctk.CTk):
         self._setupOutputRedirect()
         self._setupInputRedirect()
         
+        self.runRemainingCode = runRemainingCode
         self.printStartupCode = printStartupCode
+        self.leadingWhitespaceLen = 0
+        self.removeWaterMark = removeWaterMark
         self.startupCode = ()
         if runRemainingCode:
             code_obj = callerFrame.f_code
@@ -89,8 +97,10 @@ class InteractiveConsole(ctk.CTk):
             with open(filename, "r", encoding="utf-8") as f:
                 lines = f.readlines()
 
-            startLine = callerFrame.f_lineno
-            self.startupCode = lines[startLine:]
+            startLineIndex = callerFrame.f_lineno
+            startLine = lines[startLineIndex - 1]
+            self.leadingWhitespaceLen = len(startLine) - len(startLine.lstrip())
+            self.startupCode = lines[startLineIndex:]
 
     def _createMenu(self):
         """Create a menu bar using CTkOptionMenu."""
@@ -254,10 +264,27 @@ class InteractiveConsole(ctk.CTk):
     def probe(self, *args, **kwargs):
         """Start the console main loop."""
         def runStartup():
-            self.console.newline()
-            self.console.writeOutput("Welcome to Pysole, if you find me useful, please star me on github:\nhttps://github.com/TzurSoffer/Pysole", "instruction")
+            if not self.removeWaterMark:
+                m = (
+                    "Welcome to Pysole, if you find me useful, please star me on GitHub:\n"
+                    "https://github.com/TzurSoffer/Pysole"
+                )
+                stdPrint(m)
+                self.console.newline()
+                self.console.writeOutput(m, "instruction")
+                time.sleep(0.1)
+                if self.runRemainingCode:
+                    if self.printStartupCode:
+                        self.console.addPrompt()
+                    else:
+                        self.console.newline()
+                else:
+                    self.console.addPrompt()
+            elif self.runRemainingCode == True and self.printStartupCode == False:
+                self.console.newline()
+
             for line in self.startupCode:
-                line = line.rstrip()
+                line = line.rstrip()[self.leadingWhitespaceLen:]
                 while self.console.isExecuting:
                     time.sleep(0.01)
                 if self.printStartupCode:
@@ -265,13 +292,14 @@ class InteractiveConsole(ctk.CTk):
                 else:
                     self.console.runCommand(line, printCommand=False)
 
-            if self.printStartupCode == False:
+            if self.runRemainingCode == True and self.printStartupCode == False:
                 self.console.resetCurrentLineNumber()
                 self.console.addPrompt()
         threading.Thread(target=runStartup).start()
         self.mainloop(*args, **kwargs)
 
-def probe(userGlobals=None, userLocals=None, callerFrame=None, runRemainingCode=False, printStartupCode=False, **kwargs):
+def probe(userGlobals=None, userLocals=None, callerFrame=None,
+          runRemainingCode=False, printStartupCode=False, **kwargs):
     if callerFrame == None:
         callerFrame = inspect.currentframe().f_back
     InteractiveConsole(userGlobals=userGlobals,