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

Check if directory is in media directory, not just media cache, to avoid false negative if cache is unpopulated

Browse Source
This commit is contained in:
Et0h 2016-06-11 13:24:05 +01:00
parent 8ad4ca586e
commit 66087de5f0
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
syncplay/client.py
View File

@ -1731,19 +1731,29 @@ class FileSwitchManager(object):
return directory return directory
return None return None
def isDirectoryInList(self, directoryToFind, folderList):
if directoryToFind and folderList:
normedDirectoryToFind = os.path.normcase(os.path.normpath(directoryToFind))
for listedFolder in folderList:
normedListedFolder = os.path.normcase(os.path.normpath(listedFolder))
if normedDirectoryToFind.startswith(normedListedFolder):
return True
return False
def notifyUserIfFileNotInMediaDirectory(self, filenameToFind, path): def notifyUserIfFileNotInMediaDirectory(self, filenameToFind, path):
directoryToFind = os.path.dirname(path) directoryToFind = os.path.dirname(path)
if directoryToFind in self.mediaDirectoriesNotFound: if directoryToFind in self.mediaDirectoriesNotFound:
return return
if self.mediaDirectories and self.mediaFilesCache is not None: if self.mediaDirectories is not None and self.mediaFilesCache is not None:
if self.mediaFilesCache: if directoryToFind in self.mediaFilesCache:
return
for directory in self.mediaFilesCache:
files = self.mediaFilesCache[directory]
if filenameToFind in files:
return
if directoryToFind in self.mediaFilesCache: if directoryToFind in self.mediaFilesCache:
return return
for directory in self.mediaFilesCache: if self.isDirectoryInList(directoryToFind, self.mediaDirectories):
files = self.mediaFilesCache[directory] return
if filenameToFind in files:
return
if directoryToFind in self.mediaFilesCache:
return
self._client.ui.showErrorMessage(getMessage("added-file-not-in-media-directory-error").format(directoryToFind)) self._client.ui.showErrorMessage(getMessage("added-file-not-in-media-directory-error").format(directoryToFind))
self.mediaDirectoriesNotFound.append(directoryToFind) self.mediaDirectoriesNotFound.append(directoryToFind)