From d65078bcfa8b7ff669aaed006e3990df6b467aa7 Mon Sep 17 00:00:00 2001 From: Etoh Date: Sat, 2 Nov 2013 18:16:51 +0000 Subject: [PATCH] Don't complain about differences if data is hidden --- syncplay/utils.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/syncplay/utils.py b/syncplay/utils.py index 02860d5..33b9a82 100644 --- a/syncplay/utils.py +++ b/syncplay/utils.py @@ -152,13 +152,17 @@ def sameHashed(string1raw, string1hashed, string2raw, string2hashed): return True 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 else: return False 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 else: return False