Fix item counts in directory generation.

git-svn-id: svn://svn.code.sf.net/p/xbmc-groove/code@10 2dec19e3-eb1d-4749-8193-008c8bba0994

diff --git a/default.py b/default.py
index cf909a9..30460dd 100644 (file)
--- a/default.py
+++ b/default.py
@@ -321,7 +321,7 @@ class Groveshark:
             songduration = song[2]
             songalbum = song[3]
             songartist = song[6]
-            songartistid = song[7]
+            #songartistid = song[7]
             u=sys.argv[0]+"?url="+urllib.quote_plus(songurl) \
             +"&mode="+str(MODE_SONG)+"&name="+urllib.quote_plus(songname)+"&id=" \
             +str(songid) \
@@ -342,49 +342,56 @@ class Groveshark:
             #menuItems.append(("Listen to similar song", "XBMC.RunPlugin("+similarSong+")"))
             #menuItems.append(("No thanks!", "XBMC.RunPlugin("+frown+")"))
             item.addContextMenuItems(menuItems, replaceItems=False)
-            xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=item,isFolder=False)
+            xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=item,isFolder=False,totalItems=n)
             i = i + 1
         xbmcplugin.setContent(self._handle, 'songs')
+        xbmcplugin.setPluginFanart(int(sys.argv[1]), self.fanImg)
             
     def _add_albums_directory(self, albums):
-        xbmc.log("Found " + str(len(albums)) + " albums...")
+        n = len(albums)
+        xbmc.log("Found " + str(n) + " albums...")
         i = 0
-        while i < len(albums):
+        while i < n:
             album = albums[i]
             albumArtistName = album[0]
             albumName = album[2]
             albumID = album[3]
             albumImage = self._get_icon(album[4], 'album-' + str(albumID))
-            self._add_dir(albumName + " - " + albumArtistName, '', MODE_ALBUM, albumImage, albumID)
+            self._add_dir(albumName + " - " + albumArtistName, '', MODE_ALBUM, albumImage, albumID, n)
             i = i + 1
         xbmcplugin.setContent(self._handle, 'albums')
         xbmcplugin.addSortMethod(self._handle, xbmcplugin.SORT_METHOD_ALBUM_IGNORE_THE)
+        xbmcplugin.setPluginFanart(int(sys.argv[1]), self.fanImg)
             
     def _add_artists_directory(self, artists):
-        xbmc.log("Found " + str(len(artists)) + " artists...")
+        n = len(artists)
+        xbmc.log("Found " + str(n) + " artists...")
         i = 0
-        while i < len(artists):
+        while i < n:
             artist = artists[i]
             artistName = artist[0]
             artistID = artist[1]
-            self._add_dir(artistName, '', MODE_ARTIST, self.artistImg, artistID)
+            self._add_dir(artistName, '', MODE_ARTIST, self.artistImg, artistID, n)
             i = i + 1
         xbmcplugin.setContent(self._handle, 'artists')
         xbmcplugin.addSortMethod(self._handle, xbmcplugin.SORT_METHOD_ARTIST_IGNORE_THE)
+        xbmcplugin.setPluginFanart(int(sys.argv[1]), self.fanImg)
             
     def _add_playlists_directory(self, playlists):
-        xbmc.log("Found " + str(len(playlists)) + " playlists...")
+        n = len(playlists)
+        xbmc.log("Found " + str(n) + " playlists...")
         i = 0
-        while i < len(playlists):
+        while i < n:
             playlist = playlists[i]
             playlistName = playlist[0]
             playlistID = playlist[1]
-            self._add_dir(playlistName, '', MODE_PLAYLIST, self.playlistImg, playlistID)
+            self._add_dir(playlistName, '', MODE_PLAYLIST, self.playlistImg, playlistID, n)
             i = i + 1  
         xbmcplugin.setContent(self._handle, 'files')
         xbmcplugin.addSortMethod(self._handle, xbmcplugin.SORT_METHOD_PLAYLIST_ORDER)
+        xbmcplugin.setPluginFanart(int(sys.argv[1]), self.fanImg)
       
-    def _add_dir(self, name, url, mode, iconimage, id):
+    def _add_dir(self, name, url, mode, iconimage, id, items=1):
         u=sys.argv[0]+"?url="+urllib.quote_plus(url)+"&mode="+str(mode)+"&name="+urllib.quote_plus(name)+"&id="+str(id)
         dir=xbmcgui.ListItem(name, iconImage=iconimage, thumbnailImage=iconimage)
         dir.setInfo( type="Music", infoLabels={ "title": name } )
@@ -392,7 +399,7 @@ class Groveshark:
         menuItems = []
         menuItems.append(("Select", "XBMC.executebuiltin(Action(7))"))
         dir.addContextMenuItems(menuItems, replaceItems=True)
-        return xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=dir,isFolder=True)
+        return xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=dir,isFolder=True, totalItems=items)
 
    
 def get_params():