Don't complain about differences if data is hidden
This commit is contained in:
parent
ac646a5c20
commit
d65078bcfa
@ -152,13 +152,17 @@ def sameHashed(string1raw, string1hashed, string2raw, string2hashed):
|
|||||||
return True
|
return True
|
||||||
|
|
||||||
def sameFilename (filename1, filename2):
|
def sameFilename (filename1, filename2):
|
||||||
if sameHashed(stripfilename(filename1), hashFilename(filename1), stripfilename(filename2), hashFilename(filename2)):
|
if filename1 == constants.PRIVACY_HIDDENFILENAME or filename2 == constants.PRIVACY_HIDDENFILENAME:
|
||||||
|
return True
|
||||||
|
elif sameHashed(stripfilename(filename1), hashFilename(filename1), stripfilename(filename2), hashFilename(filename2)):
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def sameFilesize (filesize1, filesize2):
|
def sameFilesize (filesize1, filesize2):
|
||||||
if sameHashed(filesize1, hashFilesize(filesize1), filesize2, hashFilesize(filesize2)):
|
if filesize1 == 0 or filesize2 == 0:
|
||||||
|
return True
|
||||||
|
elif sameHashed(filesize1, hashFilesize(filesize1), filesize2, hashFilesize(filesize2)):
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
return False
|
return False
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user