Sass integrated

app/controllers/import_controller.rb

@@ -17,7 +17,7 @@ class ImportController < ApplicationController
     brainz = MusicBrainz::Client.new(@@brainz_login, @@brainz_password, @@user_agent)
     lastfm = Lastfm.new(@@lastfm_api_key, @@lastfm_secret)
     
-    artist = Artist.find_by_name(name)
+    artist = Artist.find_or_create_by_name(name)
 
     begin
     
@@ -38,16 +38,20 @@ class ImportController < ApplicationController
       artist.mbid = artist_mb_data[:mbid]
     
       # Get albums from MB
-      release_groups_mb = brainz.release_group(nil, :artist => artist_mb_data[:mbid])
+      release_groups_mb = brainz.release_group(nil, :artist => artist_mb_data[:mbid], :limit => 500)
       
       unless release_groups_mb['release_group_list']['release_group'].nil?
         
+        if release_groups_mb['release_group_list']['release_group'].is_a? Hash
+          release_groups_mb['release_group_list']['release_group'] = [release_groups_mb['release_group_list']['release_group']]
+        end
+        
         release_groups_mb['release_group_list']['release_group'].each do |mb_album|
           
           album_name = mb_album['title'] + (mb_album['disambiguation'].nil? ? '' : ' ('+ mb_album['disambiguation'] +')')
       
           # Checking if there is already an album with the same name
-          albums_db = Album.where(:artist_id => artist.id, :name => album_name)
+          albums_db = Album.where(:artist_id => artist.id, :name => album_name, :album_type => mb_album['type'])
       
           # Get album releases from MB
           releases_mb = brainz.release(nil, {'release-group' => mb_album['id']})
@@ -180,7 +184,7 @@ class ImportController < ApplicationController
               end # releases_mb.empty?
           
             end # unless mb_main_tracks.empty?
-        
+          
           end # unless releases_mb.nil?
       
         end # release_groups_mb.each do |mb_album|