app/views/track/lfm_list.html.erb @@ -146,4 +146,11 @@ class TrackController < ApplicationController render :layout => false end + + def lfm_list + @title = "Your recent favourite tracks" + if logged_in? + @tracks = Lastfming.get_recent_top_tracks(current_user) + end + end end \ No newline at end of file app/controllers/track_controller.rb @@ -54,6 +54,7 @@ ActionController::Routing::Routes.draw do |map| map.connect 'track/latest', :controller => 'track', :action => 'latest' map.connect 'track/latest.xml', :controller => 'track', :action => 'latest', :format => 'xml' map.connect 'track/list_xml', :controller => 'track', :action => 'list_xml', :format => 'xml' + map.connect 'track/lfm_list', :controller => 'track', :action => 'lfm_list' map.connect 'track/:permalink', :controller => 'track', :action => 'show', :format => 'html' map.signup '/claim', :controller => 'users', :action => 'claim' config/routes.rb @@ -1,6 +1,6 @@ module Lastfming - #WEEKLY_TRACK_CHART_BASE_URL = "http://ws.audioscrobbler.com/2.0/?method=user.getweeklytrackchart&api_key=#{API_KEY}&user=" + WEEKLY_TRACK_CHART_BASE_URL = "http://ws.audioscrobbler.com/2.0/?method=user.getweeklytrackchart&api_key=#{Configuring.get("last_fm_api_key")}" # def self.try_to_add_track(audiography) # added_track = nil @@ -18,23 +18,50 @@ module Lastfming # track_data[:playcount].to_i > 0 && !audiography.contains_track?(nil, track_data[:title], track_data[:artist]) # end - # def self.get_recent_top_tracks(user) - # tracks = [] - # if user.last_fm_username - # xml = APIUtil.response_to_xml(get_weekly_track_chart(user.last_fm_username)) - # xml.elements.each("lfm/weeklytrackchart/track") do |data| - # track = {} - # track[:artist] = data.elements["artist"].text if data.elements["artist"] - # track[:title] = data.elements["name"].text if data.elements["name"] - # track[:playcount] = data.elements["playcount"].text if data.elements["playcount"] - # tracks << track - # end - # end - # - # return tracks - # end + def self.get_recent_top_tracks(user) + recent_top_tracks = {} + if user && user.last_fm_username + all_month_tracks = [] + all_month_tracks += get_weekly_tracks(user.last_fm_username, 1.week.ago.tv_sec, Time.new.tv_sec) + all_month_tracks += get_weekly_tracks(user.last_fm_username, 2.weeks.ago.tv_sec, 1.week.ago.tv_sec) + all_month_tracks += get_weekly_tracks(user.last_fm_username, 3.weeks.ago.tv_sec, 2.weeks.ago.tv_sec) + all_month_tracks += get_weekly_tracks(user.last_fm_username, 4.weeks.ago.tv_sec, 3.weeks.ago.tv_sec) + + for all_month_track in all_month_tracks + identifier = all_month_track[:artist] + all_month_track[:title] + if recent_top_tracks.has_key?(identifier) + if Util.ne(all_month_track[:playcount]) + recent_top_tracks[identifier][:playcount] = recent_top_tracks[identifier][:playcount].to_i + all_month_track[:playcount].to_i + end + else + recent_top_tracks[identifier] = all_month_track + end + end + end + + return recent_top_tracks + end - # def self.get_weekly_track_chart(username) - # Util.ne(username) ? APIUtil.get_request(WEEKLY_TRACK_CHART_BASE_URL + username) : nil - # end + def self.get_weekly_tracks(username, from, to) + tracks = [] + xml = APIUtil.response_to_xml(get_weekly_track_chart(username, from, to)) + xml.elements.each("lfm/weeklytrackchart/track") do |data| + track = {} + artist = data.elements["artist"].text if data.elements["artist"] && Util.ne(data.elements["artist"].text) + title = data.elements["name"].text if data.elements["name"] && Util.ne(data.elements["name"].text) + playcount = data.elements["playcount"].text.to_i if data.elements["playcount"] && Util.ne(data.elements["playcount"].text) + if artist && title && playcount + track[:artist] = artist + track[:title] = title + track[:playcount] = playcount + tracks << track + end + end + + return tracks + end + + def self.get_weekly_track_chart(username, from, to) + APIUtil.get_request(WEEKLY_TRACK_CHART_BASE_URL + "&user=#{username}&from=#{from}&to=#{to}") + end end \ No newline at end of file lib/lastfming.rb f7010b346c31b3d3e6eb5394f2072b5ee0248d3e Mary Cook maryrosecook@maryrosecookhom.home http://github.com/maryrosecook/playmary/commit/0343e57cf0d85631c0a6ce92633ca7965aac6025 0343e57cf0d85631c0a6ce92633ca7965aac6025 2009-10-10T16:46:55-07:00 2009-10-10T16:46:55-07:00 shows user their favourite tracks from the last month according to last.fm (if they have set a last.fm username which is impossible via the web interface) 4bff17c33d964960894c476bead3383f5a2b9502 Mary Cook maryrosecook@maryrosecookhom.home