From ac8a336c4a3b0f8351a95f4f184e0a92193700cb Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Mon, 22 Aug 2016 21:35:46 -0400 Subject: [PATCH] Fix picture mode's fuzzy block scanner threshold It was always wrongly set to it's weirld old default 75 threshold. fixes #387 --- core/pe/matchblock.py | 2 +- core/pe/scanner.py | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/core/pe/matchblock.py b/core/pe/matchblock.py index e2911d1a..ce96fd9f 100644 --- a/core/pe/matchblock.py +++ b/core/pe/matchblock.py @@ -135,7 +135,7 @@ def async_compare(ref_ids, other_ids, dbname, threshold, picinfo): cache.close() return results -def getmatches(pictures, cache_path, threshold=75, match_scaled=False, j=job.nulljob): +def getmatches(pictures, cache_path, threshold, match_scaled=False, j=job.nulljob): def get_picinfo(p): if match_scaled: return (None, p.is_ref) diff --git a/core/pe/scanner.py b/core/pe/scanner.py index dcc9dd9c..aa13e787 100644 --- a/core/pe/scanner.py +++ b/core/pe/scanner.py @@ -13,7 +13,6 @@ from . import matchblock, matchexif class ScannerPE(Scanner): cache_path = None match_scaled = False - threshold = 75 @staticmethod def get_scan_options(): @@ -24,7 +23,13 @@ class ScannerPE(Scanner): def _getmatches(self, files, j): if self.scan_type == ScanType.FuzzyBlock: - return matchblock.getmatches(files, self.cache_path, self.threshold, self.match_scaled, j) + return matchblock.getmatches( + files, + cache_path=self.cache_path, + threshold=self.min_match_percentage, + match_scaled=self.match_scaled, + j=j + ) elif self.scan_type == ScanType.ExifTimestamp: return matchexif.getmatches(files, self.match_scaled, j) else: