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

euporie/core/convert/formats/ansi.py

@@ -7,18 +7,18 @@ from functools import partial
 from math import ceil
 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
 from euporie.core.convert.formats.pil import set_background
 from euporie.core.convert.utils import call_subproc, commands_exist, have_modules
 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 rich.console import RenderableType
-    from upath import UPath
 
 log = logging.getLogger(__name__)
 
@@ -34,7 +34,7 @@ def html_to_ansi_w3m(
     height: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str:
     """Convert HTML text to formatted ANSI using :command:`w3m`."""
     cmd: list[Any] = ["w3m", "-T", "text/html"]
@@ -54,7 +54,7 @@ def html_to_ansi_elinks(
     height: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str:
     """Convert HTML text to formatted ANSI using :command:`elinks`."""
     cmd: list[Any] = [
@@ -82,7 +82,7 @@ def html_to_ansi_lynx(
     height: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str:
     """Convert HTML text to formatted ANSI using :command:`lynx`."""
     cmd: list[Any] = ["lynx", "-dump", "-stdin"]
@@ -102,7 +102,7 @@ def html_to_ansi_links(
     height: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str:
     """Convert HTML text to formatted ANSI using :command:`links`."""
     cmd: list[Any] = ["links", "-dump"]
@@ -122,7 +122,7 @@ def html_to_ansi_py_htmlparser(
     height: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str:
     """Convert HTML tables to ANSI text using :py:mod:`HTMLParser`."""
     import io
@@ -179,7 +179,7 @@ def latex_to_ansi_py_flatlatex(
     height: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str:
     """Convert LaTeX to ANSI using :py:mod:`flatlatex`."""
     import flatlatex
@@ -198,7 +198,7 @@ def latex_to_ansi_py_pylatexenc(
     height: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str:
     """Convert LaTeX to ANSI using :py:mod:`pylatexenc`."""
     from pylatexenc.latex2text import LatexNodes2Text
@@ -217,7 +217,7 @@ def latex_to_ansi_py_sympy(
     height: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str:
     """Convert LaTeX to ANSI using :py:mod:`sympy`."""
     from sympy import pretty
@@ -241,14 +241,30 @@ def pil_to_ansi_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 PIL image to ANSI text using :py:mod:`timg`."""
     import timg
 
+    px, py = get_app().term_info.cell_size_px
+
+    # Calculate rows based on image aspect ratio
     w, h = data.size
-    if cols is not None:
-        data = data.resize((cols, ceil(cols / w * h)))
+    if rows is None and cols is not None:
+        w, h = data.size
+        rows = ceil(cols / w * h)
+    elif cols is None and rows is not None:
+        w, h = data.size
+        cols = ceil(rows / h * w)
+    elif rows is None and cols is None:
+        cols = ceil(w / px)
+        rows = ceil(h / py)
+    assert rows is not None and cols is not None
+
+    # `timg` assumes a 2x1 terminal cell aspect ratio, so we correct for while
+    # resizing the image
+    data = data.resize((cols, ceil(rows * 2 * (px / py) / 0.5)))
+
     bg = bg or get_app().color_palette.bg.base_hex
     if bg:
         data = set_background(data, bg)
@@ -267,7 +283,7 @@ def pil_to_ansi_py_img2unicode(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str:
     """Convert a PIL image to ANSI text using :py:mod:`img2unicode`."""
     import io
@@ -305,7 +321,7 @@ def image_to_ansi_timg(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str:
     """Convert image data to ANSI text using :command:`timg`."""
     cmd: list[Any] = ["timg"]
@@ -326,7 +342,7 @@ def image_to_ansi_catimg(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str:
     """Convert image data to ANSI text using :command:`catimg`."""
     cmd: list[Any] = ["catimg"]
@@ -347,7 +363,7 @@ def image_to_ansi_icat(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str:
     """Convert image data to ANSI text using :command:`icat`."""
     cmd: list[Any] = ["icat"]
@@ -368,7 +384,7 @@ def image_to_ansi_tiv(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str:
     """Convert image data to ANSI text using :command:`tiv`."""
     cmd: list[Any] = ["tiv"]
@@ -388,7 +404,7 @@ def image_to_ansi_viu(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str:
     """Convert image data to ANSI text using :command:`viu`."""
     cmd: list[Any] = ["viu"]
@@ -409,7 +425,7 @@ def image_to_ansi_jp2a(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str:
     """Convert image data to ANSI text using :command:`jp2a`."""
     cmd: list[Any] = ["jp2a", "--color"]
@@ -430,7 +446,7 @@ def png_to_ansi_img2txt(
     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 ANSI text using :command:`img2txt`."""
     cmd: list[Any] = ["img2txt"]
@@ -442,15 +458,20 @@ def png_to_ansi_img2txt(
 @register(from_=("png", "jpeg", "svg"), to="ansi", filter_=True, weight=99)
 def png_to_ansi_py_placeholder(
     data: bytes,
-    cols: int = 7,
-    rows: int = 3,
+    cols: int | None = None,
+    rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str:
     """Draw placeholder ANSI text."""
     from euporie.core.border import RoundedLine
 
+    if cols is None:
+        cols = 7
+    if rows is None:
+        rows = 3
+
     lines = []
     B = RoundedLine.grid
     lines.append(f"{B.TOP_LEFT}{B.TOP_MID * max(5, (cols - 2))}{B.TOP_RIGHT}")
@@ -474,7 +495,7 @@ def rich_to_ansi_py(
     height: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str:
     """Convert rich objects to formatted ANSI text."""
     import rich

euporie/core/convert/formats/base64.py

@@ -5,10 +5,10 @@ from __future__ import annotations
 import base64
 from typing import TYPE_CHECKING
 
-from euporie.core.convert.base import register
+from euporie.core.convert.core import register
 
 if TYPE_CHECKING:
-    from upath import UPath
+    from pathlib import Path
 
 
 @register(
@@ -37,7 +37,7 @@ def bytes_to_base64_py(
     height: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str:
     """Convert bytes to base64 encoded data."""
     if isinstance(data, str):

euporie/core/convert/formats/common.py

@@ -10,10 +10,10 @@ from euporie.core.convert.utils import call_subproc
 from euporie.core.current import get_app
 
 if TYPE_CHECKING:
+    from pathlib import Path
     from typing import Any, Literal
 
     from PIL.Image import Image as PilImage
-    from upath import UPath
 
 log = logging.getLogger(__name__)
 
@@ -24,7 +24,7 @@ def base64_to_bytes_py(
     height: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> bytes:
     """Convert base64 encoded data to bytes."""
     data_str = data.decode() if isinstance(data, bytes) else data
@@ -38,18 +38,21 @@ def imagemagick_convert(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str | bytes:
     """Convert image data to PNG bytes using ``imagemagick``."""
     cmd: list[Any] = ["convert"]  # , "-density", "300"]
-    if cols is not None:
-        px, _ = get_app().term_info.cell_size_px
+    app = get_app()
+    if cols is not None and hasattr(app, "term_info"):
+        px, _ = app.term_info.cell_size_px
         cmd += ["-geometry", f"{int(cols * px)}"]
-    bg = bg or get_app().color_palette.bg.base_hex
-    if bg is not None:
+    if not bg and hasattr(app, "color_palette"):
+        bg = app.color_palette.bg.base_hex
+    if bg:
         cmd += ["-background", bg]
     cmd += ["-[0]", f"{output_format}:-"]
     result: bytes | str = call_subproc(data, cmd)
+
     if output_format in {"sixel", "svg"} and isinstance(result, bytes):
         result = result.decode()
     return result
@@ -62,7 +65,7 @@ def chafa_convert_cmd(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str | bytes:
     """Convert image data to ANSI text using :command:`chafa`."""
     cmd: list[Any] = ["chafa", f"--format={output_format}"]
@@ -81,7 +84,7 @@ def chafa_convert_py(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str | bytes:
     """Convert image data to ANSI text using ::`chafa.py`."""
     from chafa.chafa import Canvas, CanvasConfig, PixelMode, PixelType
@@ -109,12 +112,34 @@ def chafa_convert_py(
     config = CanvasConfig()
     # Set output mode
     config.pixel_mode = str_to_pixel_mode[output_format]
-    # Set canvas height and width
-    config.height = rows or 20
-    config.width = cols or 80
     # Configure the canvas geometry based on our cell size
-    config.cell_width, config.cell_height = get_app().term_info.cell_size_px
+    if hasattr(app := get_app(), "term_info"):
+        px, py = app.term_info.cell_size_px
+    else:
+        px, py = 10, 20
+    config.cell_width, config.cell_height = px, py
+    # Set canvas height and width
+    if cols:
+        config.width = cols
+        if rows:
+            config.height = max(1, rows)
+        # If we don't have specified, use the image's aspect
+        else:
+            config.height = max(1, int(cols / data.size[0] * data.size[1] * px / py))
+
+    # Set the foreground color
+    if not fg and hasattr(app, "color_palette"):
+        fg = app.color_palette.fg.base_hex
+    if fg and (color := fg.lstrip("#")):
+        config.fg_color = (
+            int(color[0:2], 16),
+            int(color[2:4], 16),
+            int(color[4:6], 16),
+        )
+
     # Set the background color
+    if not bg and hasattr(app, "color_palette"):
+        bg = app.color_palette.bg.base_hex
     if bg and (color := bg.lstrip("#")):
         config.bg_color = (
             int(color[0:2], 16),

euporie/core/convert/formats/formatted_text.py

@@ -2,23 +2,27 @@
 
 from __future__ import annotations
 
+import logging
 from functools import partial
 from typing import TYPE_CHECKING
 
 from prompt_toolkit.cache import SimpleCache
 from prompt_toolkit.formatted_text import to_formatted_text
 
-from euporie.core.convert.base import register
+from euporie.core.convert.core import register
 from euporie.core.formatted_text.ansi import ANSI
 from euporie.core.formatted_text.utils import strip_one_trailing_newline
 from euporie.core.lexers import detect_lexer
 
 if TYPE_CHECKING:
+    from pathlib import Path
+
     from prompt_toolkit.formatted_text.base import StyleAndTextTuples
-    from upath import UPath
 
     from euporie.core.formatted_text.html import HTML, CssSelectors
 
+log = logging.getLogger(__name__)
+
 _html_cache: SimpleCache[int, HTML] = SimpleCache(maxsize=20)
 
 
@@ -32,7 +36,8 @@ def html_to_ft(
     height: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
+    css: CssSelectors | None = None,
     browser_css: CssSelectors | None = None,
 ) -> StyleAndTextTuples:
     """Convert markdown to formatted text."""
@@ -47,6 +52,7 @@ def html_to_ft(
             width=width,
             base=path,
             collapse_root_margin=True,
+            css=css,
             browser_css=browser_css,
         ),
     )
@@ -71,13 +77,31 @@ def markdown_to_ft(
     height: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> StyleAndTextTuples:
     """Convert markdown to formatted text, injecting a custom CSS style-sheet."""
     from euporie.core.convert.formats.html import markdown_to_html_markdown_it
-    from euporie.core.formatted_text.html import _BROWSER_CSS
     from euporie.core.formatted_text.markdown import _MARKDOWN_CSS
 
+    css = _MARKDOWN_CSS
+
+    # If we are rendering a file rather than a snippet, apply margins to the root
+    if path is not None:
+        from prompt_toolkit.filters.utils import _always
+
+        from euporie.core.formatted_text.html import CssSelector
+
+        css = {
+            _always: {
+                **_MARKDOWN_CSS[_always],
+                ((CssSelector(item="::root"),),): {
+                    "max_width": "100em",
+                    "margin_left": "auto",
+                    "margin_right": "auto",
+                },
+            }
+        }
+
     return html_to_ft(
         markdown_to_html_markdown_it(
             path=path, bg=bg, fg=fg, height=height, width=width, data=data
@@ -87,10 +111,18 @@ def markdown_to_ft(
         fg=fg,
         bg=bg,
         path=path,
-        browser_css={**_BROWSER_CSS, **_MARKDOWN_CSS},
+        css=css,
     )
 
 
+_BLACKLISTED_LEXERS = {
+    "CBM BASIC V2",
+    "Tera Term macro",
+    "Text only",
+    "GDScript",
+}
+
+
 @register(
     from_="ansi",
     to="formatted_text",
@@ -101,17 +133,27 @@ def ansi_to_ft(
     height: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> StyleAndTextTuples:
     """Convert ANSI text to formatted text."""
     markup = data.decode() if isinstance(data, bytes) else data
     ft: StyleAndTextTuples
     if "\x1b" in markup or "\r" in markup:
         ft = to_formatted_text(ANSI(markup.strip()))
-    elif (lexer := detect_lexer(markup, path)) is not None:
-        from prompt_toolkit.lexers.pygments import _token_cache
-
-        ft = [(_token_cache[t], v) for _, t, v in lexer.get_tokens_unprocessed(markup)]
     else:
-        ft = to_formatted_text(markup)
+        # Replace tabs with spaces
+        markup = markup.expandtabs()
+        # Use lexer whitelist
+        if (
+            lexer := detect_lexer(markup, path=path)
+        ) is not None and lexer.name not in _BLACKLISTED_LEXERS:
+            from prompt_toolkit.lexers.pygments import _token_cache
+
+            log.debug('Lexing output using "%s" lexer', lexer.name)
+            ft = [
+                (_token_cache[t], v) for _, t, v in lexer.get_tokens_unprocessed(markup)
+            ]
+
+        else:
+            ft = to_formatted_text(markup)
     return strip_one_trailing_newline(ft)

euporie/core/convert/formats/html.py

@@ -11,13 +11,13 @@ from mdit_py_plugins.dollarmath.index import dollarmath_plugin
 from mdit_py_plugins.texmath.index import texmath_plugin
 from pygments import highlight
 from pygments.formatters import HtmlFormatter
-from pygments.lexers import get_lexer_by_name
 
-from euporie.core.convert.base import register
+from euporie.core.convert.core import register
 from euporie.core.current import get_app
+from euporie.core.lexers import detect_lexer
 
 if TYPE_CHECKING:
-    from upath import UPath
+    from pathlib import Path
 
 log = logging.getLogger(__name__)
 
@@ -36,7 +36,7 @@ markdown_parser = (
             options_update={
                 "highlight": lambda text, language, lang_args: highlight(
                     text,
-                    get_lexer_by_name(language),
+                    detect_lexer(text, language=language),
                     HtmlFormatter(
                         nowrap=True,
                         noclasses=True,
@@ -65,7 +65,7 @@ def markdown_to_html_markdown_it(
     height: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str:
     """Convert markdown to HTML using :py:mod:`markdownit_py`."""
     assert markdown_parser is not None

euporie/core/convert/formats/jpeg.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from euporie.core.convert.base import register
+from euporie.core.convert.core import register
 from euporie.core.convert.formats.common import base64_to_bytes_py
 
 register(

euporie/core/convert/formats/markdown.py

@@ -5,11 +5,11 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING
 
-from euporie.core.convert.base import register
+from euporie.core.convert.core import register
 from euporie.core.convert.utils import have_modules
 
 if TYPE_CHECKING:
-    from upath import UPath
+    from pathlib import Path
 
 log = logging.getLogger(__name__)
 
@@ -27,7 +27,7 @@ def html_to_markdown_py_html2text(
     height: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str:
     """Convert HTML to markdown tables using :py:mod:`html2text`."""
     import re
@@ -73,7 +73,7 @@ def html_to_markdown_py_mtable(
     height: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str:
     """Convert HTML tables to markdown tables using :py:mod:`mtable`."""
     from mtable import MarkupTable

euporie/core/convert/formats/pdf.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from euporie.core.convert.base import register
+from euporie.core.convert.core import register
 from euporie.core.convert.formats.common import base64_to_bytes_py
 
 register(

euporie/core/convert/formats/pil.py

@@ -5,12 +5,13 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING
 
-from euporie.core.convert.base import register
+from euporie.core.convert.core import register
 from euporie.core.convert.utils import have_modules
 
 if TYPE_CHECKING:
+    from pathlib import Path
+
     from PIL.Image import Image as PilImage
-    from upath import UPath
 
 log = logging.getLogger(__name__)
 
@@ -43,7 +44,7 @@ def png_to_pil_py(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> PilImage:
     """Convert PNG to a pillow image using :py:mod:`PIL`."""
     import io
@@ -52,6 +53,7 @@ def png_to_pil_py(
 
     try:
         image = Image.open(io.BytesIO(data))
+        image.load()
     except OSError:
         log.error("Could not load image.")
         return Image.new(mode="P", size=(1, 1))

euporie/core/convert/formats/png.py

@@ -5,13 +5,14 @@ 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 base64_to_bytes_py, imagemagick_convert
 from euporie.core.convert.utils import commands_exist, have_modules
 
 if TYPE_CHECKING:
+    from pathlib import Path
+
     from PIL.Image import Image as PilImage
-    from upath import UPath
 
 
 register(
@@ -31,7 +32,7 @@ def latex_to_png_dvipng(
     height: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> bytes | None:
     """Render LaTeX as a png image using :command:`dvipng`.
 
@@ -112,7 +113,7 @@ def latex_to_png_py_mpl(
     height: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> bytes:
     """Render LaTeX as a png image using :py:module:`matplotlib`.
 
@@ -155,7 +156,7 @@ def pil_to_png_py_pil(
     rows: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> bytes:
     """Convert a pillow image to sixels :py:mod:`teimpy`."""
     import io
@@ -177,7 +178,7 @@ def svg_to_png_py_cairosvg(
     height: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> str:
     """Convert SVG to PNG using :py:mod:`cairosvg`."""
     import cairosvg

euporie/core/convert/formats/rich.py

@@ -4,12 +4,13 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from euporie.core.convert.base import register
+from euporie.core.convert.core import register
 from euporie.core.convert.utils import have_modules
 
 if TYPE_CHECKING:
+    from pathlib import Path
+
     from rich.markdown import Markdown
-    from upath import UPath
 
 
 @register(
@@ -23,7 +24,7 @@ def markdown_to_rich_py(
     height: int | None = None,
     fg: str | None = None,
     bg: str | None = None,
-    path: UPath | None = None,
+    path: Path | None = None,
 ) -> Markdown:
     """Convert base64 encoded data to bytes."""
     from rich.markdown import Markdown