hspylib-clitt 0.9.47__tar.gz → 0.9.49__tar.gz

{hspylib-clitt-0.9.47/hspylib_clitt.egg-info → hspylib-clitt-0.9.49}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hspylib-clitt
-Version: 0.9.47
+Version: 0.9.49
 Summary: HsPyLib - CLI Terminal Tools
 Home-page: https://github.com/yorevs/hspylib
 Author: Hugo Saporetti Junior
@@ -30,7 +30,7 @@ Description-Content-Type: text/markdown
 ## Create professional CLI applications
 
 [![License](https://badgen.net/badge/license/MIT/gray)](LICENSE.md)
-[![Release](https://badgen.net/badge/release/v0.9.47/gray)](CHANGELOG.md#unreleased)
+[![Release](https://badgen.net/badge/release/v0.9.49/gray)](CHANGELOG.md#unreleased)
 [![PyPi](https://badgen.net/badge/icon/python?icon=pypi&label)](https://pypi.org/project/hspylib-clitt)
 [![GitHub](https://badgen.net/badge/icon/github?icon=github&label)](https://github.com/yorevs/hspylib)
 [![Gitter](https://badgen.net/badge/icon/gitter?icon=gitter&label)](https://gitter.im/hspylib/community)

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/README.md

@@ -3,7 +3,7 @@
 ## Create professional CLI applications
 
 [![License](https://badgen.net/badge/license/MIT/gray)](LICENSE.md)
-[![Release](https://badgen.net/badge/release/v0.9.47/gray)](CHANGELOG.md#unreleased)
+[![Release](https://badgen.net/badge/release/v0.9.49/gray)](CHANGELOG.md#unreleased)
 [![PyPi](https://badgen.net/badge/icon/python?icon=pypi&label)](https://pypi.org/project/hspylib-clitt)
 [![GitHub](https://badgen.net/badge/icon/github?icon=github&label)](https://github.com/yorevs/hspylib)
 [![Gitter](https://badgen.net/badge/icon/gitter?icon=gitter&label)](https://gitter.im/hspylib/community)

hspylib-clitt-0.9.49/clitt/.version

@@ -0,0 +1 @@
+0.9.49

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/__classpath__.py

@@ -25,4 +25,4 @@ class _Classpath(Classpath):
 
 
 # Instantiate the classpath singleton
-_Classpath()
+assert _Classpath().INSTANCE is not None, "Failed to create Classpath instance"

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/__init__.py

@@ -1,6 +1,6 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.47
+# hspylib-clitt v0.9.49
 #
 # Package: main.clitt
 """Package initialization."""
@@ -10,4 +10,4 @@ __all__ = [
   'core', 
   'utils'
 ]
-__version__ = '0.9.47'
+__version__ = '0.9.49'

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/addons/__init__.py

@@ -1,6 +1,6 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.47
+# hspylib-clitt v0.9.49
 #
 # Package: main.clitt.addons
 """Package initialization."""
@@ -9,4 +9,4 @@ __all__ = [
   'appman', 
   'widman'
 ]
-__version__ = '0.9.47'
+__version__ = '0.9.49'

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/addons/appman/__init__.py

@@ -1,6 +1,6 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.47
+# hspylib-clitt v0.9.49
 #
 # Package: main.clitt.addons.appman
 """Package initialization."""
@@ -10,4 +10,4 @@ __all__ = [
   'appman_enums', 
   'templates'
 ]
-__version__ = '0.9.47'
+__version__ = '0.9.49'

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/addons/appman/appman.py

@@ -13,7 +13,7 @@
    Copyright 2023, HsPyLib team
 """
 from clitt.addons.appman.appman_enums import AppExtension, AppType
-from clitt.core.tty.terminal import Terminal
+from clitt.core.term.terminal import Terminal
 from clitt.core.tui.minput.input_validator import InputValidator
 from clitt.core.tui.minput.minput import MenuInput, minput
 from hspylib.core.enums.charset import Charset

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/addons/appman/templates/__init__.py

@@ -1,6 +1,6 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.47
+# hspylib-clitt v0.9.49
 #
 # Package: main.clitt.addons.appman.templates
 """Package initialization."""
@@ -8,4 +8,4 @@
 __all__ = [
   
 ]
-__version__ = '0.9.47'
+__version__ = '0.9.49'

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/addons/widman/__init__.py

@@ -1,6 +1,6 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.47
+# hspylib-clitt v0.9.49
 #
 # Package: main.clitt.addons.widman
 """Package initialization."""
@@ -11,4 +11,4 @@ __all__ = [
   'widgets', 
   'widman'
 ]
-__version__ = '0.9.47'
+__version__ = '0.9.49'

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/addons/widman/widgets/__init__.py

@@ -1,6 +1,6 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.47
+# hspylib-clitt v0.9.49
 #
 # Package: main.clitt.addons.widman.widgets
 """Package initialization."""
@@ -11,4 +11,4 @@ __all__ = [
   'widget_send_msg', 
   'widget_time_calc'
 ]
-__version__ = '0.9.47'
+__version__ = '0.9.49'

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/core/__init__.py

@@ -1,13 +1,13 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.47
+# hspylib-clitt v0.9.49
 #
 # Package: main.clitt.core
 """Package initialization."""
 
 __all__ = [
   'icons', 
-  'tty', 
+  'term', 
   'tui'
 ]
-__version__ = '0.9.47'
+__version__ = '0.9.49'

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/core/icons/__init__.py

@@ -1,6 +1,6 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.47
+# hspylib-clitt v0.9.49
 #
 # Package: main.clitt.core.icons
 """Package initialization."""
@@ -9,4 +9,4 @@ __all__ = [
   'emojis', 
   'font_awesome'
 ]
-__version__ = '0.9.47'
+__version__ = '0.9.49'

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/core/icons/emojis/__init__.py

@@ -1,6 +1,6 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.47
+# hspylib-clitt v0.9.49
 #
 # Package: main.clitt.core.icons.emojis
 """Package initialization."""
@@ -9,4 +9,4 @@ __all__ = [
   'emojis', 
   'face_smiling'
 ]
-__version__ = '0.9.47'
+__version__ = '0.9.49'

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/core/icons/font_awesome/__init__.py

@@ -1,6 +1,6 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.47
+# hspylib-clitt v0.9.49
 #
 # Package: main.clitt.core.icons.font_awesome
 """Package initialization."""
@@ -14,4 +14,4 @@ __all__ = [
   'nav_icons', 
   'widget_icons'
 ]
-__version__ = '0.9.47'
+__version__ = '0.9.49'

hspylib-clitt-0.9.49/clitt/core/term/__init__.py

@@ -0,0 +1,14 @@
+# _*_ coding: utf-8 _*_
+#
+# hspylib-clitt v0.9.49
+#
+# Package: main.clitt.core.term
+"""Package initialization."""
+
+__all__ = [
+  'commons', 
+  'cursor', 
+  'screen', 
+  'terminal'
+]
+__version__ = '0.9.49'

hspylib-clitt-0.9.49/clitt/core/term/commons.py

@@ -0,0 +1,63 @@
+import logging as log
+import re
+import sys
+import termios
+import tty
+from shutil import get_terminal_size
+from typing import TypeVar, Tuple, Callable, Union
+
+from hspylib.core.exception.exceptions import NotATerminalError
+from hspylib.core.tools.commons import is_debugging
+from hspylib.modules.cli.vt100.vt_100 import Vt100
+
+DIMENSION = TypeVar("DIMENSION", bound=Tuple[int, int])
+
+POSITION = TypeVar("POSITION", bound=Tuple[int, int])
+
+CB_RESIZE = TypeVar("CB_RESIZE", bound=Callable[[None], None])
+
+MOVE_DIRECTION = TypeVar("MOVE_DIRECTION", bound="Cursor.Direction")
+
+ERASE_DIRECTION = TypeVar("ERASE_DIRECTION", bound=Union["Cursor.Direction", "Screen.Portion"])
+
+
+def get_dimensions(fallback: Tuple[int, int] = (24, 80)) -> Tuple[int, int]:
+    """Retrieve the size of the terminal.
+    :return lines, columns
+    """
+    if not sys.stdout.isatty():
+        log.error(NotATerminalError("screen_size:: Requires a terminal (TTY)"))
+        return fallback
+    dim = get_terminal_size((fallback[1], fallback[0]))
+    return dim.lines, dim.columns
+
+
+def get_cursor_position(fallback: Tuple[int, int] = (0, 0)) -> Tuple[int, int]:
+    """Get the terminal cursor position.
+    :return line, column
+    """
+    pos, buf = fallback, ""
+
+    if not sys.stdout.isatty():
+        log.error(NotATerminalError("get_cursor_position:: Requires a terminal (TTY)"))
+        return pos
+
+    if is_debugging():
+        return pos
+
+    stdin = sys.stdin.fileno()  # Get the stdin file descriptor.
+    attrs = termios.tcgetattr(stdin)  # Save terminal attributes.
+
+    try:
+        tty.setcbreak(stdin, termios.TCSANOW)
+        sys.stdout.write(Vt100.get_cursor_pos())
+        sys.stdout.flush()
+        while not buf or buf[-1] != "R":
+            buf += sys.stdin.read(1)
+        if matches := re.match(r"^\x1b\[(\d*);(\d*)R", buf):  # If the response is 'Esc[r;cR'
+            groups = matches.groups()
+            pos = int(groups[0]), int(groups[1])
+    finally:
+        termios.tcsetattr(stdin, termios.TCSANOW, attrs)  # Reset terminal attributes
+
+    return pos

{hspylib-clitt-0.9.47/clitt/core/tty → hspylib-clitt-0.9.49/clitt/core/term}/cursor.py

@@ -9,13 +9,14 @@ from hspylib.modules.cli.vt100.vt_100 import Vt100
 from hspylib.modules.cli.vt100.vt_code import VtCode
 from hspylib.modules.cli.vt100.vt_color import VtColor
 
-from clitt.core.tty.terminal import Terminal
-from clitt.core.tty.tty_types import POSITION, MOVE_DIRECTION, ERASE_DIRECTION
+from clitt.core.term.commons import POSITION, MOVE_DIRECTION, ERASE_DIRECTION, get_cursor_position
 
 
 class Cursor(metaclass=Singleton):
     """Provide a base class for the screen cursor."""
 
+    INSTANCE = None
+
     CURSOR_HOME = 1, 1
 
     class Direction(Enumeration):
@@ -28,7 +29,7 @@ class Cursor(metaclass=Singleton):
         # fmt: on
 
     def __init__(self):
-        self._position: POSITION = Terminal.get_cursor_position() or self.CURSOR_HOME
+        self._position: POSITION = get_cursor_position() or self.CURSOR_HOME
         self._bottom: POSITION = self.CURSOR_HOME
         self._saved_attrs = self._position, self._bottom
 
@@ -91,7 +92,7 @@ class Cursor(metaclass=Singleton):
 
     def track(self) -> POSITION:
         """Track the cursor position."""
-        self.position = Terminal.get_cursor_position() or self.position
+        self.position = get_cursor_position() or self.position
         return self.position
 
     def write(self, obj: Any, end: str = "") -> POSITION:

{hspylib-clitt-0.9.47/clitt/core/tty → hspylib-clitt-0.9.49/clitt/core/term}/screen.py

@@ -1,4 +1,3 @@
-import atexit
 import threading
 from threading import Timer
 from typing import Optional, List
@@ -7,9 +6,8 @@ from hspylib.core.enums.enumeration import Enumeration
 from hspylib.core.metaclass.singleton import Singleton
 from hspylib.core.tools.commons import sysout
 
-from clitt.core.tty.terminal import Terminal
-from clitt.core.tty.cursor import Cursor
-from clitt.core.tty.tty_types import DIMENSION, CB_RESIZE
+from clitt.core.term.commons import DIMENSION, CB_RESIZE, get_dimensions
+from clitt.core.term.cursor import Cursor
 from clitt.core.tui.tui_preferences import TUIPreferences
 
 
@@ -28,14 +26,12 @@ class Screen(metaclass=Singleton):
         # fmt: on
 
     def __init__(self):
-        self._preferences: TUIPreferences = TUIPreferences.INSTANCE or TUIPreferences()
-        self._dimension: DIMENSION = Terminal.get_dimensions()
-        self._cursor: Cursor = Cursor()
+        self._preferences: TUIPreferences = TUIPreferences.INSTANCE
+        self._dimension: DIMENSION = get_dimensions()
+        self._cursor: Cursor = Cursor.INSTANCE or Cursor()
         self._resize_timer: Optional[Timer] = None
         self._cb_watchers: List[CB_RESIZE] = []
         self._alternate: bool = False
-
-        atexit.register(Terminal.exit)
         self._resize_watcher()
 
     def __str__(self):
@@ -78,8 +74,8 @@ class Screen(metaclass=Singleton):
         self.cursor.track()
 
     def clear(self) -> None:
-        """Clear the entire screen and move the cursor home."""
-        Terminal.clear()
+        """Clear terminal and move the cursor to HOME position (0, 0)."""
+        sysout("%ED2%%HOM%", end="")
         self.cursor.home()
 
     def add_watcher(self, watcher: CB_RESIZE) -> None:
@@ -92,7 +88,7 @@ class Screen(metaclass=Singleton):
         """Add a watcher for screen resizes. If a resize is detected, the callback is called with the
         new dimension."""
         if self._cb_watchers and threading.main_thread().is_alive():
-            dimension: DIMENSION = Terminal.get_dimensions()
+            dimension: DIMENSION = get_dimensions()
             self._resize_timer = Timer(self.RESIZE_WATCH_INTERVAL, self._resize_watcher)
             if dimension != self._dimension:
                 list(map(lambda cb_w: cb_w(), self._cb_watchers))

{hspylib-clitt-0.9.47/clitt/core/tty → hspylib-clitt-0.9.49/clitt/core/term}/terminal.py

@@ -12,42 +12,37 @@
 
    Copyright 2023, HsPyLib team
 """
+import atexit
 import logging as log
 import os
 import platform
-import re
 import select
 import shlex
 import signal
 import subprocess
 import sys
-import termios
-import tty
-from abc import ABC
-from shutil import get_terminal_size
-from typing import Optional, Tuple
+from typing import Optional, Tuple, Any
 
 from hspylib.core.enums.charset import Charset
 from hspylib.core.exception.exceptions import NotATerminalError
-from hspylib.core.tools.commons import is_debugging
+from hspylib.core.metaclass.singleton import Singleton
 from hspylib.core.tools.commons import sysout
 from hspylib.modules.application.exit_status import ExitStatus
 from hspylib.modules.cli.keyboard import Keyboard
 from hspylib.modules.cli.vt100.vt_100 import Vt100
 
+from clitt.core.term.screen import Screen
 
-class Terminal(ABC):
+
+class Terminal(metaclass=Singleton):
     """Utility class to provide terminal features."""
 
+    INSTANCE = None
+
     @staticmethod
     def is_a_tty() -> bool:
         return sys.stdout.isatty()
 
-    @staticmethod
-    def clear() -> None:
-        """Clear terminal and move the cursor to HOME position (0, 0)."""
-        sysout("%ED2%%HOM%", end="")
-
     @staticmethod
     def shell_exec(cmd_line: str, **kwargs) -> Tuple[Optional[str], ExitStatus]:
         """Execute command with arguments and return it's run status."""
@@ -102,63 +97,12 @@ class Terminal(ABC):
         else:
             raise NotImplementedError(f"OS '{my_os}' is not supported")
 
-    @classmethod
-    def exit(
-        cls,
-        exit_msg: str | None = "") -> None:
-        """Exit the application. Commonly called by hooked signals.
-        :param exit_msg: the exiting message to be displayed.
-        """
-        cls.restore()
-        sysout(f"%MOD(0)%" f"{exit_msg}")
-
     @classmethod
     def restore(cls) -> None:
         """Clear the terminal and restore default attributes [wrap,cursor,echo]."""
+        sysout("%MOD(0)%")
         cls.set_attributes(show_cursor=True, auto_wrap=True, enable_echo=True)
 
-    @classmethod
-    def get_dimensions(cls, fallback: Tuple[int, int] = (24, 80)) -> Tuple[int, int]:
-        """Retrieve the size of the terminal.
-        :return lines, columns
-        """
-        if not sys.stdout.isatty():
-            log.error(NotATerminalError("screen_size:: Requires a terminal (TTY)"))
-            return fallback
-        dim = get_terminal_size((fallback[1], fallback[0]))
-        return dim.lines, dim.columns
-
-    @classmethod
-    def get_cursor_position(cls, fallback: Tuple[int, int] = (0, 0)) -> Tuple[int, int]:
-        """Get the terminal cursor position.
-        :return line, column
-        """
-        pos, buf = fallback, ""
-
-        if not cls.is_a_tty():
-            log.error(NotATerminalError("get_cursor_position:: Requires a terminal (TTY)"))
-            return pos
-
-        if is_debugging():
-            return pos
-
-        stdin = sys.stdin.fileno()  # Get the stdin file descriptor.
-        attrs = termios.tcgetattr(stdin)  # Save terminal attributes.
-
-        try:
-            tty.setcbreak(stdin, termios.TCSANOW)
-            sys.stdout.write(Vt100.get_cursor_pos())
-            sys.stdout.flush()
-            while not buf or buf[-1] != "R":
-                buf += sys.stdin.read(1)
-            if matches := re.match(r"^\x1b\[(\d*);(\d*)R", buf):  # If the response is 'Esc[r;cR'
-                groups = matches.groups()
-                pos = int(groups[0]), int(groups[1])
-        finally:
-            termios.tcsetattr(stdin, termios.TCSANOW, attrs)  # Reset terminal attributes
-
-        return pos
-
     @classmethod
     def set_enable_echo(cls, enabled: bool = True) -> None:
         """Enable echo in the terminal.
@@ -206,3 +150,18 @@ class Terminal(ABC):
             cls.set_auto_wrap(auto_wrap)
         if show_cursor is not None:
             cls.set_show_cursor(show_cursor)
+
+    def __init__(self):
+        self._screen = Screen.INSTANCE or Screen()
+        atexit.register(self.restore)
+
+    @property
+    def screen(self) -> Screen:
+        return self._screen
+
+    def echo(self, obj: Any, end=os.linesep) -> None:
+        """Write the string representation of the object to the screen."""
+        self.screen.cursor.write(obj, end=end)
+
+
+assert Terminal().INSTANCE is not None, "Failed to create Terminal instance"

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/core/tui/__init__.py

@@ -1,6 +1,6 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.47
+# hspylib-clitt v0.9.49
 #
 # Package: main.clitt.core.tui
 """Package initialization."""
@@ -16,4 +16,4 @@ __all__ = [
   'tui_component', 
   'tui_preferences'
 ]
-__version__ = '0.9.47'
+__version__ = '0.9.49'

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/core/tui/mchoose/__init__.py

@@ -1,6 +1,6 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.47
+# hspylib-clitt v0.9.49
 #
 # Package: main.clitt.core.tui.mchoose
 """Package initialization."""
@@ -9,4 +9,4 @@ __all__ = [
   'mchoose', 
   'menu_choose'
 ]
-__version__ = '0.9.47'
+__version__ = '0.9.49'

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/core/tui/mchoose/menu_choose.py

@@ -13,8 +13,8 @@
    Copyright 2023, HsPyLib team
 """
 from clitt.core.icons.font_awesome.nav_icons import NavIcons
-from clitt.core.tty.cursor import Cursor
-from clitt.core.tty.screen import Screen
+from clitt.core.term.cursor import Cursor
+from clitt.core.term.screen import Screen
 from clitt.core.tui.tui_component import TUIComponent
 from functools import cached_property
 from hspylib.modules.cli.keyboard import Keyboard

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/core/tui/mdashboard/__init__.py

@@ -1,6 +1,6 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.47
+# hspylib-clitt v0.9.49
 #
 # Package: main.clitt.core.tui.mdashboard
 """Package initialization."""
@@ -11,4 +11,4 @@ __all__ = [
   'mdashboard', 
   'menu_dashboard'
 ]
-__version__ = '0.9.47'
+__version__ = '0.9.49'

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/core/tui/mdashboard/menu_dashboard.py

@@ -13,8 +13,8 @@
    Copyright 2023, HsPyLib team
 """
 from clitt.core.icons.font_awesome.nav_icons import NavIcons
-from clitt.core.tty.cursor import Cursor
-from clitt.core.tty.screen import Screen
+from clitt.core.term.cursor import Cursor
+from clitt.core.term.screen import Screen
 from clitt.core.tui.mdashboard.dashboard_builder import DashboardBuilder
 from clitt.core.tui.mdashboard.dashboard_item import DashboardItem
 from clitt.core.tui.tui_component import TUIComponent

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/core/tui/menu/__init__.py

@@ -1,6 +1,6 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.47
+# hspylib-clitt v0.9.49
 #
 # Package: main.clitt.core.tui.menu
 """Package initialization."""
@@ -13,4 +13,4 @@ __all__ = [
   'tui_menu_ui', 
   'tui_menu_view'
 ]
-__version__ = '0.9.47'
+__version__ = '0.9.49'

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/core/tui/menu/tui_menu_item.py

@@ -14,8 +14,8 @@
 """
 
 from clitt.core.icons.font_awesome.nav_icons import NavIcons
-from clitt.core.tty.cursor import Cursor
-from clitt.core.tty.screen import Screen
+from clitt.core.term.cursor import Cursor
+from clitt.core.term.screen import Screen
 from clitt.core.tui.menu.tui_menu import TUIMenu
 from clitt.core.tui.menu.tui_menu_ui import TUIMenuUi
 from functools import cached_property

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/core/tui/menu/tui_menu_ui.py

@@ -12,8 +12,7 @@
 
    Copyright 2023, HsPyLib team
 """
-from clitt.core.tty.terminal import Terminal
-from clitt.core.tty.screen import Screen
+from clitt.core.term.terminal import Terminal
 from clitt.core.tui.menu.tui_menu import TUIMenu
 from clitt.core.tui.tui_preferences import TUIPreferences
 from hspylib.core.metaclass.singleton import Singleton
@@ -28,9 +27,9 @@ class TUIMenuUi(metaclass=Singleton):
     APP_TITLE = "Main Menu"
 
     # fmt: off
-    PREFS = TUIPreferences.INSTANCE or TUIPreferences()
+    PREFS = TUIPreferences.INSTANCE
 
-    SCREEN = Screen.INSTANCE or Screen()
+    SCREEN = Terminal.INSTANCE.screen
 
     MENU_LINE = f"{'--' * PREFS.title_line_length}"
 

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/core/tui/menu/tui_menu_view.py

@@ -12,7 +12,7 @@
 
    Copyright 2023, HsPyLib team
 """
-from clitt.core.tty.cursor import Cursor
+from clitt.core.term.cursor import Cursor
 from clitt.core.tui.menu.tui_menu import ON_TRIGGER_CB, TUIMenu
 from clitt.core.tui.menu.tui_menu_ui import TUIMenuUi
 from typing import Callable, Optional

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/core/tui/minput/__init__.py

@@ -1,6 +1,6 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.47
+# hspylib-clitt v0.9.49
 #
 # Package: main.clitt.core.tui.minput
 """Package initialization."""
@@ -16,4 +16,4 @@ __all__ = [
   'minput', 
   'minput_utils'
 ]
-__version__ = '0.9.47'
+__version__ = '0.9.49'

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/core/tui/minput/menu_input.py

@@ -23,8 +23,9 @@ from hspylib.modules.cli.keyboard import Keyboard
 
 from clitt.core.icons.font_awesome.form_icons import FormIcons
 from clitt.core.icons.font_awesome.nav_icons import NavIcons
-from clitt.core.tty.cursor import Cursor
-from clitt.core.tty.terminal import Terminal
+from clitt.core.term.commons import get_cursor_position
+from clitt.core.term.cursor import Cursor
+from clitt.core.term.terminal import Terminal
 from clitt.core.tui.minput.form_builder import FormBuilder
 from clitt.core.tui.minput.form_field import FormField
 from clitt.core.tui.minput.input_type import InputType
@@ -267,7 +268,7 @@ class MenuInput(TUIComponent):
         :param field_index: the current form field index.
         :param field_size: the form field length.
         """
-        if f_pos := Terminal.get_cursor_position() \
+        if f_pos := get_cursor_position() \
             if self.positions[field_index] == (0, 0) \
             else self.positions[field_index]:
             self.positions[field_index] = f_pos

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/core/tui/minput/minput_utils.py

@@ -17,7 +17,7 @@ from typing import Any, Optional, Tuple
 
 import re
 
-from clitt.core.tty.screen import Screen
+from clitt.core.term.screen import Screen
 
 MASK_SYMBOLS = ["#", "@", "%", "*"]
 

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/core/tui/mselect/__init__.py

@@ -1,6 +1,6 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.47
+# hspylib-clitt v0.9.49
 #
 # Package: main.clitt.core.tui.mselect
 """Package initialization."""
@@ -9,4 +9,4 @@ __all__ = [
   'menu_select', 
   'mselect'
 ]
-__version__ = '0.9.47'
+__version__ = '0.9.49'

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/core/tui/mselect/menu_select.py

@@ -13,8 +13,8 @@
    Copyright 2023, HsPyLib team
 """
 from clitt.core.icons.font_awesome.nav_icons import NavIcons
-from clitt.core.tty.cursor import Cursor
-from clitt.core.tty.screen import Screen
+from clitt.core.term.cursor import Cursor
+from clitt.core.term.screen import Screen
 from clitt.core.tui.tui_component import TUIComponent
 from functools import cached_property
 from hspylib.modules.cli.keyboard import Keyboard

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/core/tui/table/__init__.py

@@ -1,6 +1,6 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.47
+# hspylib-clitt v0.9.49
 #
 # Package: main.clitt.core.tui.table
 """Package initialization."""
@@ -9,4 +9,4 @@ __all__ = [
   'table_enums', 
   'table_renderer'
 ]
-__version__ = '0.9.47'
+__version__ = '0.9.49'

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/core/tui/table/table_renderer.py

@@ -12,16 +12,16 @@
 
    Copyright 2023, HsPyLib team
 """
-from clitt.core.tty.cursor import Cursor
-from clitt.core.tty.screen import Screen
-from clitt.core.tui.table.table_enums import TextAlignment, TextCase
+import csv
+import os
+from typing import Any, Callable, Iterable, List
+
 from hspylib.core.preconditions import check_argument
 from hspylib.core.tools.commons import file_is_not_empty
 from hspylib.core.tools.text_tools import elide_text, ensure_endswith
-from typing import Any, Callable, Iterable, List
 
-import csv
-import os
+from clitt.core.term.terminal import Terminal
+from clitt.core.tui.table.table_enums import TextAlignment, TextCase
 
 
 class TableRenderer:
@@ -57,7 +57,7 @@ class TableRenderer:
         :param caption: table caption to be displayed.
         """
 
-        self._screen = Screen.INSTANCE or Screen()
+        self._terminal = Terminal.INSTANCE
         self._headers = headers
         self._columns = range(len(self._headers))
         self._data = data if data else []
@@ -78,12 +78,8 @@ class TableRenderer:
         self.adjust_auto_fit()
 
     @property
-    def screen(self) -> Screen:
-        return self._screen
-
-    @property
-    def cursor(self) -> Cursor:
-        return self.screen.cursor
+    def terminal(self) -> Terminal:
+        return self._terminal
 
     @property
     def data(self) -> Iterable:
@@ -195,7 +191,7 @@ class TableRenderer:
 
     def _display_data(self, data: Any) -> None:
         """Print out data into the screen."""
-        self.cursor.writeln(data)
+        self.terminal.cursor.writeln(data)
 
     def _format_header_row(self) -> str:
         """Format the table header using the defined preferences."""

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/core/tui/tui_application.py

@@ -20,8 +20,9 @@ from hspylib.modules.application.application import Application
 from hspylib.modules.application.exit_status import ExitStatus
 from hspylib.modules.application.version import Version
 
-from clitt.core.tty.cursor import Cursor
-from clitt.core.tty.screen import Screen
+from clitt.core.term.cursor import Cursor
+from clitt.core.term.screen import Screen
+from clitt.core.term.terminal import Terminal
 
 
 class TUIApplication(Application, metaclass=AbstractSingleton):
@@ -38,16 +39,20 @@ class TUIApplication(Application, metaclass=AbstractSingleton):
         log_dir: str = None):
 
         super().__init__(name, version, description, usage, epilog, resource_dir, log_dir)
-        self._screen = Screen.INSTANCE or Screen()
+        self._terminal = Terminal.INSTANCE
         self._app_name = os.path.basename(sys.argv[0]) if name is None else name
 
+    @property
+    def terminal(self) -> Terminal():
+        return self._terminal
+
     @property
     def screen(self) -> Screen():
-        return self._screen
+        return self.terminal.screen
 
     @property
     def cursor(self) -> Cursor:
-        return self.screen.cursor
+        return self.terminal.cursor
 
     def _setup_arguments(self) -> None:
         pass
@@ -58,3 +63,4 @@ class TUIApplication(Application, metaclass=AbstractSingleton):
     def _cleanup(self) -> None:
         if self.screen.alternate and self._exit_code == ExitStatus.SUCCESS:
             self.screen.alternate = not self.screen.alternate
+        self.terminal.restore()

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/core/tui/tui_component.py

@@ -19,9 +19,9 @@ from hspylib.core.tools.text_tools import elide_text
 from hspylib.modules.cli.keyboard import Keyboard
 
 from clitt.core.icons.font_awesome.awesome import Awesome
-from clitt.core.tty.terminal import Terminal
-from clitt.core.tty.cursor import Cursor
-from clitt.core.tty.screen import Screen
+from clitt.core.term.terminal import Terminal
+from clitt.core.term.cursor import Cursor
+from clitt.core.term.screen import Screen
 from clitt.core.tui.tui_preferences import TUIPreferences
 
 T = TypeVar("T", bound=Any)
@@ -34,7 +34,19 @@ class TUIComponent(ABC):
         self._re_render = True
         self._done = False
         self._title = title
-        self._screen = Screen.INSTANCE or Screen()
+        self._terminal = Terminal.INSTANCE
+
+    @property
+    def terminal(self) -> Terminal:
+        return self._terminal
+
+    @property
+    def screen(self) -> Screen:
+        return self.terminal.screen
+
+    @property
+    def cursor(self) -> Cursor:
+        return self.terminal.screen.cursor
 
     @property
     def title(self) -> str:
@@ -42,28 +54,20 @@ class TUIComponent(ABC):
 
     @property
     def rows(self) -> int:
-        return self._screen.lines
+        return self.screen.lines
 
     @property
     def columns(self) -> int:
-        return self._screen.columns
+        return self.screen.columns
 
     @property
     def prefs(self) -> TUIPreferences:
         return self.screen.preferences
 
-    @property
-    def screen(self) -> Screen:
-        return self._screen
-
-    @property
-    def cursor(self) -> Cursor:
-        return self._screen.cursor
-
     def _prepare_render(self, auto_wrap: bool = False, show_cursor: bool = False) -> None:
         """Prepare the screen for renderization."""
 
-        self._screen.add_watcher(self.invalidate)
+        self.screen.add_watcher(self.invalidate)
         Terminal.set_auto_wrap(auto_wrap)
         Terminal.set_show_cursor(show_cursor)
         self.screen.clear()
@@ -121,11 +125,11 @@ class TUIComponent(ABC):
 
     def write(self, obj: Any) -> None:
         """Write the string representation of the object to the screen."""
-        self.cursor.write(obj)
+        self.terminal.echo(obj, end='')
 
     def writeln(self, obj: Any) -> None:
         """Write the string representation of the object to the screen, appending a new line."""
-        self.cursor.writeln(obj)
+        self.terminal.echo(obj)
 
     def invalidate(self) -> None:
         """Invalidate current TUI renderization."""

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/core/tui/tui_preferences.py

@@ -145,3 +145,6 @@ class TUIPreferences(metaclass=Singleton):
     @property
     def unmarked(self) -> Awesome:
         return self._unmarked
+
+
+assert TUIPreferences().INSTANCE is not None, "Failed to create TUIPreferences instance"

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/clitt/utils/__init__.py

@@ -1,6 +1,6 @@
 # _*_ coding: utf-8 _*_
 #
-# hspylib-clitt v0.9.47
+# hspylib-clitt v0.9.49
 #
 # Package: main.clitt.utils
 """Package initialization."""
@@ -8,4 +8,4 @@
 __all__ = [
   'git_utils'
 ]
-__version__ = '0.9.47'
+__version__ = '0.9.49'

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49/hspylib_clitt.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hspylib-clitt
-Version: 0.9.47
+Version: 0.9.49
 Summary: HsPyLib - CLI Terminal Tools
 Home-page: https://github.com/yorevs/hspylib
 Author: Hugo Saporetti Junior
@@ -30,7 +30,7 @@ Description-Content-Type: text/markdown
 ## Create professional CLI applications
 
 [![License](https://badgen.net/badge/license/MIT/gray)](LICENSE.md)
-[![Release](https://badgen.net/badge/release/v0.9.47/gray)](CHANGELOG.md#unreleased)
+[![Release](https://badgen.net/badge/release/v0.9.49/gray)](CHANGELOG.md#unreleased)
 [![PyPi](https://badgen.net/badge/icon/python?icon=pypi&label)](https://pypi.org/project/hspylib-clitt)
 [![GitHub](https://badgen.net/badge/icon/github?icon=github&label)](https://github.com/yorevs/hspylib)
 [![Gitter](https://badgen.net/badge/icon/gitter?icon=gitter&label)](https://gitter.im/hspylib/community)

{hspylib-clitt-0.9.47 → hspylib-clitt-0.9.49}/hspylib_clitt.egg-info/SOURCES.txt

@@ -45,11 +45,11 @@ clitt/core/icons/font_awesome/dashboard_icons.py
 clitt/core/icons/font_awesome/form_icons.py
 clitt/core/icons/font_awesome/nav_icons.py
 clitt/core/icons/font_awesome/widget_icons.py
-clitt/core/tty/__init__.py
-clitt/core/tty/cursor.py
-clitt/core/tty/screen.py
-clitt/core/tty/terminal.py
-clitt/core/tty/tty_types.py
+clitt/core/term/__init__.py
+clitt/core/term/commons.py
+clitt/core/term/cursor.py
+clitt/core/term/screen.py
+clitt/core/term/terminal.py
 clitt/core/tui/__init__.py
 clitt/core/tui/tui_application.py
 clitt/core/tui/tui_component.py

hspylib-clitt-0.9.47/clitt/.version

@@ -1 +0,0 @@
-0.9.47

hspylib-clitt-0.9.47/clitt/core/tty/__init__.py

@@ -1,14 +0,0 @@
-# _*_ coding: utf-8 _*_
-#
-# hspylib-clitt v0.9.47
-#
-# Package: main.clitt.core.tty
-"""Package initialization."""
-
-__all__ = [
-  'cursor', 
-  'screen', 
-  'terminal', 
-  'tty_types'
-]
-__version__ = '0.9.47'

hspylib-clitt-0.9.47/clitt/core/tty/tty_types.py

@@ -1,11 +0,0 @@
-from typing import TypeVar, Tuple, Callable, Union
-
-DIMENSION = TypeVar("DIMENSION", bound=Tuple[int, int])
-
-POSITION = TypeVar("POSITION", bound=Tuple[int, int])
-
-CB_RESIZE = TypeVar("CB_RESIZE", bound=Callable[[None], None])
-
-MOVE_DIRECTION = TypeVar("MOVE_DIRECTION", bound="Cursor.Direction")
-
-ERASE_DIRECTION = TypeVar("ERASE_DIRECTION", bound=Union["Cursor.Direction", "Screen.Portion"])