.pre-commit-config.yaml

@@ -2,7 +2,7 @@ files: ^halig|tests$
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v4.5.0
     hooks:
       - id: trailing-whitespace
         args: [ --markdown-linebreak-ext=md ]
@@ -19,14 +19,20 @@ repos:
         args: [ --fix=lf ]
 
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.4.4
+    rev: v0.1.6
     hooks:
       - id: ruff
         args:
           - --fix
           - --exit-non-zero-on-fix
-      - id: ruff-format
- 
+
+  - repo: https://github.com/psf/black
+    rev: 23.11.0
+    hooks:
+      - id: black
+        pass_filenames: false
+        args:
+          - "halig"
 
   - repo: local
     hooks:

halig/commands/base.py

@@ -5,7 +5,8 @@ from halig.settings import Settings
 
 class ICommand(ABC):
     @abstractmethod
-    def run(self): ...  # pragma: no cover
+    def run(self):
+        ...  # pragma: no cover
 
 
 class BaseCommand(ICommand):

halig/commands/notebooks.py

@@ -8,15 +8,8 @@ from halig.commands.base import BaseCommand
 
 
 class NotebooksCommand(BaseCommand):
-    def __init__(
-        self,
-        max_depth: int | float,
-        include_notes: bool = False,
-        *args,
-        **kwargs,
-    ):
+    def __init__(self, max_depth: int | float, *args, **kwargs):
         self.max_depth = max_depth
-        self.include_notes = include_notes
         super().__init__(*args, **kwargs)
 
     def build_tree(self, root_path: Path):
@@ -31,7 +24,7 @@ class NotebooksCommand(BaseCommand):
                     if item.name != ".git":
                         item_tree_node = current_tree_node.add(item.name)
                         q.append((item, item_tree_node, depth + 1))
-                elif self.include_notes and item.name.endswith(".age"):
+                else:
                     current_tree_node.add(item.name)
         return tree
 

halig/literals.py

@@ -24,7 +24,6 @@ time you perform a search, this flag should be set. Afterwards, you should only
 when new notes have been added or older ones have been changed, since it's a slow
 operation"""
 OPTION_PLAIN_HELP = "Show the note as plaintext"
-OPTION_INCLUDE_NODES_HELP = "Include each notebook's notes when listing"
 # ARGUMENTS
 ARGUMENT_EDIT_NOTE_HELP = """A valid, settings-relative path.
 Be aware that valid can also mean implicit notes, that is, pointing to a

halig/main.py

@@ -52,17 +52,12 @@ def notebooks(
         "-l",
         help=literals.OPTION_LEVEL_HELP,
     ),
-    include_notes: bool = Option(False, help=literals.OPTION_INCLUDE_NODES_HELP),
     config: Optional[Path] = config_option,  # noqa: UP007
 ):
     if level < 0:
         level = float("inf")  # type: ignore[assignment]
     settings = load_from_file(config)
-    command = NotebooksCommand(
-        settings=settings,
-        max_depth=level,
-        include_notes=include_notes,
-    )
+    command = NotebooksCommand(settings=settings, max_depth=level)
     command.run()
 
 

halig/utils.py

@@ -9,7 +9,7 @@ from rich import print
 
 def now():
     tz = local_timezone()
-    return pendulum.now(tz)  # type: ignore[reportArgumentType]
+    return pendulum.now(tz)
 
 
 def capture(fn: Callable):
@@ -24,7 +24,7 @@ def capture(fn: Callable):
             print(f"[red]{exc}")
             sys.exit(1)
         except Exception as exc:  # noqa: BLE001
-            print(f"[bold red] Unexpected error: {exc}")
+            print(f"[beld red] Unexpected error: {exc}")
             sys.exit(2)
 
     return wrapper

pyproject.toml

@@ -86,9 +86,8 @@ mock_use_standalone_module = true
 [tool.pyright]
 reportMissingImports = false
 reportMissingTypeStubs = false
-reportAttributeAccessIssue = false
 
-[tool.ruff.lint]
+[tool.ruff]
 extend-select = ["W", "C90", "I", "N", "UP", "S", "BLE", "B", "A", "COM", "C4", "DTZ", "T10", "EM", "ISC", "T20", "PT", "RSE", "RET", "SIM", "PTH", "ERA", "PGH", "PL", "TRY", "RUF"]
 extend-ignore = ["S101", "ISC002"]
 
@@ -96,7 +95,6 @@ extend-ignore = ["S101", "ISC002"]
 python_version = "3.11"
 warn_return_any = true
 warn_unused_configs = true
-
 [[tool.mypy.overrides]]
 module = [
     "pyrage",

tests/commands/test_notebooks.py

@@ -25,14 +25,12 @@ def test_build_tree_max_depth_2(notes, notebooks_command: NotebooksCommand):
     work = tree.children[1]
     assert personal.label == "Personal"
     assert work.label == "Work"
-    assert len(work.children) == 1
-    assert len(personal.children) == 0
+    assert len(work.children) == 2
+    assert len(personal.children) == 1
 
 
-def test_build_tree_max_depth_inf(notes, settings):
-    tree = NotebooksCommand(max_depth=float("inf"), settings=settings, include_notes=True).build_tree(
-        settings.notebooks_root_path
-    )
+def test_build_tree_max_depth_inf(notes, notebooks_command: NotebooksCommand):
+    tree = notebooks_command.build_tree(notebooks_command.settings.notebooks_root_path)
     personal = tree.children[0]
     work = tree.children[1]
     assert personal.label == "Personal"

tests/commands/test_reencrypt.py

@@ -1,6 +1,5 @@
 import pytest
 
-from halig import utils
 from halig.commands.reencrypt import ReencryptCommand
 
 
@@ -15,11 +14,3 @@ def test_reencrypt(reencrypt_command):
     for note_path in reencrypt_command.traverse():
         with note_path.open("rb") as f:
             assert reencrypt_command.encryptor.decrypt(f.read()) == b""
-
-
-@pytest.mark.usefixtures("current_daily")
-def test_reencrypt_warns_no_matching_key(reencrypt_command, halig_ssh_path, capfd):
-    reencrypt_command.encryptor.identities = []
-    reencrypt_command.run()
-    out, _ = capfd.readouterr()
-    assert f'because no matching keys were found, skipping ...' in out

tests/conftest.py

@@ -41,6 +41,22 @@ def ssh_recipient(halig_ssh_public_key: str) -> Recipient:
     return Recipient.from_str(halig_ssh_public_key)
 
 
+# @pytest.fixture()
+# def halig_path(fs, halig_ssh_public_key, halig_ssh_private_key) -> Path:
+#    fs.add_real_paths(["/etc/localtime"])
+#    ssh_path = Path("~/.ssh").expanduser()
+#    ssh_path.mkdir(parents=True)
+#
+#    with (ssh_path / "id_ed25519").open("w") as f:
+#        f.write(halig_ssh_private_key)
+#
+#    with (ssh_path / "id_ed25519.pub").open("w") as f:
+#        f.write(halig_ssh_public_key)
+#
+#    halig_path = Path("~/.config/halig").expanduser()
+#    halig_path.mkdir(parents=True)
+#    return halig_path
+
 @pytest.fixture()
 def halig_ssh_path(tmp_path: Path, halig_ssh_public_key, halig_ssh_private_key) -> Path:
     ssh_path = tmp_path / ".ssh"