From 5e52385c68dbd082f57d407aa9b313ea5667de15 Mon Sep 17 00:00:00 2001 From: bskjon Date: Mon, 15 Apr 2024 17:25:12 +0200 Subject: [PATCH] Correction1 --- apps/pyMetadata/sources/select.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/apps/pyMetadata/sources/select.py b/apps/pyMetadata/sources/select.py index 75c78938..16701537 100644 --- a/apps/pyMetadata/sources/select.py +++ b/apps/pyMetadata/sources/select.py @@ -77,11 +77,16 @@ class UseSource(): def select_result(self) -> Optional[DataResult]: """""" - weightResult = self.__perform_search(title=self.title) + scored: List[DataAndScore] = [] + titleResult = self.__perform_search(title=self.title) baseNameResult = self.__perform_search(title=self.baseName) - weightResult.extend(baseNameResult) - - scored = self.__calculate_score(title=self.title, weightData=weightResult) + + titleScoreResult = self.__calculate_score(title=self.title, weightData=titleResult) + baseNameScoreResult = self.__calculate_score(title=self.baseName, weightData=baseNameResult) + + scored.extend(titleScoreResult) + scored.extend(baseNameScoreResult) + scored.sort(key=lambda x: x.score, reverse=True) jsr = "" @@ -95,12 +100,15 @@ class UseSource(): logger.info(jsr) try: + titledResult = titleResult + titledResult.extend(baseNameResult) + titles: List[str] = [] - for wd in weightResult: + for wd in titledResult: titles.append(wd.result.data.title) titles.extend(wd.result.data.altTitle) joinedTitles = "\n\t" + "\n\t".join(titles) - logger.info(f"[Title]: {self.title} \nFound: {joinedTitles} \nTitle selected: \n\t{scored[0].result.data.title}\n") + logger.info(f"\nTitle: {self.title} \nBaseName: {self.baseName} \nFound: {joinedTitles} \nTitle selected: \n\t{scored[0].result.data.title}\n") except Exception as e: logger.error(e) pass