mirror of
https://github.com/spl0k/supysonic.git
synced 2024-12-23 01:16:18 +00:00
Implemented missing API requests from the browsing module
- getArtists.view - getArtist.view - getAlbum.view - getVideos.view
This commit is contained in:
parent
6c6eb1c603
commit
5895e1c3dd
@ -107,6 +107,71 @@ def show_directory():
|
|||||||
|
|
||||||
return request.formatter({ 'directory': directory })
|
return request.formatter({ 'directory': directory })
|
||||||
|
|
||||||
|
@app.route('/rest/getArtists.view', methods = [ 'GET', 'POST' ])
|
||||||
|
def list_artists():
|
||||||
|
# According to the API page, there are no parameter?
|
||||||
|
indexes = {}
|
||||||
|
for artist in Artist.query.all():
|
||||||
|
index = artist.name[0].upper()
|
||||||
|
if index in map(str, xrange(10)):
|
||||||
|
index = '#'
|
||||||
|
elif index not in string.letters:
|
||||||
|
index = '?'
|
||||||
|
|
||||||
|
if index not in indexes:
|
||||||
|
indexes[index] = []
|
||||||
|
|
||||||
|
indexes[index].append(artist)
|
||||||
|
|
||||||
|
return request.formatter({
|
||||||
|
'artists': {
|
||||||
|
'index': [ {
|
||||||
|
'name': k,
|
||||||
|
'artist': [ a.as_subsonic_artist() for a in sorted(v, key = lambda a: a.name.lower()) ]
|
||||||
|
} for k, v in sorted(indexes.iteritems()) ]
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
@app.route('/rest/getArtist.view', methods = [ 'GET', 'POST' ])
|
||||||
|
def artist_info():
|
||||||
|
id = request.args.get('id')
|
||||||
|
if not id:
|
||||||
|
return request.error_formatter(10, 'Missing artist id')
|
||||||
|
|
||||||
|
try:
|
||||||
|
aid = uuid.UUID(id)
|
||||||
|
except:
|
||||||
|
return request.error_formatter(0, 'Invalid artist id')
|
||||||
|
|
||||||
|
artist = Artist.query.get(aid)
|
||||||
|
if not artist:
|
||||||
|
return request.error_formatter(70, 'Artist not found'), 404
|
||||||
|
|
||||||
|
info = artist.as_subsonic_artist()
|
||||||
|
info['album'] = [ a.as_subsonic_album() for a in sorted(artist.albums, key = lambda a: a.sort_key()) ]
|
||||||
|
|
||||||
|
return request.formatter({ 'artist': info })
|
||||||
|
|
||||||
|
@app.route('/rest/getAlbum.view', methods = [ 'GET', 'POST' ])
|
||||||
|
def album_info():
|
||||||
|
id = request.args.get('id')
|
||||||
|
if not id:
|
||||||
|
return request.error_formatter(10, 'Missing album id')
|
||||||
|
|
||||||
|
try:
|
||||||
|
aid = uuid.UUID(id)
|
||||||
|
except:
|
||||||
|
return request.error_formatter(0, 'Invalid album id')
|
||||||
|
|
||||||
|
album = Album.query.get(aid)
|
||||||
|
if not album:
|
||||||
|
return request.error_formatter(70, 'Album not found'), 404
|
||||||
|
|
||||||
|
info = album.as_subsonic_album()
|
||||||
|
info['song'] = [ t.as_subsonic_child() for t in sorted(album.tracks, key = lambda t: t.sort_key()) ]
|
||||||
|
|
||||||
|
return request.formatter({ 'artist': info })
|
||||||
|
|
||||||
@app.route('/rest/getSong.view', methods = [ 'GET', 'POST' ])
|
@app.route('/rest/getSong.view', methods = [ 'GET', 'POST' ])
|
||||||
def track_info():
|
def track_info():
|
||||||
id = request.args.get('id')
|
id = request.args.get('id')
|
||||||
@ -123,3 +188,8 @@ def track_info():
|
|||||||
return request.error_formatter(70, 'Media not found'), 404
|
return request.error_formatter(70, 'Media not found'), 404
|
||||||
|
|
||||||
return request.formatter({ 'song': track.as_subsonic_child() })
|
return request.formatter({ 'song': track.as_subsonic_child() })
|
||||||
|
|
||||||
|
@app.route('/rest/getVideos.view', methods = [ 'GET', 'POST' ])
|
||||||
|
def list_videos():
|
||||||
|
return request.error_formatter(0, 'Video streaming not supported')
|
||||||
|
|
||||||
|
31
db.py
31
db.py
@ -96,6 +96,15 @@ class Artist(Base):
|
|||||||
name = Column(String, unique = True)
|
name = Column(String, unique = True)
|
||||||
albums = relationship('Album', backref = 'artist')
|
albums = relationship('Album', backref = 'artist')
|
||||||
|
|
||||||
|
def as_subsonic_artist(self):
|
||||||
|
return {
|
||||||
|
'id': str(self.id),
|
||||||
|
'name': self.name,
|
||||||
|
# coverArt
|
||||||
|
'albumCount': len(self.albums)
|
||||||
|
# starred
|
||||||
|
}
|
||||||
|
|
||||||
class Album(Base):
|
class Album(Base):
|
||||||
__tablename__ = 'album'
|
__tablename__ = 'album'
|
||||||
|
|
||||||
@ -104,6 +113,26 @@ class Album(Base):
|
|||||||
artist_id = Column(UUID, ForeignKey('artist.id'))
|
artist_id = Column(UUID, ForeignKey('artist.id'))
|
||||||
tracks = relationship('Track', backref = 'album')
|
tracks = relationship('Track', backref = 'album')
|
||||||
|
|
||||||
|
def as_subsonic_album(self):
|
||||||
|
info = {
|
||||||
|
'id': str(self.id),
|
||||||
|
'name': self.name,
|
||||||
|
'artist': self.artist.name,
|
||||||
|
'artistId': str(self.artist_id),
|
||||||
|
'songCount': len(self.tracks),
|
||||||
|
'duration': sum(map(lambda t: t.duration, self.tracks)),
|
||||||
|
'created': min(map(lambda t: t.created, self.tracks)).isoformat()
|
||||||
|
# starred
|
||||||
|
}
|
||||||
|
if self.tracks[0].folder.has_cover_art:
|
||||||
|
info['coverArt'] = str(self.tracks[0].folder_id)
|
||||||
|
|
||||||
|
return info
|
||||||
|
|
||||||
|
def sort_key(self):
|
||||||
|
year = min(map(lambda t: t.year if t.year else 9999, self.tracks))
|
||||||
|
return '%i%s' % (year, self.name.lower())
|
||||||
|
|
||||||
class Track(Base):
|
class Track(Base):
|
||||||
__tablename__ = 'track'
|
__tablename__ = 'track'
|
||||||
|
|
||||||
@ -171,7 +200,7 @@ class Track(Base):
|
|||||||
return ret
|
return ret
|
||||||
|
|
||||||
def sort_key(self):
|
def sort_key(self):
|
||||||
return self.album.artist.name + self.album.name + ("%02i" % self.disc) + ("%02i" % self.number) + self.title
|
return (self.album.artist.name + self.album.name + ("%02i" % self.disc) + ("%02i" % self.number) + self.title).lower()
|
||||||
|
|
||||||
def init_db():
|
def init_db():
|
||||||
Base.metadata.create_all(bind = engine)
|
Base.metadata.create_all(bind = engine)
|
||||||
|
Loading…
Reference in New Issue
Block a user