xmyshell 0.2.12__tar.gz → 0.2.14__tar.gz

{xmyshell-0.2.12/xmyshell.egg-info → xmyshell-0.2.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmyshell
-Version: 0.2.12
+Version: 0.2.14
 Summary: XmyShell is a shell-like tool built on top of prompt_toolkit which provides a persistent Python runtime.
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown

{xmyshell-0.2.12 → xmyshell-0.2.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xmyshell"
-version = "0.2.12"
+version = "0.2.14"
 description = "XmyShell is a shell-like tool built on top of prompt_toolkit which provides a persistent Python runtime."
 readme = "README.md"
 requires-python = ">=3.12"

{xmyshell-0.2.12 → xmyshell-0.2.14}/xmyshell/completer.py

@@ -158,7 +158,10 @@ class ShellCompleter(Completer):
         in_string = in_string or last.startswith('"') or last.startswith("'")
         last = last.lstrip('"\'')
         if last == '~': return  # don't remove this
-        path = os.path.expanduser(last)
+        try:
+            path = os.path.expanduser(shlex.split(last)[0])
+        except (ValueError, IndexError):
+            path = os.path.expanduser(last)
         dirname = os.path.dirname(path) or "."
         prefix = os.path.basename(path).strip('"\'')
 

xmyshell-0.2.14/xmyshell/injection.py

@@ -0,0 +1,42 @@
+from prompt_toolkit.buffer import _only_one_at_a_time, CompletionState
+from prompt_toolkit.application import get_app
+
+
+def _new_text_and_position(self: CompletionState):
+
+    def new_text_and_position() -> tuple[str, int]:
+        """Injected by XmyShell."""
+        if self.complete_index is None:
+            return self.original_document.text, self.original_document.cursor_position
+        else:
+            original_text_before_cursor = self.original_document.text_before_cursor
+            original_text_after_cursor = self.original_document.text_after_cursor
+
+            c = self.completions[self.complete_index]
+            c.text = c.text.rstrip()  # injected
+            if c.start_position == 0:
+                before = original_text_before_cursor
+            else:
+                before = original_text_before_cursor[: c.start_position]
+
+            new_text = before + c.text + original_text_after_cursor
+            new_cursor_position = len(before) + len(c.text)
+            return new_text, new_cursor_position
+    return new_text_and_position
+
+
+def inject() -> None:
+    buffer = get_app().current_buffer
+
+    async_completer = buffer._create_completer_coroutine()
+
+    @_only_one_at_a_time
+    async def _async_completer(*args, **kwargs) -> None:
+        """Injected by XmyShell."""
+        await async_completer(*args, **kwargs)
+        if buffer.complete_state:
+            buffer.complete_state.new_text_and_position = \
+                _new_text_and_position(buffer.complete_state)
+            buffer.complete_state.go_to_index(0)
+
+    buffer._async_completer = _async_completer

{xmyshell-0.2.12 → xmyshell-0.2.14}/xmyshell/kernel.py

@@ -2,6 +2,7 @@ from collections.abc import Generator, Sequence
 from contextlib import contextmanager
 import os
 import sys
+import re
 import runpy
 import subprocess
 import signal
@@ -322,21 +323,31 @@ def xmyshell(cmd_line: str) -> int:
             try:
                 target_dir = os.path.expanduser(target_dir)
                 # only works on Windows
-                if os.name == "nt" and target_dir.startswith("/"):
-                    import re
-
+                if os.name == "nt":
                     if target_dir.startswith("/"):
-                        m = re.match(r"^/([a-zA-Z])/", target_dir)
+                        m = re.match(r"^/([a-zA-Z])(/.*)?$", target_dir)
                         if m:
                             drive = m.group(1).upper()
-                            target_dir = drive + ":/" + target_dir[3:]
-                os.chdir(target_dir)
+                            rest = m.group(2) or ""
+                            target_dir = drive + ":" + rest
+                    target_dir = target_dir.replace("\\", "/")
+                _splited = shlex.split(target_dir)
+                if len(_splited) > 1:
+                    pyerror("too many arguments")
+                    return -1
+                os.chdir(_splited[0])
                 return 0
             except FileNotFoundError:
-                pyerror(f"file not found: '{target_dir}'")
+                pyerror(f"file not found: {target_dir!r}")
                 return -1
             except NotADirectoryError:
-                pyerror(f"not a directory: '{target_dir}'")
+                pyerror(f"not a directory: {target_dir!r}")
+                return -1
+            except PermissionError:
+                pyerror(f"permission denied: {target_dir!r}")
+                return -1
+            except (OSError, ValueError):
+                pyerror(f"wrong path format: {target_dir!r}")
                 return -1
 
         case "source":

{xmyshell-0.2.12 → xmyshell-0.2.14}/xmyshell/main.py

@@ -1,18 +1,26 @@
 from time import time_ns
+
 _start_time = time_ns()
 
+
 import os
-from prompt_toolkit import HTML, PromptSession
+from prompt_toolkit.application import get_app
 from prompt_toolkit.styles import Style
+from prompt_toolkit import HTML, PromptSession
 from prompt_toolkit.history import FileHistory
 from prompt_toolkit.auto_suggest import AutoSuggestFromHistory
 from .meta import WELCOME_MESSAGE
 from .environment import namespace
-from .keybindings import bindings, on_cursor_position_changed, on_text_changed, clean_buffer
+from .keybindings import (
+    bindings,
+    on_cursor_position_changed,
+    on_text_changed,
+    clean_buffer,
+)
 from .init import xmyshell_init
 from .kernel import pyeval, xmyshell
 from .lexer import XmyShellLexer
-
+from .injection import inject
 
 def xmyshell_main() -> None:
     xmyshell_init()
@@ -41,6 +49,7 @@ def xmyshell_main() -> None:
                     completer=namespace["shell_completer"],
                     placeholder=HTML(namespace["prompt_placeholder"]),
                     style=Style.from_dict(namespace["prompt_style"]),
+                    pre_run=inject,
                 )
                 start_time = time_ns()
                 namespace["exit_code"] = xmyshell(cmd_line)

{xmyshell-0.2.12 → xmyshell-0.2.14/xmyshell.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmyshell
-Version: 0.2.12
+Version: 0.2.14
 Summary: XmyShell is a shell-like tool built on top of prompt_toolkit which provides a persistent Python runtime.
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown

{xmyshell-0.2.12 → xmyshell-0.2.14}/xmyshell.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ xmyshell/__main__.py
 xmyshell/completer.py
 xmyshell/environment.py
 xmyshell/init.py
+xmyshell/injection.py
 xmyshell/kernel.py
 xmyshell/keybindings.py
 xmyshell/lexer.py