hspylib-clitt 0.9.119__py3-none-any.whl → 0.9.121__py3-none-any.whl

clitt/.version

@@ -1 +1 @@
-0.9.119
+0.9.121

clitt/__init__.py

@@ -1,8 +1,8 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.119
+# hspylib-clitt v0.9.121
 #
-# Package: main.build.lib.clitt
+# Package: main.clitt
 """Package initialization."""
 
 __all__ = [
@@ -10,4 +10,4 @@ __all__ = [
     'core', 
     'utils'
 ]
-__version__ = '0.9.119'
+__version__ = '0.9.121'

clitt/addons/__init__.py

@@ -1,12 +1,12 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.119
+# hspylib-clitt v0.9.121
 #
-# Package: main.build.lib.clitt.addons
+# Package: main.clitt.addons
 """Package initialization."""
 
 __all__ = [
     'appman', 
     'widman'
 ]
-__version__ = '0.9.119'
+__version__ = '0.9.121'

clitt/addons/appman/__init__.py

@@ -1,8 +1,8 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.119
+# hspylib-clitt v0.9.121
 #
-# Package: main.build.lib.clitt.addons.appman
+# Package: main.clitt.addons.appman
 """Package initialization."""
 
 __all__ = [
@@ -10,4 +10,4 @@ __all__ = [
     'appman_enums', 
     'templates'
 ]
-__version__ = '0.9.119'
+__version__ = '0.9.121'

clitt/addons/appman/templates/__init__.py

@@ -1,11 +1,11 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.119
+# hspylib-clitt v0.9.121
 #
-# Package: main.build.lib.clitt.addons.appman.templates
+# Package: main.clitt.addons.appman.templates
 """Package initialization."""
 
 __all__ = [
     
 ]
-__version__ = '0.9.119'
+__version__ = '0.9.121'

clitt/addons/widman/__init__.py

@@ -1,8 +1,8 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.119
+# hspylib-clitt v0.9.121
 #
-# Package: main.build.lib.clitt.addons.widman
+# Package: main.clitt.addons.widman
 """Package initialization."""
 
 __all__ = [
@@ -11,4 +11,4 @@ __all__ = [
     'widgets', 
     'widman'
 ]
-__version__ = '0.9.119'
+__version__ = '0.9.121'

clitt/addons/widman/widgets/__init__.py

@@ -1,8 +1,8 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.119
+# hspylib-clitt v0.9.121
 #
-# Package: main.build.lib.clitt.addons.widman.widgets
+# Package: main.clitt.addons.widman.widgets
 """Package initialization."""
 
 __all__ = [
@@ -11,4 +11,4 @@ __all__ = [
     'widget_send_msg', 
     'widget_time_calc'
 ]
-__version__ = '0.9.119'
+__version__ = '0.9.121'

clitt/core/__init__.py

@@ -1,8 +1,8 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.119
+# hspylib-clitt v0.9.121
 #
-# Package: main.build.lib.clitt.core
+# Package: main.clitt.core
 """Package initialization."""
 
 __all__ = [
@@ -12,4 +12,4 @@ __all__ = [
     'term', 
     'tui'
 ]
-__version__ = '0.9.119'
+__version__ = '0.9.121'

clitt/core/exception/__init__.py

@@ -1,11 +1,11 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.119
+# hspylib-clitt v0.9.121
 #
-# Package: main.build.lib.clitt.core.exception
+# Package: main.clitt.core.exception
 """Package initialization."""
 
 __all__ = [
     'exceptions'
 ]
-__version__ = '0.9.119'
+__version__ = '0.9.121'

clitt/core/icons/__init__.py

@@ -1,12 +1,12 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.119
+# hspylib-clitt v0.9.121
 #
-# Package: main.build.lib.clitt.core.icons
+# Package: main.clitt.core.icons
 """Package initialization."""
 
 __all__ = [
     'emojis', 
     'font_awesome'
 ]
-__version__ = '0.9.119'
+__version__ = '0.9.121'

clitt/core/icons/emojis/__init__.py

@@ -1,12 +1,12 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.119
+# hspylib-clitt v0.9.121
 #
-# Package: main.build.lib.clitt.core.icons.emojis
+# Package: main.clitt.core.icons.emojis
 """Package initialization."""
 
 __all__ = [
     'emojis', 
     'face_smiling'
 ]
-__version__ = '0.9.119'
+__version__ = '0.9.121'

clitt/core/icons/font_awesome/__init__.py

@@ -1,8 +1,8 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.119
+# hspylib-clitt v0.9.121
 #
-# Package: main.build.lib.clitt.core.icons.font_awesome
+# Package: main.clitt.core.icons.font_awesome
 """Package initialization."""
 
 __all__ = [
@@ -15,4 +15,4 @@ __all__ = [
     'trickplay_icons', 
     'widget_icons'
 ]
-__version__ = '0.9.119'
+__version__ = '0.9.121'

clitt/core/term/__init__.py

@@ -1,8 +1,8 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.119
+# hspylib-clitt v0.9.121
 #
-# Package: main.build.lib.clitt.core.term
+# Package: main.clitt.core.term
 """Package initialization."""
 
 __all__ = [
@@ -11,4 +11,4 @@ __all__ = [
     'screen', 
     'terminal'
 ]
-__version__ = '0.9.119'
+__version__ = '0.9.121'

clitt/core/tui/__init__.py

@@ -1,8 +1,8 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.119
+# hspylib-clitt v0.9.121
 #
-# Package: main.build.lib.clitt.core.tui
+# Package: main.clitt.core.tui
 """Package initialization."""
 
 __all__ = [
@@ -17,4 +17,4 @@ __all__ = [
     'tui_component', 
     'tui_preferences'
 ]
-__version__ = '0.9.119'
+__version__ = '0.9.121'

clitt/core/tui/line_input/__init__.py

@@ -1,12 +1,12 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.119
+# hspylib-clitt v0.9.121
 #
-# Package: main.build.lib.clitt.core.tui.line_input
+# Package: main.clitt.core.tui.line_input
 """Package initialization."""
 
 __all__ = [
     'keyboard_input', 
     'line_input'
 ]
-__version__ = '0.9.119'
+__version__ = '0.9.121'

clitt/core/tui/line_input/keyboard_input.py

@@ -13,14 +13,14 @@
    Copyright·(c)·2024,·HSPyLib
 """
 
+from typing import Optional
+
 from clitt.core.term.commons import Direction
 from clitt.core.term.terminal import Terminal
 from clitt.core.tui.tui_component import TUIComponent
+from hspylib.core.tools.dict_tools import get_or_default
 from hspylib.modules.cli.keyboard import Keyboard
 from hspylib.modules.cli.vt100.vt_color import VtColor
-from typing import Dict, List, Optional
-
-import pyperclip
 
 
 class KeyboardInput(TUIComponent):
@@ -30,57 +30,47 @@ class KeyboardInput(TUIComponent):
     _HIST_INDEX: int = 0
 
     # Dict containing all previously accepted inputs.
-    _HISTORY: Dict[int, str] = {0: ""}
+    _HISTORY: list[str] = [""]
 
     # Stack containing current input changes.
-    _UNDO_HISTORY: List[str] = []
+    _UNDO_HISTORY: list[str] = []
 
     # Stack containing current input reverts.
-    _REDO_HISTORY: List[str] = []
-
-    @staticmethod
-    def preload_history(history: List[str]) -> None:
-        """Preload the input with the provided dictionary."""
-        rev_history = reversed(history)
-        for entry in rev_history:
-            KeyboardInput._add_history(entry)
-        KeyboardInput._HIST_INDEX = 0
-
-    @staticmethod
-    def forget_history() -> None:
+    _REDO_HISTORY: list[str] = []
+
+    @classmethod
+    def preload_history(cls, history: list[str]) -> None:
+        """Preload the input with the provided dictionary.
+        :param history: The history keyboard inputs.
+        """
+        for entry in reversed(history):
+            cls._add_history(entry)
+        cls._HIST_INDEX = max(0, len(cls._HISTORY) - 1)
+
+    @classmethod
+    def forget_history(cls) -> None:
         """Forget all input history entries."""
-        tmp: str = KeyboardInput._HISTORY[0]
-        KeyboardInput._HISTORY.clear()
-        KeyboardInput._HISTORY[0] = tmp
+        tmp: str = cls._HISTORY[-1]
+        cls._HISTORY.clear()
+        cls._HISTORY.append(tmp)
 
-    @staticmethod
-    def history() -> List[str]:
+    @classmethod
+    def history(cls) -> list[str]:
         """Return the actual input history."""
-        return list(filter(lambda v: v, KeyboardInput._HISTORY.values()))
+        return list(filter(lambda v: v, cls._HISTORY))
 
-    @staticmethod
-    def _add_history(input_text: str) -> None:
+    @classmethod
+    def _add_history(cls, input_text: str) -> None:
         """Add the following input to the history set.
         :param input_text: The input text to add to the history.
         """
-        if input_text and input_text not in list(KeyboardInput._HISTORY.values())[1:]:
-            idx: int = max(1, len(KeyboardInput._HISTORY))
-            KeyboardInput._HISTORY[idx] = input_text
-            KeyboardInput._HIST_INDEX = idx
-
-    @classmethod
-    def _next_in_history(cls) -> Optional[str]:
-        index = min(len(cls._HISTORY) - 1, cls._HIST_INDEX + 1)
-        text = cls._HISTORY.get(index, "")
-        cls._HIST_INDEX = index
-        return text or cls._HISTORY[0]
-
-    @classmethod
-    def _prev_in_history(cls) -> Optional[str]:
-        index = max(0, cls._HIST_INDEX - 1)
-        text = cls._HISTORY.get(index, "")
-        cls._HIST_INDEX = index
-        return text or cls._HISTORY[0]
+        if input_text and input_text not in list(cls._HISTORY)[1:]:
+            idx: int = max(1, len(cls._HISTORY))
+            if input_text not in cls._HISTORY:
+                cls._HISTORY.insert(idx - 1, input_text)
+            else:
+                cls._HISTORY = cls._HISTORY[1:-1] + cls._HISTORY[:1] + cls._HISTORY[-1:]
+            cls._HIST_INDEX = idx
 
     @classmethod
     def _undo(cls) -> Optional[str]:
@@ -104,43 +94,29 @@ class KeyboardInput(TUIComponent):
         navbar_enable: bool = False,
     ):
         super().__init__(prompt)
-        self._prompt_color = prompt_color
-        self._text_color = text_color
-        self._navbar_enable = navbar_enable
-        self._input_index = 0
+        self._prompt_color: VtColor = prompt_color
+        self._text_color: VtColor = text_color
+        self._navbar_enable: bool = navbar_enable
+        self._input_index: int = 0
         self._input_text: str = ""
-        self._HISTORY[0] = ""
+        self._HISTORY[-1] = ""
 
     @property
     def length(self) -> int:
         return len(self._input_text) if self._input_text else 0
 
     def _prepare_render(self, auto_wrap: bool = True, show_cursor: bool = True) -> None:
+        self.screen.add_watcher(self.invalidate)
         Terminal.set_auto_wrap(auto_wrap)
         Terminal.set_show_cursor(show_cursor)
         self.cursor.save()
 
-    def _loop(self, break_keys: List[Keyboard] = None) -> Keyboard:
-        break_keys = break_keys or Keyboard.break_keys()
-        keypress = Keyboard.VK_NONE
-
-        # Wait for user interaction
-        while not self._done and keypress and keypress not in break_keys:
-            # Menu Renderization
-            if self._re_render:
-                self.render()
-            # Navigation input
-            keypress = self.handle_keypress()
-
-        return keypress
-
     def execute(self) -> Optional[str | Keyboard]:
-        self.write(f"{self._prompt_color.placeholder}{self.title}{self._text_color.placeholder}")
         self._prepare_render()
         keypress = self._loop() or Keyboard.VK_ESC
 
         if keypress.isEnter():
-            self._add_history(self._input_text)
+            self._HISTORY.append('')
             self._UNDO_HISTORY.clear()
             self._REDO_HISTORY.clear()
         elif keypress == Keyboard.VK_ESC:
@@ -150,11 +126,31 @@ class KeyboardInput(TUIComponent):
 
         return self._input_text
 
+    def reset(self) -> None:
+        """Reset the contents of the input."""
+        self._input_index = 0
+        self._update_input("")
+
+    def _loop(self, break_keys: list[Keyboard] = None) -> Keyboard:
+        break_keys = break_keys or Keyboard.break_keys()
+        keypress = Keyboard.VK_NONE
+
+        # Wait for user interaction
+        while not self._done and keypress and keypress not in break_keys:
+            # Menu Renderization
+            if self._re_render:
+                self.render()
+            # Navigation input
+            keypress = self.handle_keypress()
+
+        return keypress
+
     def render(self) -> None:
         Terminal.set_show_cursor(False)
         self.cursor.restore()
+        self.write(f"{self._prompt_color.placeholder}{self.title}{self._text_color.placeholder}")
         self.write(self._input_text)
-        self._terminal.cursor.erase(Direction.RIGHT)
+        self._terminal.cursor.erase(Direction.DOWN)
         self._re_render = False
         self._set_cursor_pos()
         Terminal.set_show_cursor()
@@ -175,26 +171,19 @@ class KeyboardInput(TUIComponent):
                     self._update_input(
                         self._input_text[: self._input_index] + self._input_text[1 + self._input_index :]
                     )
-                case Keyboard.VK_CTRL_F:  # Forget history
+                case Keyboard.VK_CTRL_R:
+                    self.reset()
+                case Keyboard.VK_CTRL_F:
                     self.forget_history()
-                case Keyboard.VK_CTRL_P:  # Paste from clipboard
-                    text = (pyperclip.paste() or "").replace("\n", "↵")
-                    self._update_input(
-                        self._input_text[: self._input_index] + text + self._input_text[self._input_index :]
-                    )
-                    self._input_index += len(text)
-                case Keyboard.VK_CTRL_R:  # Reset contents
-                    self._input_index = 0
-                    self._update_input("")
                 case Keyboard.VK_LEFT:
                     self._input_index = max(0, self._input_index - 1)
                 case Keyboard.VK_RIGHT:
                     self._input_index = min(self.length, self._input_index + 1)
                 case Keyboard.VK_UP:
-                    self._input_text = self._next_in_history()
+                    self._input_text = self._prev_in_history()
                     self._input_index = self.length
                 case Keyboard.VK_DOWN:
-                    self._input_text = self._prev_in_history()
+                    self._input_text = self._next_in_history()
                     self._input_index = self.length
                 case Keyboard.VK_HOME:
                     self._input_index = 0
@@ -224,6 +213,24 @@ class KeyboardInput(TUIComponent):
         :param text: The text to be set.
         """
         self._UNDO_HISTORY.append(self._input_text)
-        self._HISTORY[0] = text if text not in self._HISTORY else self._input_text
+        self._HISTORY[-1] = text if text not in self._HISTORY else self._input_text
         self._input_text = text
         return text
+
+    def _next_in_history(self) -> str:
+        """Return the next input in history."""
+        edt_text: str = self._HISTORY[-1]
+        filtered: list[str] = list(filter(lambda h: h.startswith(edt_text), self._HISTORY))
+        index = min(len(filtered) - 1, self._HIST_INDEX + 1)
+        text = get_or_default(filtered, index, "")
+        self._HIST_INDEX = index
+        return text or filtered[-1]
+
+    def _prev_in_history(self) -> str:
+        """Return the previous input in history."""
+        edt_text: str = self._HISTORY[-1]
+        filtered: list[str] = list(filter(lambda h: h.lower().startswith(edt_text.lower()), self._HISTORY))
+        index = max(0, min(len(filtered) - 2, self._HIST_INDEX - 1))
+        text = get_or_default(filtered, index, "")
+        self._HIST_INDEX = index
+        return text or filtered[-1]

clitt/core/tui/mchoose/__init__.py

@@ -1,12 +1,12 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.119
+# hspylib-clitt v0.9.121
 #
-# Package: main.build.lib.clitt.core.tui.mchoose
+# Package: main.clitt.core.tui.mchoose
 """Package initialization."""
 
 __all__ = [
     'mchoose', 
     'menu_choose'
 ]
-__version__ = '0.9.119'
+__version__ = '0.9.121'

clitt/core/tui/mdashboard/__init__.py

@@ -1,8 +1,8 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.119
+# hspylib-clitt v0.9.121
 #
-# Package: main.build.lib.clitt.core.tui.mdashboard
+# Package: main.clitt.core.tui.mdashboard
 """Package initialization."""
 
 __all__ = [
@@ -11,4 +11,4 @@ __all__ = [
     'mdashboard', 
     'menu_dashboard'
 ]
-__version__ = '0.9.119'
+__version__ = '0.9.121'

clitt/core/tui/menu/__init__.py

@@ -1,8 +1,8 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.119
+# hspylib-clitt v0.9.121
 #
-# Package: main.build.lib.clitt.core.tui.menu
+# Package: main.clitt.core.tui.menu
 """Package initialization."""
 
 __all__ = [
@@ -13,4 +13,4 @@ __all__ = [
     'tui_menu_ui', 
     'tui_menu_view'
 ]
-__version__ = '0.9.119'
+__version__ = '0.9.121'

clitt/core/tui/minput/__init__.py

@@ -1,8 +1,8 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.119
+# hspylib-clitt v0.9.121
 #
-# Package: main.build.lib.clitt.core.tui.minput
+# Package: main.clitt.core.tui.minput
 """Package initialization."""
 
 __all__ = [
@@ -16,4 +16,4 @@ __all__ = [
     'minput', 
     'minput_utils'
 ]
-__version__ = '0.9.119'
+__version__ = '0.9.121'

clitt/core/tui/minput/menu_input.py

@@ -12,6 +12,12 @@
 
    Copyright·(c)·2024,·HSPyLib
 """
+import re
+from functools import reduce
+from operator import add
+from time import sleep
+from typing import List, Optional
+
 from clitt.core.icons.font_awesome.form_icons import FormIcons
 from clitt.core.icons.font_awesome.nav_icons import NavIcons
 from clitt.core.term.commons import Direction, get_cursor_position
@@ -22,17 +28,10 @@ from clitt.core.tui.minput.form_field import FormField
 from clitt.core.tui.minput.input_type import InputType
 from clitt.core.tui.minput.minput_utils import MASK_SYMBOLS, VALUE_SEPARATORS
 from clitt.core.tui.tui_component import TUIComponent
-from functools import reduce
 from hspylib.core.exception.exceptions import InvalidInputError, InvalidStateError
 from hspylib.core.namespace import Namespace
 from hspylib.core.tools.text_tools import xstr
 from hspylib.modules.cli.keyboard import Keyboard
-from operator import add
-from time import sleep
-from typing import List, Optional
-
-import pyperclip
-import re
 
 
 class MenuInput(TUIComponent):
@@ -100,7 +99,7 @@ class MenuInput(TUIComponent):
             f"%EOL%{NavIcons.POINTER} %GREEN%{self.cur_field.tooltip or f'the {self.cur_field.label.lower()}'}%NC%"
             f"%EOL%{self.prefs.navbar_color.placeholder}%EOL%"
             f"[Enter] Submit  [{self.NAV_ICONS}] "
-            f"Navigate  [{NavIcons.TAB}] Next  [Space] Toggle  [^P] Paste  [Esc] Quit %NC%"
+            f"Navigate  [{NavIcons.TAB}] Next  [Space] Toggle  [Esc] Quit %NC%"
         )
 
     def handle_keypress(self) -> Keyboard:
@@ -119,8 +118,6 @@ class MenuInput(TUIComponent):
                         self._display_error("This field is read only !")
                     else:
                         self._handle_backspace()
-                case Keyboard.VK_CTRL_P:
-                    self._handle_ctrl_p()
                 case Keyboard.VK_ENTER:
                     return self._handle_enter()
                 case _ as key if key.isalnum() or key.ispunct() or key == Keyboard.VK_SPACE:
@@ -201,11 +198,6 @@ class MenuInput(TUIComponent):
             elif not self.cur_field.can_write():
                 self._display_error("This field is read only !")
 
-    def _handle_ctrl_p(self) -> None:
-        """Handle 'ctrl + p' press. Paste content from clipboard."""
-        for c in pyperclip.paste():
-            self._handle_input(Keyboard.of_value(c))
-
     def _set_cursor_pos(self) -> None:
         """Set the cursor at the right position according to the ATB index."""
         pos = self.positions[self.tab_index]

clitt/core/tui/mselect/__init__.py

@@ -1,12 +1,12 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.119
+# hspylib-clitt v0.9.121
 #
-# Package: main.build.lib.clitt.core.tui.mselect
+# Package: main.clitt.core.tui.mselect
 """Package initialization."""
 
 __all__ = [
     'menu_select', 
     'mselect'
 ]
-__version__ = '0.9.119'
+__version__ = '0.9.121'

clitt/core/tui/table/__init__.py

@@ -1,12 +1,12 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.119
+# hspylib-clitt v0.9.121
 #
-# Package: main.build.lib.clitt.core.tui.table
+# Package: main.clitt.core.tui.table
 """Package initialization."""
 
 __all__ = [
     'table_enums', 
     'table_renderer'
 ]
-__version__ = '0.9.119'
+__version__ = '0.9.121'

clitt/utils/__init__.py

@@ -1,11 +1,11 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.119
+# hspylib-clitt v0.9.121
 #
-# Package: main.build.lib.clitt.utils
+# Package: main.clitt.utils
 """Package initialization."""
 
 __all__ = [
     'git_utils'
 ]
-__version__ = '0.9.119'
+__version__ = '0.9.121'