1
0
mirror of https://github.com/spl0k/supysonic.git synced 2024-09-20 03:11:04 +00:00
Commit Graph

8 Commits

Author SHA1 Message Date
spl0k
a18f670ff0 Merge branch 'master' into scanner_daemon
Conflicts:
	README.md
	supysonic/scanner.py
	supysonic/web.py
2014-07-27 20:24:35 +02:00
spl0k
01c80fed16 Prevent put() from blocking when the scanner is running 2014-07-27 13:20:51 +02:00
spl0k
132d7b0c8b Improved queue processing 2014-07-27 12:30:45 +02:00
spl0k
2c41e1af64 Merge branch 'master' into storm
Conflicts:
	bin/supysonic-cli
	supysonic/api/__init__.py
	supysonic/api/albums_songs.py
	supysonic/api/annotation.py
	supysonic/api/browse.py
	supysonic/api/chat.py
	supysonic/api/media.py
	supysonic/api/playlists.py
	supysonic/api/search.py
	supysonic/api/user.py
	supysonic/db.py
	supysonic/frontend/__init__.py
	supysonic/frontend/folder.py
	supysonic/frontend/playlist.py
	supysonic/frontend/user.py
	supysonic/lastfm.py
	supysonic/managers/folder.py
	supysonic/managers/user.py
	supysonic/scanner.py
	supysonic/web.py
2014-06-14 17:55:52 +02:00
spl0k
52891cbf4c Scanner get its own thread, one instance might be used for several files 2014-06-14 16:54:04 +02:00
spl0k
b83538f80b A tiny bit more configuration on logging 2014-06-14 14:49:03 +02:00
spl0k
4facfbe275 Added a naive suboptimal foreground filesystem watcher 2014-06-13 19:04:00 +02:00
Jelmer Vernooij
a254d17801 Add a setup.py file. 2014-05-04 23:48:17 +02:00