✨ browsr upgrade

Author: juftin

.github/workflows/tests.yaml

@@ -23,11 +23,11 @@ jobs:
             fail-fast: true
             matrix:
                 include:
+                    - { name: Python 3.13, python: "3.13" }
                     - { name: Python 3.12, python: "3.12" }
                     - { name: Python 3.11, python: "3.11" }
                     - { name: Python 3.10, python: "3.10" }
                     - { name: Python 3.9, python: "3.9" }
-                    - { name: Python 3.8, python: "3.8" }
         steps:
             - name: Set up Github Workspace
               uses: actions/checkout@v4

.pre-commit-config.yaml

@@ -1,9 +1,6 @@
-default_stages: [commit]
-fail_fast: false
-
 repos:
     - repo: https://github.com/pre-commit/pre-commit-hooks
-      rev: v4.4.0
+      rev: v6.0.0
       hooks:
           - id: trailing-whitespace
             exclude: '\.ambr$'
@@ -15,13 +12,13 @@ repos:
           - id: mixed-line-ending
 
     - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-      rev: v2.8.0
+      rev: v2.15.0
       hooks:
           - id: pretty-format-toml
             args: [--autofix]
 
     - repo: https://github.com/pre-commit/mirrors-prettier
-      rev: v3.0.0-alpha.9-for-vscode
+      rev: v4.0.0-alpha.8
       hooks:
           - id: prettier
             args: [--print-width=88, --tab-width=4]

browsr/base.py

@@ -9,9 +9,8 @@
 from dataclasses import dataclass, field
 from typing import Any, ClassVar
 
-from textual.app import App
-from textual.binding import Binding
-from textual.dom import DOMNode
+from textual.binding import ActiveBinding
+from textual.screen import Screen
 from textual_universal_directorytree import UPath
 
 from browsr.utils import handle_github_url
@@ -54,15 +53,15 @@ def path(self) -> UPath:
             return path.resolve()
 
 
-class SortedBindingsApp(App[str]):
+class SortedBindingsScreen(Screen):
     """
     Textual App with Sorted Bindings
     """
 
     BINDING_WEIGHTS: ClassVar[dict[str, int]] = {}
 
     @property
-    def namespace_bindings(self) -> dict[str, tuple[DOMNode, Binding]]:
+    def active_bindings(self) -> dict[str, ActiveBinding]:
         """
         Return the namespace bindings, optionally sorted by weight
 
@@ -87,7 +86,7 @@ def namespace_bindings(self) -> dict[str, tuple[DOMNode, Binding]]:
         dict[str, tuple[DOMNode, Binding]]
             A dictionary of bindings
         """
-        existing_bindings = super().namespace_bindings
+        existing_bindings = super().active_bindings
         if not self.BINDING_WEIGHTS:
             return existing_bindings
         builtin_index = 500

browsr/browsr.py

@@ -12,18 +12,18 @@
 from typing import Any, ClassVar
 
 from textual import on
+from textual.app import App
 from textual.binding import Binding, BindingType
 from textual.events import Mount
 
 from browsr.__about__ import __application__
 from browsr.base import (
-    SortedBindingsApp,
     TextualAppContext,
 )
 from browsr.screens import CodeBrowserScreen
 
 
-class Browsr(SortedBindingsApp):
+class Browsr(App[str]):
     """
     Textual code browser app.
     """
@@ -34,18 +34,6 @@ class Browsr(SortedBindingsApp):
         Binding(key="q", action="quit", description="Quit"),
         Binding(key="d", action="toggle_dark", description="Dark Mode"),
     ]
-    BINDING_WEIGHTS: ClassVar[dict[str, int]] = {
-        "ctrl+c": 1,
-        "q": 2,
-        "f": 3,
-        "t": 4,
-        "n": 5,
-        "d": 6,
-        "r": 995,
-        ".": 996,
-        "c": 997,
-        "x": 998,
-    }
 
     def __init__(
         self,

browsr/screens/code_browser.py

@@ -11,18 +11,17 @@
 from textual.binding import Binding, BindingType
 from textual.containers import Horizontal
 from textual.events import Mount
-from textual.screen import Screen
 from textual.widget import Widget
 from textual.widgets import Footer, Header
 from textual_universal_directorytree import UPath
 
-from browsr.base import TextualAppContext
+from browsr.base import SortedBindingsScreen, TextualAppContext
 from browsr.utils import get_file_info
 from browsr.widgets.code_browser import CodeBrowser
 from browsr.widgets.files import CurrentFileInfoBar
 
 
-class CodeBrowserScreen(Screen):
+class CodeBrowserScreen(SortedBindingsScreen):
     """
     Code Browser Screen
     """
@@ -35,6 +34,19 @@ class CodeBrowserScreen(Screen):
         Binding(key=".", action="parent_dir", description="Parent Directory"),
     ]
 
+    BINDING_WEIGHTS: ClassVar[dict[str, int]] = {
+        "ctrl+c": 1,
+        "q": 2,
+        "f": 3,
+        "t": 4,
+        "n": 5,
+        "d": 6,
+        "r": 995,
+        ".": 996,
+        "c": 997,
+        "x": 998,
+    }
+
     def __init__(
         self,
         config_object: TextualAppContext | None = None,

browsr/widgets/windows.py

@@ -69,7 +69,7 @@ def file_to_image(self, file_path: UPath) -> Pixels:
         """
         Load a file into an image
         """
-        screen_width = self.app.size.width / 4
+        screen_width = self.app.size.width / 2
         content = open_image(document=file_path, screen_width=screen_width)
         return content
 

pyproject.toml

@@ -10,49 +10,49 @@ classifiers = [
   "Development Status :: 4 - Beta",
   "Operating System :: OS Independent",
   "Programming Language :: Python",
-  "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
   "Programming Language :: Python :: Implementation :: CPython",
   "Programming Language :: Python :: Implementation :: PyPy"
 ]
 dependencies = [
-  "art~=6.1",
+  "art~=6.5",
   "click~=8.1.7",
   "pandas>2,<3",
-  "rich~=13.7.1",
-  "rich-click~=1.7.4",
-  "rich-pixels~=2.2.0",
-  "textual==0.53.1",
-  "textual-universal-directorytree~=1.5.0",
-  "universal-pathlib~=0.2.2",
-  "Pillow>=10.2.0",
-  "PyMuPDF~=1.23.26",
-  "pyperclip~=1.8.2"
+  "rich>=14,<15",
+  "rich-click~=1.8.9",
+  "rich-pixels~=3.0.1",
+  "textual>=5,<6",
+  "textual-universal-directorytree~=1.6.0",
+  "universal-pathlib~=0.2.6",
+  "Pillow>=11.3.0",
+  "PyMuPDF~=1.26.3",
+  "pyperclip~=1.9.0"
 ]
 description = "TUI File Browser App"
 dynamic = ["version"]
 keywords = []
 license = "MIT"
 name = "browsr"
 readme = "README.md"
-requires-python = ">=3.8,<4.0"
+requires-python = ">=3.9,<4.0"
 
 [project.optional-dependencies]
 all = [
-  "pyarrow~=15.0.2",
-  "textual-universal-directorytree[remote]~=1.5.0"
+  "pyarrow~=21.0.0",
+  "textual-universal-directorytree[remote]~=1.6.0"
 ]
 data = [
-  "pyarrow~=15.0.2"
+  "pyarrow~=21.0.0"
 ]
 parquet = [
-  "pyarrow~=15.0.2"
+  "pyarrow~=21.0.0"
 ]
 remote = [
-  "textual-universal-directorytree[remote]~=1.5.0"
+  "textual-universal-directorytree[remote]~=1.6.0"
 ]
 
 [project.scripts]
@@ -91,7 +91,7 @@ pip-compile-constraint = ""
 template = "test"
 
 [[tool.hatch.envs.all.matrix]]
-python = ["3.8", "3.9", "3.10", "3.11", "3.12"]
+python = ["3.9", "3.10", "3.11", "3.12", "3.13"]
 
 [tool.hatch.envs.default]
 features = ["all"]