summaryrefslogtreecommitdiff
path: root/app.py
diff options
context:
space:
mode:
authorJon Bergli Heier <snakebite@jvnv.net>2012-02-18 14:31:43 +0100
committerJon Bergli Heier <snakebite@jvnv.net>2012-02-18 14:31:43 +0100
commitcec08e05eb0da0b6965ddec56522ee4c9045f3bc (patch)
treeb21b83aed37bde32a78e7bd5f91e8a1792e203c7 /app.py
parentc797394d45a1ff820b4f4ffc465bc51c00fed7b1 (diff)
Fixed directory browsing and added player control buttons.
Diffstat (limited to 'app.py')
-rwxr-xr-xapp.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/app.py b/app.py
index 18c48f5..8f32dda 100755
--- a/app.py
+++ b/app.py
@@ -5,12 +5,13 @@ from config import config
class JSONApplication(object):
def list(self, environ, start_response, path):
- root = os.path.join(config.get('music_root'), '/'.join(path[1:]))
- if root[-1] == '/':
- root = root[:-1]
+ root_id = int(path[1]) if len(path[1]) else 0
session = db.Session()
try:
- directory = db.Directory.get(session, root)
+ if root_id > 0:
+ directory = db.Directory.get_by_id(session, root_id)
+ else:
+ directory = db.Directory.get(session, config.get('music_root'))
directories = directory.children
tracks = directory.tracks
contents = json.dumps([x.dict() for x in directories] +