Fix picture mode's fuzzy block scanner threshold

It was always wrongly set to it's weirld old default 75 threshold.

fixes #387
This commit is contained in:
Virgil Dupras 2016-08-22 21:35:46 -04:00
parent 0206f2fd15
commit ac8a336c4a
2 changed files with 8 additions and 3 deletions

View File

@ -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)

View File

@ -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: