Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Add filename stripping to client.py

Browse Source
This commit is contained in:
Etoh 2013-07-01 23:03:17 +01:00
parent 2ab576281b
commit 58260c56e1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
syncplay/client.py
View File

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