Connection as resolver state

nomenklatura/cli.py

@@ -93,7 +93,7 @@ def xref_file(
     if clear and index_dir.exists():
         log.info("Clearing index: %s", index_dir)
         shutil.rmtree(index_dir, ignore_errors=True)
-
+    resolver_.begin()
     run_xref(
         resolver_,
         store,
@@ -103,7 +103,7 @@ def xref_file(
         scored=scored,
         limit=limit,
     )
-    resolver_.save()
+    resolver_.commit()
     log.info("Xref complete in: %s", resolver_.path)
 
 

nomenklatura/conflicting_match.py

@@ -9,15 +9,15 @@
 from nomenklatura.entity import CE
 from nomenklatura.store import View
 from nomenklatura.judgement import Judgement
-from nomenklatura.resolver import Resolver
+from nomenklatura.resolver import Linker
 from nomenklatura.statement.statement import Statement
 
 
 class ConflictingMatchReporter(Generic[CE]):
-    def __init__(self, view: View[DS, CE], resolver: Resolver[CE], threshold: float):
+    def __init__(self, view: View[DS, CE], linker: Linker[CE], threshold: float):
         self.console = Console()
         self.view = view
-        self.resolver = resolver
+        self.linker = linker
         self.threshold = threshold
         self.matches: Dict[str, Set[str]] = defaultdict(set)
 
@@ -29,7 +29,7 @@ def check_match(self, score: float, left_id: str, right_id: str) -> None:
     def get_conflicting_matches(self) -> Generator[Tuple[str, str, str], None, None]:
         for candidate_id, matches in self.matches.items():
             for left_id, right_id in combinations(matches, 2):
-                judgement = self.resolver.get_judgement(left_id, right_id)
+                judgement = self.linker.get_judgement(left_id, right_id)
                 if judgement == Judgement.NEGATIVE:
                     yield candidate_id, left_id, right_id