From: Fabio Ritrovato <sephiroth87@videolan.org>
Date: Sat, 27 Feb 2010 14:15:43 +0000 (+0100)
Subject: Lua SD: Jamendo - using album_image will give better results than album_id
X-Git-Tag: 1.1.0-pre1~633
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=00f8541d82a6e40c67064dba15769de64e53defa;p=vlc

Lua SD: Jamendo - using album_image will give better results than album_id
---

diff --git a/share/lua/playlist/jamendo.lua b/share/lua/playlist/jamendo.lua
index 12813ef6e4..647870ab7f 100644
--- a/share/lua/playlist/jamendo.lua
+++ b/share/lua/playlist/jamendo.lua
@@ -56,7 +56,7 @@ function parse()
             stream_url = track.children_map["stream"][1].children[1]
         end
         table.insert( tracks, {path=stream_url,
-                               arturl=track.children_map["album_id"] and "http://imgjam.com/albums/".. track.children_map["album_id"][1].children[1] .. "/covers/1.500.jpg" or ( track.children_map["album_image"] and track.children_map["album_image"][1].children[1] or nil ),
+                               arturl=track.children_map["album_image"] and track.children_map["album_image"][1].children[1] or ( track.children_map["album_id"] and "http://imgjam.com/albums/".. track.children_map["album_id"][1].children[1] .. "/covers/1.500.jpg" or nil ),
                                title=track.children_map["name"] and track.children_map["name"][1].children[1] or nil,
                                artist=track.children_map["artist_name"] and track.children_map["artist_name"][1].children[1] or nil,
                                album=track.children_map["album_name"] and track.children_map["album_name"][1].children[1] or nil,
diff --git a/share/lua/sd/jamendo.lua b/share/lua/sd/jamendo.lua
index e6c949990f..bb6b93a9e5 100644
--- a/share/lua/sd/jamendo.lua
+++ b/share/lua/sd/jamendo.lua
@@ -38,7 +38,7 @@ function main()
 end
 
 function add_top_albums( album_order, tag, max_results )
-    local url = "http://api.jamendo.com/get2/id+name+artist_name/album/xml/?order=" .. album_order .. "&n=" .. max_results
+    local url = "http://api.jamendo.com/get2/id+name+artist_name+image/album/xml/?imagesize=500&order=" .. album_order .. "&n=" .. max_results
     if tag ~= nil then
         url = url .. "&tag_idstr=" .. tag
     end
@@ -61,11 +61,11 @@ function add_top_albums( album_order, tag, max_results )
     for _, album in ipairs( tree.children ) do
         simplexml.add_name_maps( album )
         local album_node = node:add_node( {title=album.children_map["artist_name"][1].children[1] .. " - " .. album.children_map["name"][1].children[1],
-                                           arturl="http://imgjam.com/albums/".. album.children_map["id"][1].children[1] .. "/covers/1.500.jpg"} )
+                                           arturl=album.children_map["image"][1].children[1]} )
         local tracks = get_tracks_from_album( album.children_map["id"][1].children[1] )
         for _, track in ipairs( tracks ) do
             album_node:add_subitem( {path="http://api.jamendo.com/get2/stream/track/redirect/?id=" .. track.id,
-                                     arturl="http://imgjam.com/albums/".. album.children_map["id"][1].children[1] .. "/covers/1.500.jpg",
+                                     arturl=album.children_map["image"][1].children[1],
                                      title=track.title,
                                      artist=album.children_map["artist_name"][1].children[1],
                                      album=album.children_map["name"][1].children[1],
@@ -77,7 +77,7 @@ function add_top_albums( album_order, tag, max_results )
 end
 
 function add_top_tracks( track_order, tag, max_results )
-    local url = "http://api.jamendo.com/get2/id+name+artist_name+album_name+album_id+duration+album_genre+album_dates/track/xml/track_album+album_artist/?order=" .. track_order .. "&n=" .. max_results
+    local url = "http://api.jamendo.com/get2/id+name+artist_name+album_name+album_id+duration+album_genre+album_image+album_dates/track/xml/track_album+album_artist/?imagesize=500&order=" .. track_order .. "&n=" .. max_results
     if tag ~= nil then
         url = url .. "&tag_idstr=" .. tag
     end
@@ -105,7 +105,7 @@ function add_top_tracks( track_order, tag, max_results )
                            album=track.children_map["album_name"][1].children[1],
                            genre=track.children_map["album_genre"][1].children[1],
                            date=track.children_map["album_dates"][1].children_map["year"][1].children[1],
-                           arturl="http://imgjam.com/albums/".. track.children_map["album_id"][1].children[1] .. "/covers/1.500.jpg",
+                           arturl=track.children_map["album_image"][1].children[1],
                            duration=track.children_map["duration"][1].children[1]} )
     end
 end
@@ -133,7 +133,7 @@ function add_radio_from_id( id, max_results )
     elseif id == "7" then radio_name="Lounge"
     elseif id == "4" then radio_name="Dance / Electro"
     end
-    vlc.sd.add_item( {path="http://api.jamendo.com/get2/id+name+artist_name+album_name+duration+album_genre+album_dates/track/xml/radio_track_inradioplaylist+track_album+album_artist/?order=random_desc&radio_id=" .. id .. "&n=" .. max_results,
+    vlc.sd.add_item( {path="http://api.jamendo.com/get2/id+name+artist_name+album_name+duration+album_genre+album_image+album_dates/track/xml/radio_track_inradioplaylist+track_album+album_artist/?imagesize=500&order=random_desc&radio_id=" .. id .. "&n=" .. max_results,
                       title=radio_name} )
 end