wizlib 3.3.3__tar.gz → 3.3.4__tar.gz

{wizlib-3.3.3 → wizlib-3.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: wizlib
-Version: 3.3.3
+Version: 3.3.4
 Summary: Framework for flexible and powerful command-line applications
 License: MIT
 Author: Steampunk Wizard

{wizlib-3.3.3 → wizlib-3.3.4}/pyproject.toml

@@ -1,10 +1,10 @@
 [tool.poetry]
 name = "wizlib"
-version = "3.3.3"
+version = "3.3.4"
 description = "Framework for flexible and powerful command-line applications"
 authors = ["Steampunk Wizard <wizlib@steampunkwizard.ca>"]
 license = "MIT"
-readme = "README.md"
+readme = "PACKAGE.md"
 
 [tool.poetry.dependencies]
 python = ">=3.11,<3.12"

{wizlib-3.3.3 → wizlib-3.3.4}/wizlib/io.py

@@ -6,6 +6,7 @@ import sys
 import readchar
 
 from wizlib.parser import WizArgumentError
+from wizlib.ui.shell import ESC
 
 
 ISATTY = all(s.isatty() for s in (sys.stdin, sys.stdout, sys.stderr))
@@ -19,9 +20,13 @@ def stream():
     return '' if ISATTY else sys.stdin.read()
 
 
-def ttyin():
+def ttyin():  # pragma: nocover
     if ISATTY:
-        return readchar.readkey()
+        key = readchar.readkey()
+        # Handle specialized escape sequences
+        if key == ESC + '[1;':
+            key = key + readchar.readkey() + readchar.readkey()
+        return key
     else:
         raise WizArgumentError(
             'Command designed for interactive use')

{wizlib-3.3.3 → wizlib-3.3.4}/wizlib/ui/shell/__init__.py

@@ -38,3 +38,9 @@ class S(StrEnum):
     MAGENTA = ESC + '[35m'
     CYAN = ESC + '[36m'
     CLEAR = ESC + '[2J'
+
+    # Alternative keys that can be configured in a terminal emulator
+    CUSTOM_END = ESC + '[1;5C'
+    CUSTOM_BEGINNING = ESC + '[1;5D'
+    CUSTOM_RIGHTWORD = ESC + '[1;9C'
+    CUSTOM_LEFTWORD = ESC + '[1;9D'

{wizlib-3.3.3 → wizlib-3.3.4}/wizlib/ui/shell/line_editor.py

@@ -92,10 +92,7 @@ class ShellLineEditor:  # pragma: nocover
             if key == S.RETURN:
                 break
             if key.isprintable():
-                write(S.BOLD + key + self.buf[self.pos:] +
-                      ('\b' * (len(self.buf) - self.pos)) + S.RESET)
-                self.buf = self.buf[:self.pos] + key + self.buf[self.pos:]
-                self.pos += 1
+                self.write_key(key)
                 self.fillstate = FillState.USER
             elif (key in [S.BACKSPACE, S.KILL]) and self.has_fill:
                 # Backspace clears the fill
@@ -113,13 +110,13 @@ class ShellLineEditor:  # pragma: nocover
             elif key == S.RIGHT and self.pos < len(self.buf):
                 self.move_right()
                 self.fillstate = FillState.USER
-            elif key == S.BEGINNING and self.pos > 0:
+            elif (key in [S.BEGINNING, S.CUSTOM_BEGINNING]) and self.pos > 0:
                 self.move_beginning()
                 self.fillstate = FillState.USER
-            elif key == S.END and self.has_fill:
+            elif (key in [S.END, S.CUSTOM_END]) and self.has_fill:
                 self.accept_fill()
                 self.fillstate = FillState.USER
-            elif key == S.END and self.pos < len(self.buf):
+            elif (key in [S.END, S.CUSTOM_END]) and self.pos < len(self.buf):
                 self.move_end_buf()
                 self.fillstate = FillState.USER
             elif key == S.TAB and (choices := self.valid_choices):
@@ -128,13 +125,25 @@ class ShellLineEditor:  # pragma: nocover
             elif key == S.SHIFT_TAB and self.index > -1:
                 self.index = (self.index - 1) % len(self.valid_choices)
                 self.fillstate = FillState.TAB
-            elif key == S.LEFT_WORD and self.pos > 0:
+            elif (key in [S.LEFT_WORD, S.CUSTOM_LEFTWORD]) and self.pos > 0:
                 while (self.pos > 0) and self.is_sep(self.pos - 1):
                     self.move_left()
                 while (self.pos > 0) and not self.is_sep(self.pos - 1):
                     self.move_left()
                 self.fillstate = FillState.USER
-            elif key == S.RIGHT_WORD and self.pos < len(self.buf):
+            elif (key in [S.RIGHT_WORD, S.CUSTOM_RIGHTWORD]) and self.has_fill:
+                fill = self.fill
+                self.fillstate = FillState.USER
+                while fill:
+                    char = fill[0]
+                    self.write_key(char)
+                    fill = fill[1:]
+                    if char in S.SEPARATORS:
+                        self.fillstate = FillState.TAB
+                        self.index = self.valid_choices.index(self.buf + fill)
+                        break
+            elif (key in [S.RIGHT_WORD, S.CUSTOM_RIGHTWORD]) and \
+                    self.pos < len(self.buf):
                 while (self.pos < len(self.buf)) and self.is_sep(self.pos):
                     self.move_right()
                 while (self.pos < len(self.buf)) and not self.is_sep(self.pos):
@@ -151,6 +160,12 @@ class ShellLineEditor:  # pragma: nocover
         write(S.RETURN)
         return self.buf
 
+    def write_key(self, key):
+        write(S.BOLD + key + self.buf[self.pos:] +
+              ('\b' * (len(self.buf) - self.pos)) + S.RESET)
+        self.buf = self.buf[:self.pos] + key + self.buf[self.pos:]
+        self.pos += 1
+
     def is_sep(self, pos):
         return (self.buf[pos] in S.SEPARATORS)