X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Flastfm.rb;h=09ea380305ae8166dcf1007a88c8731042001768;hb=25dce328a87fcf2af9fa0e1c2da7ed30b7def441;hp=c3211683979fecd89172ff68228c6f008a002375;hpb=06f1b8c91709d64cd42d62e3d3adb864fd6101f0;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git diff --git a/data/rbot/plugins/lastfm.rb b/data/rbot/plugins/lastfm.rb index c3211683..09ea3803 100644 --- a/data/rbot/plugins/lastfm.rb +++ b/data/rbot/plugins/lastfm.rb @@ -11,9 +11,10 @@ # # License:: GPL v2 -require 'open-uri' - class ::LastFmEvent + # matches are: + # 1. day 2. moth 3. year 4. url_who 5. who 6. url_where 7. where 8. how_many + REGEXP = /.*?(.*?)<\/a>.*?(.*?)<\/a>.*?(.*?)<\/td>\s+<\/tr>/m attr_accessor :url, :date, :artist, :location, :attendance def initialize(url, date, artist, location, attendance) @url = url @@ -22,16 +23,32 @@ class ::LastFmEvent @location = location @attendance = attendance end + + def compact_display + if @attendance.empty? + return "%s %s @ %s %s" % [@date.strftime("%a %b, %d %Y"), @artist, @location, @url] + else + return "%s %s @ %s (%s) %s" % [@date.strftime("%a %b, %d %Y"), @artist, @location, @attendance, @url] + end + end + alias :to_s :compact_display + end class LastFmPlugin < Plugin + Config.register Config::IntegerValue.new('lastfm.max_events', + :default => 25, :validate => Proc.new{|v| v > 1}, + :desc => "Maximum number of events to display.") + Config.register Config::IntegerValue.new('lastfm.default_events', + :default => 3, :validate => Proc.new{|v| v > 1}, + :desc => "Default number of events to display.") LASTFM = "http://www.last.fm" def help(plugin, topic="") - case topic.intern + case (topic.intern rescue nil) when :event, :events - "lastfm events in => show information on events in or near from last.fm" + "lastfm [] events in => show information on events in or near . lastfm [] events by => show information on events by . The number of events that can be displayed is optional, defaults to #{@bot.config['lastfm.default_events']} and cannot be higher than #{@bot.config['lastfm.max_events']}" when :artist, :group "lastfm artist => show information on artist/group from last.fm" when :song, :track @@ -44,21 +61,36 @@ class LastFmPlugin < Plugin end def find_event(m, params) - location = params[:location].to_s + num = params[:num] || @bot.config['lastfm.default_events'] + num = num.to_i.clip(1, @bot.config['lastfm.max_events']) + + location = artist = nil + location = params[:location].to_s if params[:location] + artist = params[:who].to_s if params[:who] page = nil + spec = location ? "in #{location}" : "by #{artist}" + query = location ? "?findloc=#{CGI.escape(location)}" : "?s=#{CGI.escape(artist)}&findloc=" begin - esc = URI.escape(location) - page = @bot.httputil.get "#{LASTFM}/events/?findloc=#{esc}" + page = @bot.httputil.get LASTFM + "/events/" + query if page events = Array.new disp_events = Array.new - # matches are: - # 1. day 2. moth 3. year 4. url_who 5. who 6. url_where 7. where 8. how_many - pre_events = page.scan(/.*?(.*?)<\/a>.*?(.*?)<\/a>.*?(.*?)<\/td>\s+<\/tr>/m) + pre_events = page.scan(LastFmEvent::REGEXP) # debug pre_events.inspect if pre_events.empty? - m.reply "No events found in #{location}, sorry" + # We may not find any even because the page gives a list + # of locations instead. In this case, retry with the first of + # these location + if page.match(//) + debug "Rechecking with #{$1}" + page = @bot.httputil.get(LASTFM+$1) + pre_events = page.scan(LastFmEvent::REGEXP) if page + end + if pre_events.empty? + m.reply "No events found #{spec}, sorry" + return + end end pre_events.each { |day, month, year, url_who, who, url_where, where, how_many| date = Time.utc(year.to_i, month.to_i, day.to_i) @@ -70,7 +102,7 @@ class LastFmPlugin < Plugin debug "who: #{who.inspect}" artist = who.ircify_html end - if where.match(/(.*?)<\/strong>(.+)?/) + if where.match(/(.*?)<\/strong>(?:(.+)?)?/) loc = Bold + $1.ircify_html + Bold loc << ", " << $2.ircify_html if $2 else @@ -82,16 +114,16 @@ class LastFmPlugin < Plugin } # debug events.inspect - events[0..2].each { |event| - disp_events << "%s %s @ %s (%s) %s" % [event.date.strftime("%a %b, %d %Y"), event.artist, event.location, event.attendance, event.url] + events[0...num].each { |event| + disp_events << event.to_s } - m.reply disp_events.join(' | ') + m.reply disp_events.join(' | '), :split_at => /\s+\|\s+/ else - m.reply "No events found in #{location}" + m.reply "No events found #{spec}" return end rescue Exception => e - m.reply "I had problems looking for events in #{location}" + m.reply "I had problems looking for events #{spec}" error e.inspect debug e.backtrace.join("\n") debug page[0...10*1024] if page @@ -103,7 +135,7 @@ class LastFmPlugin < Plugin artist = params[:who].to_s page = nil begin - esc = URI.escape(artist) + esc = URI.escape(CGI.escape(artist)) page = @bot.httputil.get "#{LASTFM}/music/#{esc}" if page if page.match(/

(.*?)<\/a><\/h1>/) @@ -114,11 +146,11 @@ class LastFmPlugin < Plugin end wiki = "This artist doesn't have a description yet. You can help by writing it: #{url}/+wiki?action=edit" - if page.match(/
(.*?)<\/div>/m) + if page.match(/
(.*?)<\/div>/m) wiki = $1.ircify_html end - m.reply "%s : %s\n%s" % [title, url, wiki] + m.reply "%s : %s\n%s" % [title, url, wiki], :overlong => :truncate else m.reply "no data found on #{artist}" return @@ -145,7 +177,7 @@ class LastFmPlugin < Plugin action = :neighbours if action == :neighbors user = params[:user] begin - data = open("http://ws.audioscrobbler.com/1.0/user/#{user}/#{action}.txt") + data = @bot.httputil.get("http://ws.audioscrobbler.com/1.0/user/#{user}/#{action}.txt") m.reply "#{action} for #{user}:" m.reply data.to_a[0..3].map{|l| l.split(',',2)[-1].chomp}.join(", ") rescue @@ -155,10 +187,12 @@ class LastFmPlugin < Plugin end plugin = LastFmPlugin.new -plugin.map 'lastfm event[s] in :location', :action => :find_event -plugin.map 'lastfm artist *who', :action => :find_artist -plugin.map 'lastfm group *who', :action => :find_artist +plugin.map 'lastfm [:num] event[s] in *location', :action => :find_event, :requirements => { :num => /\d+/ }, :thread => true +plugin.map 'lastfm [:num] event[s] by *who', :action => :find_event, :requirements => { :num => /\d+/ }, :thread => true +plugin.map 'lastfm [:num] event[s] [for] *who', :action => :find_event, :requirements => { :num => /\d+/ }, :thread => true +plugin.map 'lastfm artist *who', :action => :find_artist, :thread => true +plugin.map 'lastfm group *who', :action => :find_artist, :thread => true plugin.map 'lastfm track *dunno', :action => :find_track plugin.map 'lastfm song *dunno', :action => :find_track plugin.map 'lastfm album *dunno', :action => :find_album -plugin.map 'lastfm :action *user' +plugin.map 'lastfm :action *user', :thread => true