Improve FilterErrorBuilder.can_build heuristics

mreg_cli/errorbuilder.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from functools import cache
 import logging
 import shlex
 from abc import ABC, abstractmethod
@@ -107,12 +108,16 @@ def can_build(self) -> bool:  # noqa: D102
         return True
 
 
+DEFAULT_OFFSET = (-1, -1)
+
+
 class FilterErrorBuilder(ErrorBuilder):
     """Error builder for commands with a filter."""
 
     SUGGESTION = "Consider enclosing this part in quotes."
 
     @staticmethod
+    @cache
     def find_word_with_char_offset(command: str, char: str) -> tuple[int, int]:
         """Find the start and end index of a word containing a specific character.
 
@@ -126,7 +131,7 @@ def find_word_with_char_offset(command: str, char: str) -> tuple[int, int]:
         """
         command = command.strip()
         if not command:
-            return -1, -1
+            return DEFAULT_OFFSET
 
         # Parse the command into parts
         cmd = shlex.split(command, posix=False)  # keep quotes and backslashes
@@ -154,13 +159,14 @@ def find_word_with_char_offset(command: str, char: str) -> tuple[int, int]:
                 )
             else:
                 return start, end
-        return -1, -1
+        return DEFAULT_OFFSET
 
     def get_offset(self) -> tuple[int, int]:  # noqa: D102 (missing docstring [inherit it from parent])
         return self.find_word_with_char_offset(self.command, "|")
 
     def can_build(self) -> bool:  # noqa: D102 (missing docstring [inherit it from parent])
-        return "|" in self.command
+        offset = self.get_offset()
+        return offset != DEFAULT_OFFSET
 
 
 BUILDERS: list[type[ErrorBuilder]] = [

tests/test_errorbuilder.py

@@ -17,7 +17,12 @@
     [
         (
             r"permission label_add 192.168.0.0/24 oracle-group ^(db|cman)ora.*\.example\.com$ oracle",
-            "failed to compile regex",
+            "Unable to compile regex",
+            FilterErrorBuilder,
+        ),
+        (
+            r"permission network_add 192.168.0.0/24 pg-group ^db(pg|my).*\.example\.com$",
+            "Unable to compile regex",
             FilterErrorBuilder,
         ),
         (
@@ -35,7 +40,8 @@ def test_get_builder(command: str, exc_or_str: str, expected: type[ErrorBuilder]
     assert builder.get_underline(5, 10) == "     ^^^^^"
 
 
-def test_build_error_message() -> None:
+def test_build_error_message_regex() -> None:
+    """Test the build_error_message function with command with regex argument."""
     # Regex as part of the command
     assert build_error_message(
         r"permission label_add 192.168.0.0/24 oracle-group ^(db|cman)ora.*\.example\.com$ oracle",
@@ -47,6 +53,9 @@ def test_build_error_message() -> None:
                                                  └ Consider enclosing this part in quotes.\
 """)
 
+
+def test_build_error_message_regex_final_part() -> None:
+    """Test the build_error_message function with command with regex argument as final argument."""
     # Regex as final part of the command
     assert build_error_message(
         r"permission network_add 192.168.0.0/24 pg-group ^db(pg|my).*\.example\.com$",
@@ -58,6 +67,8 @@ def test_build_error_message() -> None:
                                                └ Consider enclosing this part in quotes.\
 """)
 
+
+def test_build_error_message_fallback_default() -> None:
     # No suggestion for this error
     assert build_error_message(
         r"permission label_add other_error", "Other error message"