Funkwhale
/
Kodi.plugin.audio.subsonic
mirror of https://github.com/gordielachance/plugin.audio.subsonic
1
0
Fork 0
Code Issues Releases Wiki Activity

added pagination for albums

This commit is contained in:
gordielachance 2016-10-01 00:17:55 +02:00
parent 86888b5a7a
commit a6c18a2eb0
2 changed files with 49 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
addon.py
View File

@ -193,9 +193,9 @@ class Plugin(object):
"""
menu = [
{"mode": "list_albums_newest", "foldername": "Newest albums"},
{"mode": "list_albums_frequent", "foldername": "Most played albums"},
{"mode": "list_albums_recent", "foldername": "Recently played albums"},
{"mode": "list_albums_newest", "foldername": "Newest albums", "page":1},
{"mode": "list_albums_frequent", "foldername": "Most played albums", "page":1},
{"mode": "list_albums_recent", "foldername": "Recently played albums", "page":1},
{"mode": "list_albums_genre", "foldername": "Albums by Genre"}
]
@ -207,6 +207,27 @@ class Plugin(object):
handle=self.addon_handle, url=url, listitem=li, isFolder=True)
xbmcplugin.endOfDirectory(self.addon_handle)
def menu_link(self):
mode = self.addon_args["mode"][0]
menu_item = {"mode": "main_menu", "foldername": "Back to Menu"}
menu_item_url = self.build_url(menu_item)
menu_item_li = xbmcgui.ListItem(menu_item["foldername"])
xbmcplugin.addDirectoryItem(
handle=self.addon_handle, url=menu_item_url, listitem=menu_item_li, isFolder=True)
def next_page_link(self,page):
page += 1
title = "Next page (%s)" % (page)
mode = self.addon_args["mode"][0]
menu_item = {"mode": mode, "foldername": title, "page":page}
menu_item_url = self.build_url(menu_item)
menu_item_li = xbmcgui.ListItem(menu_item["foldername"])
xbmcplugin.addDirectoryItem(
handle=self.addon_handle, url=menu_item_url, listitem=menu_item_li, isFolder=True)
def list_playlists(self):
"""
@ -280,13 +301,18 @@ class Plugin(object):
"""
Display newest album list.
"""
page = int(self.addon_args["page"][0])
size = self.albums_per_page
offset = size * ( page -1 )
xbmcplugin.setContent(self.addon_handle, "albums")
for album in self.connection.walk_albums(ltype='newest',size=size):
for album in self.connection.walk_albums(ltype='newest',size=size,offset=offset):
self.add_album(album, show_artist=True)
self.next_page_link(page)
self.menu_link()
xbmcplugin.endOfDirectory(self.addon_handle)
@ -295,12 +321,17 @@ class Plugin(object):
Display most played albums list.
"""
page = int(self.addon_args["page"][0])
size = self.albums_per_page
offset = size * ( page -1 )
xbmcplugin.setContent(self.addon_handle, "albums")
for album in self.connection.walk_albums(ltype='frequent',size=size):
for album in self.connection.walk_albums(ltype='frequent',size=size,offset=offset):
self.add_album(album, show_artist=True)
self.next_page_link(page)
self.menu_link()
xbmcplugin.endOfDirectory(self.addon_handle)
@ -309,12 +340,17 @@ class Plugin(object):
Display recently played album list.
"""
page = int(self.addon_args["page"][0])
size = self.albums_per_page
offset = size * ( page -1 )
xbmcplugin.setContent(self.addon_handle, "albums")
for album in self.connection.walk_albums(ltype='recent',size=size):
self.add_album(album, show_artist=True)
self.next_page_link(page)
self.menu_link()
xbmcplugin.endOfDirectory(self.addon_handle)

18
lib/libsonic_extra/__init__.py
View File

@ -380,7 +380,7 @@ class SubsonicClient(libsonic.Connection):
for genre in response["genres"]["genre"]:
yield genre
def walk_albums(self, ltype, size=None, from_year=None,to_year=None, genre=None):
def walk_albums(self, ltype, size=None, from_year=None,to_year=None, genre=None, offset=None):
"""
Request all albums for a given genre and iterate over each album.
"""
@ -390,20 +390,16 @@ class SubsonicClient(libsonic.Connection):
if ltype == 'byYear' and (from_year is None or to_year is None):
return
offset = 0
while True:
response = self.getAlbumList2(
ltype=ltype, genre=genre, size=size, offset=offset)
response = self.getAlbumList2(
ltype=ltype, genre=genre, size=size, offset=offset)
if not response["albumList2"]["album"]:
break
if not response["albumList2"]["album"]:
return
for album in response["albumList2"]["album"]:
yield album
for album in response["albumList2"]["album"]:
yield album
offset += size
def walk_album(self, album_id):
"""