github/supysonic
1
0
Fork 0
mirror of https://github.com/spl0k/supysonic.git synced 2024-11-15 06:32:16 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	scanner.py
This commit is contained in:
Emory P 2013-12-06 03:39:39 -05:00
commit 9210b381b8
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scanner.py
View File

@ -32,6 +32,9 @@ class Scanner:
self.__deleted_albums = 0 self.__deleted_albums = 0
self.__deleted_tracks = 0 self.__deleted_tracks = 0
extensions = config.get('base', 'scanner_extensions')
self.__extensions = map(str.lower, extensions.split()) if extensions else None
def scan(self, folder): def scan(self, folder):
print "scanning", folder.path print "scanning", folder.path
valid = [x.lower() for x in config.get('base','filetypes').split(',')] valid = [x.lower() for x in config.get('base','filetypes').split(',')]
@ -189,6 +192,8 @@ class Scanner:
return default return default
def __remove_track(self, track): def __remove_track(self, track):
track.album.tracks.remove(track)
track.folder.tracks.remove(track)
# As we don't have a track -> playlists relationship, SQLAlchemy doesn't know it has to remove tracks # As we don't have a track -> playlists relationship, SQLAlchemy doesn't know it has to remove tracks
# from playlists as well, so let's help it # from playlists as well, so let's help it
for playlist in self.__playlists: for playlist in self.__playlists: