Finally fixed lastfm post requests, couple of rake tasks

This commit is contained in:
magnolia-fan
2011-09-18 18:25:47 +04:00
parent d9b75279f5
commit e69a12ded5
7 changed files with 60 additions and 20 deletions
+1 -1
View File
@@ -89,7 +89,7 @@ class ArtistController < ApplicationController
bonus_tracks = []
album.tracks.each do |track|
tmp_track = {id: track.id, name: track.name, live: track.live, acoustic: track.acoustic}
tmp_track[:length] = (track.length / 1000).round
tmp_track[:length] = (track.length / 1000).round unless track.length.nil?
tmp_track[:duration] = formatTrackDuration(track.length)
tmp_track[:position] = track.position
tmp_track[:mbid] = track.mbid
+2 -2
View File
@@ -16,7 +16,7 @@ class ImportController < ApplicationController
rescue => e
lastfm_artist = { 'artist' => {
'bio' => { 'summary' => '' },
'image' => [ nil, nil, nil, { 'content' => '' } ],
'image' => [ nil, nil, nil, { '#text' => '' } ],
'stats' => { 'listeners' => 0 }
} }
ap e.message
@@ -35,7 +35,7 @@ class ImportController < ApplicationController
brainz_artist.release_groups.each do |brainz_release_group|
# Saving album
begin
album_lastfm = LastFM::Album.get_info( :artist => lastfm_artist['name'], :album => brainz_release_group.title )
album_lastfm = LastFM::Album.get_info( :artist => lastfm_artist['artist']['name'], :album => brainz_release_group.title )
album_image = album_lastfm['album']['image'][3]['#text']
rescue
album_image = ''
+8 -12
View File
@@ -56,15 +56,13 @@ class LastFmController < ApplicationController
end
r = LastFM::Track.update_now_playing(
:track => params[:name].gsub(/\s/, '+').gsub(/\&/, '&amp;'),
:artist => params[:artist].gsub(/\s/, '+').gsub(/\&/, '&amp;'),
:album => params[:album].gsub(/\s/, '+').gsub(/\&/, '&amp;'),
:track => params[:name],
:artist => params[:artist],
:album => params[:album],
:trackNumber => params[:position],
:mbid => params[:mbid],
:duration => params[:length],
:api_sig => true,
:sk => user.lastfm_key
:sk => user.lastfm_key # Auth session key
)
render :json => { :status => r['error'].nil? ? 'success' : 'failed' }
@@ -86,16 +84,14 @@ class LastFmController < ApplicationController
end
r = LastFM::Track.scrobble(
:track => params[:name].gsub(/\s/, '+').gsub(/\&/, '&amp;'),
:track => params[:name],
:timestamp => Time.now.utc.to_i,
:artist => params[:artist].gsub(/\s/, '+').gsub(/\&/, '&amp;'),
:album => params[:album].gsub(/\s/, '+').gsub(/\&/, '&amp;'),
:artist => params[:artist],
:album => params[:album],
:trackNumber => params[:position],
:mbid => params[:mbid],
:duration => params[:length],
:api_sig => true,
:sk => user.lastfm_key
:sk => user.lastfm_key # Auth session key
)
render :json => { :status => r['error'].nil? ? 'success' : 'failed' }