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

Don't duplicate file check if currentDirectory is also in mediaFilesCache & allow checkForFileSwitchUpdate to be called without argument

Browse Source
This commit is contained in:
Et0h 2016-01-31 15:32:10 +00:00
parent 42817b9087
commit c77fc66f15
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
syncplay/client.py
View File

@ -1558,16 +1558,14 @@ class FileSwitchManager(object):
self.mediaDirectories = mediaDirs self.mediaDirectories = mediaDirs
self.updateInfo() self.updateInfo()
def checkForFileSwitchUpdate(self, bob=None): def checkForFileSwitchUpdate(self):
if bob is not None:
print bob
if self.newInfo: if self.newInfo:
self.newInfo = False self.newInfo = False
self.infoUpdated() self.infoUpdated()
def updateInfo(self): def updateInfo(self):
if len(self.filenameWatchlist) > 0 or len(self.mediaFilesCache) == 0 and self.currentlyUpdating == False: if len(self.filenameWatchlist) > 0 or len(self.mediaFilesCache) == 0 and self.currentlyUpdating == False:
threads.deferToThread(self._updateInfoThread).addCallback(self.checkForFileSwitchUpdate) threads.deferToThread(self._updateInfoThread).addCallback(lambda x: self.checkForFileSwitchUpdate())
def setFilenameWatchlist(self, unfoundFilenames): def setFilenameWatchlist(self, unfoundFilenames):
self.filenameWatchlist = unfoundFilenames self.filenameWatchlist = unfoundFilenames
@ -1622,8 +1620,9 @@ class FileSwitchManager(object):
if self.mediaFilesCache is not None: if self.mediaFilesCache is not None:
for directory in self.mediaFilesCache: for directory in self.mediaFilesCache:
if self.currentDirectory and self.currentDirectory == directory:
continue
files = self.mediaFilesCache[directory] files = self.mediaFilesCache[directory]
if len(files) > 0 and filename in files: if len(files) > 0 and filename in files:
filepath = os.path.join(directory, filename) filepath = os.path.join(directory, filename)
if os.path.isfile(filepath): if os.path.isfile(filepath):