euporie 2.3.2__py3-none-any.whl → 2.4.1__py3-none-any.whl

euporie/core/convert/formats/sixel.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 from functools import partial
 from typing import TYPE_CHECKING
 
-from euporie.core.convert.base import register
+from euporie.core.convert.core import register
 from euporie.core.convert.formats.common import (
     chafa_convert_cmd,
     chafa_convert_py,
@@ -15,10 +15,10 @@ from euporie.core.convert.utils import call_subproc, commands_exist, have_module
 from euporie.core.current import get_app
 
 if TYPE_CHECKING:
+    from pathlib import Path
     from typing import Any
 
     from PIL.Image import Image as PilImage
-    from upath import UPath
 
 
 register(
@@ -46,7 +46,7 @@ def png_to_sixel_img2sixel(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str:
     """Convert PNG data to sixels :command:`img2sixel`."""
     bg = bg or get_app().color_palette.bg.base_hex
@@ -77,7 +77,7 @@ def pil_to_sixel_py_timg(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str:
     """Convert a pillow image to sixels :py:mod:`timg`."""
     import timg
@@ -96,7 +96,7 @@ def pil_to_sixel_py_teimpy(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str:
     """Convert a pillow image to sixels :py:mod:`teimpy`."""
     import numpy as np

euporie/core/convert/utils.py

@@ -15,7 +15,7 @@ from typing import TYPE_CHECKING
 import imagesize
 from prompt_toolkit.filters import Condition, to_filter
 
-from euporie.core.convert.base import convert
+from euporie.core.convert.core import convert
 from euporie.core.current import get_app
 
 if TYPE_CHECKING:

euporie/core/current.py

@@ -2,15 +2,21 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, cast
+from typing import TYPE_CHECKING
 
-from prompt_toolkit.application.current import get_app as ptk_get_app
+from prompt_toolkit.application.current import _current_app_session
 
 if TYPE_CHECKING:
     from euporie.core.app import BaseApp
 
 
 def get_app() -> BaseApp:
-    """Get the current application."""
-    app = ptk_get_app()
-    return cast("BaseApp", app)
+    """Get the current active (running) Application."""
+    from euporie.core.app import BaseApp
+
+    session = _current_app_session.get()
+    if isinstance(session.app, BaseApp):
+        return session.app
+
+    # Use a baseapp as our "DummyApplication"
+    return BaseApp()

euporie/core/formatted_text/ansi.py

@@ -17,7 +17,7 @@ log = logging.getLogger(__name__)
 class ANSI(PTANSI):
     """Convert ANSI text into formatted text, preserving all control sequences."""
 
-    def __init__(self, value: str, tab_size: int = 4) -> None:
+    def __init__(self, value: str, tab_size: int = 8) -> None:
         """Initiate the ANSI processor instance.
 
         This replaces carriage returns to emulate terminal output.
@@ -27,7 +27,8 @@ class ANSI(PTANSI):
             tab_size: The number of spaces to use to represent a tab
 
         """
-        self.tab_size = tab_size
+        # Replace tabs with spaces
+        value = value.expandtabs(tabsize=tab_size)
         # Replace windows style newlines
         value = value.replace("\r\n", "\n")
         # Remove anything before a carriage return if there is something after it to
@@ -35,7 +36,7 @@ class ANSI(PTANSI):
         value = re.sub(r"^.*\r(?!\n)", "", value, 0, re.MULTILINE)
         # Clear line by deleting previous characters
         value = re.sub(r".*\x1b\[2K", "", value, 0)
-        # Ignore cursor hide / show request
+        # Remove hide & show cursor commands
         value = re.sub(r"\x1b\[\?25[hl]", "", value, 0)
 
         super().__init__(value)
@@ -75,11 +76,6 @@ class ANSI(PTANSI):
                 formatted_text.pop()
                 continue
 
-            # Check for tabs
-            elif char == "\t":
-                formatted_text.append(("", " " * self.tab_size))
-                continue
-
             elif char in ("\x1b", "\x9b"):
                 # Got a CSI sequence, try to compile a control sequence
                 char = yield