From 58260c56e1714424abfc6fdd1c8f9ec52ada37a4 Mon Sep 17 00:00:00 2001 From: Etoh Date: Mon, 1 Jul 2013 23:03:17 +0100 Subject: [PATCH] Add filename stripping to client.py --- syncplay/client.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/syncplay/client.py b/syncplay/client.py index 0a6f5c2..4958cb0 100644 --- a/syncplay/client.py +++ b/syncplay/client.py @@ -2,6 +2,7 @@ import hashlib import os.path import time +import re from twisted.internet.protocol import ClientFactory from twisted.internet import reactor, task from syncplay.protocols import SyncClientProtocol @@ -422,9 +423,12 @@ class SyncplayUser(object): self.file = file_ def isFileSame(self, file_): + def stripfilename(filename): + return re.sub(constants.FILENAME_STRIP_REGEX,"",filename) + if(not self.file): return False - sameName = self.file['name'] == file_['name'] + sameName = stripfilename(self.file['name']) == stripfilename(file_['name']) sameSize = self.file['size'] == file_['size'] sameDuration = int(self.file['duration']) - int(file_['duration']) < constants.DIFFFERENT_DURATION_THRESHOLD return sameName and sameSize and sameDuration