hspylib-clitt 0.9.115__py3-none-any.whl → 0.9.117__py3-none-any.whl

clitt/.version

@@ -1 +1 @@
-0.9.115
+0.9.117

clitt/__classpath__.py

@@ -18,11 +18,11 @@ from hspylib.core.tools.commons import get_path, run_dir
 
 
 class _Classpath(Classpath):
-    """TODO"""
+    """Provide a class to help locating user-defined classes, packages, sources and resources."""
 
     def __init__(self):
         super().__init__(get_path(__file__), get_path(run_dir()), (get_path(__file__) / "resources"))
 
 
 # Instantiate the classpath singleton
-assert _Classpath().INSTANCE is not None, "Failed to create Classpath instance"
+assert (classpath := _Classpath().INSTANCE) is not None, "Failed to create Classpath instance"

clitt/__init__.py

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

clitt/__main__.py

@@ -12,7 +12,7 @@
 
    Copyright·(c)·2024,·HSPyLib
 """
-from clitt.__classpath__ import _Classpath
+from clitt.__classpath__ import classpath
 from clitt.addons.appman.appman import AppManager
 from clitt.addons.appman.appman_enums import AppExtension, AppType
 from clitt.addons.widman.widman import WidgetManager
@@ -31,10 +31,10 @@ class Main(TUIApplication):
     """HsPyLib CLI Terminal Tools - Create professional CLI applications."""
 
     # The welcome message
-    DESCRIPTION = _Classpath.get_source_path("welcome.txt").read_text(encoding=Charset.UTF_8.val)
+    DESCRIPTION = classpath.get_source("welcome.txt").read_text(encoding=Charset.UTF_8.val)
 
     # Location of the .version file
-    VERSION_DIR = _Classpath.source_path()
+    VERSION_DIR = classpath.source_path()
 
     class Addon(Enumeration):
         """HsPyLib addon types."""

clitt/addons/__init__.py

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

clitt/addons/appman/__init__.py

@@ -1,8 +1,8 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.115
+# hspylib-clitt v0.9.117
 #
-# 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.115'
+__version__ = '0.9.117'

clitt/addons/appman/templates/__init__.py

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

clitt/addons/appman/templates/main_qt_view.py.tpl

@@ -6,7 +6,7 @@ from %APP_NAME%.__classpath__ import _Classpath
 
 class MainQtView(QtView):
     """Main application view"""
-    VERSION = _Classpath.get_source_path(".version").read_text(encoding=Charset.UTF_8.val)
+    VERSION = classpath.get_source(".version").read_text(encoding=Charset.UTF_8.val)
 
     FORMS_DIR = str(_Classpath.resource_path() / "forms")
 

clitt/addons/widman/__init__.py

@@ -1,8 +1,8 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.115
+# hspylib-clitt v0.9.117
 #
-# 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.115'
+__version__ = '0.9.117'

clitt/addons/widman/widgets/__init__.py

@@ -1,8 +1,8 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.115
+# hspylib-clitt v0.9.117
 #
-# 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.115'
+__version__ = '0.9.117'

clitt/core/__init__.py

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

clitt/core/exception/__init__.py

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

clitt/core/icons/__init__.py

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

clitt/core/icons/emojis/__init__.py

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

clitt/core/icons/font_awesome/__init__.py

@@ -1,8 +1,8 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.115
+# hspylib-clitt v0.9.117
 #
-# 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.115'
+__version__ = '0.9.117'

clitt/core/term/__init__.py

@@ -1,8 +1,8 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.115
+# hspylib-clitt v0.9.117
 #
-# 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.115'
+__version__ = '0.9.117'

clitt/core/term/cursor.py

@@ -156,4 +156,4 @@ class Cursor(metaclass=Singleton):
         return self.position
 
 
-assert Cursor().INSTANCE is not None, "Failed to create Cursor instance"
+assert (cursor := Cursor().INSTANCE) is not None, "Failed to create Cursor instance"

clitt/core/term/screen.py

@@ -88,4 +88,4 @@ class Screen(metaclass=Singleton):
             self._resize_timer.start()
 
 
-assert Screen().INSTANCE is not None, "Failed to create Screen instance"
+assert (screen := Screen().INSTANCE) is not None, "Failed to create Screen instance"

clitt/core/term/terminal.py

@@ -55,7 +55,7 @@ class Terminal(metaclass=Singleton):
             del kwargs["stderr"]
         if "stdin" in kwargs:
             del kwargs["stdin"]
-        commands = map(shlex.split, cmd_list)
+        commands = map(shlex.split, cmd_list) if 'shell' not in kwargs else cmd_list
         first_cmd, *rest_cmds = commands
         if len(rest_cmds) > 0:
             procs: List[Popen] = [Popen(first_cmd, stdout=PIPE, stderr=PIPE, **kwargs)]
@@ -200,4 +200,4 @@ class Terminal(metaclass=Singleton):
         return self.screen.cursor
 
 
-assert Terminal().INSTANCE is not None, "Failed to create Terminal instance"
+assert (terminal := Terminal().INSTANCE) is not None, "Failed to create Terminal instance"

clitt/core/tui/__init__.py

@@ -1,8 +1,8 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.115
+# hspylib-clitt v0.9.117
 #
-# 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.115'
+__version__ = '0.9.117'

clitt/core/tui/line_input/__init__.py

@@ -1,12 +1,12 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.115
+# hspylib-clitt v0.9.117
 #
-# 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.115'
+__version__ = '0.9.117'

clitt/core/tui/line_input/keyboard_input.py

@@ -13,12 +13,13 @@
    Copyright·(c)·2024,·HSPyLib
 """
 
+from typing import Optional, List, Dict
+
 import pyperclip
 from hspylib.modules.cli.keyboard import Keyboard
 from hspylib.modules.cli.vt100.vt_color import VtColor
-from typing import Optional, List, Dict
 
-from clitt.core.term.commons import Direction, Portion
+from clitt.core.term.commons import Direction
 from clitt.core.term.terminal import Terminal
 from clitt.core.tui.tui_component import TUIComponent
 
@@ -43,6 +44,7 @@ class KeyboardInput(TUIComponent):
         """Preload the input with the provided dictionary."""
         for entry in history:
             KeyboardInput._add_history(entry)
+        KeyboardInput._HIST_INDEX = 0
 
     @staticmethod
     def forget_history() -> None:
@@ -62,22 +64,23 @@ class KeyboardInput(TUIComponent):
         :param input_text: The input text to add to the history.
         """
         if input_text and input_text not in list(KeyboardInput._HISTORY.values())[1:]:
-            KeyboardInput._HISTORY[max(1, len(KeyboardInput._HISTORY))] = input_text
-            KeyboardInput._HIST_INDEX += 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), cls._HIST_INDEX + 1)
+        index = min(len(cls._HISTORY) - 1, cls._HIST_INDEX + 1)
         text = cls._HISTORY.get(index, "")
-        cls._HIST_INDEX = min(len(cls._HISTORY) - 1, index)
+        cls._HIST_INDEX = index
         return text or cls._HISTORY[0]
 
     @classmethod
     def _prev_in_history(cls) -> Optional[str]:
-        index = max(1, cls._HIST_INDEX)
+        index = max(0, cls._HIST_INDEX - 1)
         text = cls._HISTORY.get(index, "")
-        cls._HIST_INDEX = max(1, index - 1)
-        return text
+        cls._HIST_INDEX = index
+        return text or cls._HISTORY[0]
 
     @classmethod
     def _undo(cls) -> Optional[str]:
@@ -93,9 +96,16 @@ class KeyboardInput(TUIComponent):
             cls._UNDO_HISTORY.append(cls._HISTORY[0])
         return text
 
-    def __init__(self, prompt: str = "", prompt_color: VtColor = VtColor.NC):
+    def __init__(
+        self, prompt: str = "",
+        prompt_color: VtColor = VtColor.NC,
+        text_color: VtColor = VtColor.NC,
+        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._input_text: str = ""
         self._HISTORY[0] = ""
@@ -114,7 +124,7 @@ class KeyboardInput(TUIComponent):
         keypress = Keyboard.VK_NONE
 
         # Wait for user interaction
-        while not self._done and keypress not in break_keys:
+        while not self._done and keypress and keypress not in break_keys:
             # Menu Renderization
             if self._re_render:
                 self.render()
@@ -124,8 +134,9 @@ class KeyboardInput(TUIComponent):
         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()
+        keypress = self._loop() or Keyboard.VK_ESC
 
         if keypress.isEnter():
             self._add_history(self._input_text)
@@ -134,16 +145,15 @@ class KeyboardInput(TUIComponent):
         elif keypress == Keyboard.VK_ESC:
             self._input_text = None
 
-        self.writeln("")
+        self.writeln("%NC%")
 
         return self._input_text
 
     def render(self) -> None:
         Terminal.set_show_cursor(False)
         self.cursor.restore()
-        self._terminal.cursor.erase(Portion.LINE)
-        self.write(f"{self._prompt_color.placeholder}{self.title}%NC%")
         self.write(self._input_text)
+        self._terminal.cursor.erase(Direction.RIGHT)
         self._re_render = False
         self._set_cursor_pos()
         Terminal.set_show_cursor()
@@ -158,42 +168,32 @@ class KeyboardInput(TUIComponent):
                     if self._input_index > 0:
                         self._input_index = max(0, self._input_index - 1)
                         self._update_input(
-                            self._input_text[: self._input_index] + self._input_text[1 + self._input_index :]
+                            self._input_text[: self._input_index] + self._input_text[1 + self._input_index:]
                         )
                 case Keyboard.VK_DELETE:
                     self._update_input(
-                        self._input_text[: self._input_index] + self._input_text[1 + self._input_index :]
+                        self._input_text[: self._input_index] + self._input_text[1 + self._input_index:]
                     )
-                case Keyboard.VK_CTRL_F:
+                case Keyboard.VK_CTRL_F:  # Forget history
                     self.forget_history()
-                case Keyboard.VK_CTRL_P:
+                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_text[: self._input_index] + text + self._input_text[self._input_index:]
                     )
                     self._input_index += len(text)
-                case Keyboard.VK_CTRL_R:
+                case Keyboard.VK_CTRL_R:  # Reset contents
                     self._input_index = 0
                     self._update_input("")
-                case Keyboard.VK_CTRL_U:  # Undo
-                    undo_text = self._undo()
-                    self._input_text = undo_text
-                    self._input_index = self.length
-                    self._HISTORY[0] = self._input_text
-                case Keyboard.VK_CTRL_K:  # redo
-                    redo_text = self._redo()
-                    self._input_text = redo_text if redo_text else self._input_text
-                    self._input_index = self.length
-                    self._HISTORY[0] = self._input_text
                 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._prev_in_history()
+                    self._input_text = self._next_in_history()
                     self._input_index = self.length
                 case Keyboard.VK_DOWN:
-                    self._input_text = self._next_in_history()
+                    self._input_text = self._prev_in_history()
                     self._input_index = self.length
                 case Keyboard.VK_HOME:
                     self._input_index = 0
@@ -201,7 +201,7 @@ class KeyboardInput(TUIComponent):
                     self._input_index = self.length
                 case _ as key if key.val.isprintable():
                     self._update_input(
-                        self._input_text[: self._input_index] + key.val + self._input_text[self._input_index :]
+                        self._input_text[: self._input_index] + key.val + self._input_text[self._input_index:]
                     )
                     self._input_index += 1
                 case _ as key if key in Keyboard.break_keys():

clitt/core/tui/line_input/line_input.py

@@ -22,22 +22,14 @@ from clitt.core.tui.line_input.keyboard_input import KeyboardInput
 def line_input(
     prompt: str = "",
     prompt_color: VtColor = VtColor.NC,
+    text_color: VtColor = VtColor.NC,
+    navbar_enable: bool = False
 ) -> Optional[str | Keyboard]:
     """Read a string from standard input.
     :param prompt: The message to be displayed to the user.
     :param prompt_color: The color of the prompt text.
+    :param text_color: The color of the input text.
+    :param navbar_enable: Whether to display the navbar or not.
     """
-    ptt = KeyboardInput(prompt, prompt_color)
+    ptt = KeyboardInput(prompt, prompt_color, text_color, navbar_enable)
     return ptt.execute()
-
-
-if __name__ == "__main__":
-    hist = ["Hugo", "Joao", "Koko", "Hugo"]
-    KeyboardInput.preload_history(hist)
-    print("-=" * 30)
-    while (i := line_input("What is it? ")) not in ["bye", ""]:
-        if isinstance(i, Keyboard):
-            print(i)
-        else:
-            print("Input:", i)
-    print(KeyboardInput.history())

clitt/core/tui/mchoose/__init__.py

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

clitt/core/tui/mdashboard/__init__.py

@@ -1,8 +1,8 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.115
+# hspylib-clitt v0.9.117
 #
-# 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.115'
+__version__ = '0.9.117'

clitt/core/tui/menu/__init__.py

@@ -1,8 +1,8 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.115
+# hspylib-clitt v0.9.117
 #
-# 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.115'
+__version__ = '0.9.117'

clitt/core/tui/minput/__init__.py

@@ -1,8 +1,8 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.115
+# hspylib-clitt v0.9.117
 #
-# 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.115'
+__version__ = '0.9.117'

clitt/core/tui/mselect/__init__.py

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

clitt/core/tui/table/__init__.py

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