--- a/src/mediaserver/cdplugins/gmusic/gmusic-app.py
+++ b/src/mediaserver/cdplugins/gmusic/gmusic-app.py
@@ -303,6 +303,8 @@
objid = a['objid']
field = a['field'] if 'field' in a else None
value = a['value']
+ objkind = a['objkind'] if 'objkind' in a else None
+
if re.match('0\$gmusic\$', objid) is None:
raise Exception("bad objid [%s]" % objid)
xbmcplugin.objid = objid
@@ -310,19 +312,19 @@
searchresults = session.search(value)
- if field and field not in ['artist', 'album', 'playlist', 'track']:
- msgproc.log('Unknown field \'%s\'' % field)
- field = None
- if field is None or field == 'artist':
+ if objkind and objkind not in ['artist', 'album', 'playlist', 'track']:
+ msgproc.log('Unknown objkind \'%s\'' % objkind)
+ objkind = None
+ if objkind is None or objkind == 'artist':
view(searchresults.artists,
urls_from_id(artist_view, searchresults.artists), end=False)
- if field is None or field == 'album':
+ if objkind is None or objkind == 'album':
view(searchresults.albums,
urls_from_id(album_view, searchresults.albums), end=False)
- if field is None or field == 'playlist':
+ if objkind is None or objkind == 'playlist':
view(searchresults.playlists,
urls_from_id(playlist_view, searchresults.playlists), end=False)
- if field is None or field == 'track':
+ if objkind is None or objkind == 'track':
track_list(searchresults.tracks)
#msgproc.log("%s" % xbmcplugin.entries)