arsenetar/dupeguru
1
0
Fork 0
mirror of https://github.com/arsenetar/dupeguru.git synced 2025-03-10 05:34:36 +00:00
Code Releases Wiki Activity

Updates from investigation of #1015

Browse Source 
- Add protection for empty hash digests in comparison of non-zero size
  files
- Bump version to 4.3.1-dev for identification
This commit is contained in:
Andrew Senetar 2022-07-07 19:00:09 -05:00
parent 360dceca7b
commit d369bcddd7
Signed by: arsenetar
GPG Key ID: C63300DCE48AB2F1
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/__init__.py
View File

@ -1,2 +1,2 @@
__version__ = "4.3.0" __version__ = "4.3.1-dev"
__appname__ = "dupeGuru" __appname__ = "dupeGuru"

7
core/engine.py
View File

@ -303,12 +303,13 @@ def getmatches_by_contents(files, bigsize=0, j=job.nulljob):
# skip hashing for zero length files # skip hashing for zero length files
result.append(Match(first, second, 100)) result.append(Match(first, second, 100))
continue continue
if first.digest_partial == second.digest_partial: # if digests are the same (and not None) then files match
if first.digest_partial == second.digest_partial and first.digest_partial is not None:
if bigsize > 0 and first.size > bigsize: if bigsize > 0 and first.size > bigsize:
if first.digest_samples == second.digest_samples: if first.digest_samples == second.digest_samples and first.digest_samples is not None:
result.append(Match(first, second, 100)) result.append(Match(first, second, 100))
else: else:
if first.digest == second.digest: if first.digest == second.digest and first.digest_samples is not None:
result.append(Match(first, second, 100)) result.append(Match(first, second, 100))
group_count += 1 group_count += 1
j.add_progress(desc=PROGRESS_MESSAGE % (len(result), group_count)) j.add_progress(desc=PROGRESS_MESSAGE % (len(result), group_count))