Linting fixes

Author: ESultanik

src/vendetect/_cli.py

@@ -146,12 +146,13 @@ def output_json(
     json.dump(results, output, indent=2)
 
 
-def output_rich(  # noqa: PLR0912 PLR0915 C901
+def output_rich(  # noqa: PLR0912 PLR0913 PLR0915 C901
     detections: Iterable[Detection],
     console: Console,
     min_similarity: float = 0.5,
     output_file: TextIO | None = None,
     collapse_identical_lines_threshold: int = 10,
+    edit_distance_threshold: float = 0.75,
 ) -> None:
     # If an output file is specified, create a new Console for it
     file_console = Console(file=output_file) if output_file else console
@@ -232,14 +233,16 @@ def read_file_content(file: File) -> str:
                     else:
                         if diff_line.status == DiffLineStatus.COPIED:
                             status_col = Text("←", style="red reverse bold")
+                        # calculate the normalized edit distance
+                        elif (
+                            diff_line.left is not None
+                            and diff_line.right is not None
+                            and normalized_edit_distance(diff_line.left, diff_line.right) < edit_distance_threshold
+                        ):
+                            # the lines are at least 25% similar!
+                            status_col = Text("↜", style="yellow reverse")
                         else:
-                            # calculate the normalized edit distance
-                            if diff_line.left is not None and diff_line.right is not None and \
-                                    normalized_edit_distance(diff_line.left, diff_line.right) < 0.75:
-                                # the lines are at least 25% similar!
-                                status_col = Text("↜", style="yellow reverse")
-                            else:
-                                status_col = Text("✓", style="green reverse")
+                            status_col = Text("✓", style="green reverse")
                         if diff_line.left is None:
                             left: ConsoleRenderable = Text("")
                         else:

src/vendetect/diffing.py

@@ -203,9 +203,9 @@ def diff_from_offsets(
 
 
 def edit_distance(s1: str, s2: str) -> int:
-    """Calculates the minimum number of edits to convert s1 into s2"""
-    # HACK: insert a newline after every character, then use the Myers Diff algorithm since it's built into Python;
-    #       the result should be the same as Levenshtein distance!
+    """Calculate the minimum number of edits to convert s1 into s2."""
+    # insert a newline after every character, then use the Myers Diff algorithm since it's built into Python;
+    # the result should be the same as Levenshtein distance!
     newline = "\n"
     s1 = f"{newline.join(s1)}\n"
     s2 = f"{newline.join(s2)}\n"

src/vendetect/repo.py

@@ -294,12 +294,11 @@ def __init__(self, path: Path, repo: Repository):
     @property
     def line_start_offsets(self) -> list[int]:
         if not self._line_start_offsets:
-            with self.repo:
-                with open(self.path, "r") as f:
-                    self._line_start_offsets.append(0)
-                    for line in f:
-                        self._line_start_offsets.append(self._line_start_offsets[-1] + len(line))
-                    self._line_start_offsets.pop()
+            with self.repo, self.path.open("r") as f:
+                self._line_start_offsets.append(0)
+                for line in f:
+                    self._line_start_offsets.append(self._line_start_offsets[-1] + len(line))
+                self._line_start_offsets.pop()
         return self._line_start_offsets
 
     def __hash__(self) -> int:
@@ -316,13 +315,12 @@ def resolve(self) -> Self:
                 return self.__class__(self.path.readlink(), self.repo)
             return self
 
-    def get_line(self, byte_offset: int, rounding: Rounding = Rounding.DOWN, min_line: int = 0):
-        """Returns the zero-indexed line associated with byte offset `byte_offset`"""
+    def get_line(self, byte_offset: int, rounding: Rounding = Rounding.DOWN, min_line: int = 0) -> int:
+        """Return the zero-indexed line associated with byte offset `byte_offset`."""
         if byte_offset < 0:
-            with self.repo:
-                with open(self.path, "r") as f:
-                    f.seek(byte_offset, SEEK_END)
-                    byte_offset = f.tell()
+            with self.repo, self.path.open("r") as f:
+                f.seek(byte_offset, SEEK_END)
+                byte_offset = f.tell()
         if rounding == Rounding.DOWN:
             start = max(min_line, 0)
             while start + 1 < len(self.line_start_offsets) and self.line_start_offsets[start + 1] < byte_offset: