github/supysonic
1
0
Fork 0
mirror of https://github.com/spl0k/supysonic.git synced 2024-12-23 01:16:18 +00:00
Code Issues Releases Wiki Activity

Scanner: don't require a folder instance to call __scan_file

Browse Source
This commit is contained in:
spl0k 2014-06-11 17:53:33 +02:00
parent c29a2284b8
commit 21f14a6dc1
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
supysonic/scanner.py
View File

@ -49,7 +49,7 @@ class Scanner:
current = 0 current = 0
for path in files: for path in files:
self.__scan_file(path, folder) self.__scan_file(path)
current += 1 current += 1
if progress_callback: if progress_callback:
progress_callback(current, total) progress_callback(current, total)
@ -83,7 +83,7 @@ class Scanner:
return True return True
return os.path.splitext(path)[1][1:].lower() in self.__extensions return os.path.splitext(path)[1][1:].lower() in self.__extensions
def __scan_file(self, path, folder): def __scan_file(self, path):
tr = filter(lambda t: t.path == path, self.__tracks) tr = filter(lambda t: t.path == path, self.__tracks)
if tr: if tr:
tr = tr[0] tr = tr[0]
@ -99,7 +99,7 @@ class Scanner:
if not tag: if not tag:
return return
tr = db.Track(path = path, root_folder = folder, folder = self.__find_folder(path, folder)) tr = db.Track(path = path, root_folder = self.__find_root_folder(path), folder = self.__find_folder(path))
self.__tracks.append(tr) self.__tracks.append(tr)
self.__added_tracks += 1 self.__added_tracks += 1
@ -137,21 +137,31 @@ class Scanner:
return ar return ar
def __find_folder(self, path, folder): def __find_root_folder(self, path):
path = os.path.dirname(path) path = os.path.dirname(path)
fold = filter(lambda f: f.path == path, self.__folders) folders = filter(lambda f: path.startswith(f.path) and f.root, self.__folders)
if fold: if len(folders) > 1:
return fold[0] raise Exception("Found multiple root folders for '{}'.".format(path))
elif len(folders) == 0:
raise Exception("Couldn't find the root folder for '{}'.\nDon't scan files that aren't located in a defined music folder")
return folders[0]
def __find_folder(self, path):
path = os.path.dirname(path)
folders = filter(lambda f: f.path == path, self.__folders)
if len(folders) > 1:
raise Exception("Found multiple folders for '{}'.".format(path))
elif len(folders) == 1:
return folders[0]
folders = sorted(filter(lambda f: path.startswith(f.path), self.__folders), key = lambda f: len(f.path), reverse = True)
folder = folders[0]
full_path = folder.path full_path = folder.path
path = path[len(folder.path) + 1:] path = path[len(folder.path) + 1:]
for name in path.split(os.sep): for name in path.split(os.sep):
full_path = os.path.join(full_path, name) full_path = os.path.join(full_path, name)
fold = filter(lambda f: f.path == full_path, self.__folders)
if fold:
folder = fold[0]
else:
folder = db.Folder(root = False, name = name, path = full_path, parent = folder) folder = db.Folder(root = False, name = name, path = full_path, parent = folder)
self.__folders.append(folder) self.__folders.append(folder)