Merge branch 'master' of https://github.com/tombu/9minutes

Conflicts: app/controllers/artists_controller.rb
2011-05-11 19:20:56 +02:00
parent a4148486af 334a832140
commit 7a14ecfbe9
12 changed files with 98 additions and 35 deletions
@@ -27,7 +27,11 @@ module LastFM
  
    # return: albums ( name, mbid, album url, image urls ( different sizes ) ) ordered by popularity
    def self.getTopAlbums artist, limit = nil, page = nil
-      artist_request "getTopAlbums", "topalbums", artist, limit, page
+      @albums = artist_request "getTopAlbums", "topalbums", artist, limit, page
+      if @albums["@attr"].total.to_i == 1
+        @albums.album = [@albums.album] # wrap with Array
+      end
+      @albums
    end
    
    def self.getImages artist, limit = nil