github/supysonic
1
0
Fork 0
mirror of https://github.com/spl0k/supysonic.git synced 2024-11-12 21:22:17 +00:00
Code Issues Releases Wiki Activity

Fixed scanning

Browse Source
This commit is contained in:
spl0k 2014-07-27 23:20:17 +02:00
parent a18f670ff0
commit 18ecf0fc08
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
supysonic/scanner.py
View File

@ -21,6 +21,7 @@
import os, os.path import os, os.path
import time, mimetypes import time, mimetypes
import mutagen import mutagen
from storm.expr import Like, SQL
from supysonic import config from supysonic import config
from supysonic.db import Folder, Artist, Album, Track from supysonic.db import Folder, Artist, Album, Track
@ -163,22 +164,24 @@ class Scanner:
def __find_root_folder(self, path): def __find_root_folder(self, path):
path = os.path.dirname(path) path = os.path.dirname(path)
folders = self.__store.find(Folder, path.startswith(Folder.path), Folder.root == True) folders = self.__store.find(Folder, Like(path, SQL("folder.path||'%'")), Folder.root == True)
if folders.count() > 1: count = folders.count()
if count > 1:
raise Exception("Found multiple root folders for '{}'.".format(path)) raise Exception("Found multiple root folders for '{}'.".format(path))
elif folders.count() == 0: elif count == 0:
raise Exception("Couldn't find the root folder for '{}'.\nDon't scan files that aren't located in a defined music folder") raise Exception("Couldn't find the root folder for '{}'.\nDon't scan files that aren't located in a defined music folder".format(path))
return folders.one() return folders.one()
def __find_folder(self, path): def __find_folder(self, path):
path = os.path.dirname(path) path = os.path.dirname(path)
folders = self.__store.find(Folder, Folder.path == path) folders = self.__store.find(Folder, Folder.path == path)
if folders.count() > 1: count = folders.count()
if count > 1:
raise Exception("Found multiple folders for '{}'.".format(path)) raise Exception("Found multiple folders for '{}'.".format(path))
elif folders.count() == 1: elif count == 1:
return folders.one() return folders.one()
folder = self.__store.find(Folder, path.startswith(Folder.path)).order_by(Folder.path).last() folder = self.__store.find(Folder, Like(path, SQL("folder.path||'%'"))).order_by(Folder.path).last()
full_path = folder.path full_path = folder.path
path = path[len(folder.path) + 1:] path = path[len(folder.path) + 1:]