bash plugin: a nick is such only if it's followed by a space

[user/henk/code/ruby/rbot.git] / data / rbot / plugins / lastfm.rb

diff --git a/data/rbot/plugins/lastfm.rb b/data/rbot/plugins/lastfm.rb
index c3211683979fecd89172ff68228c6f008a002375..6e7d4c7119ab1fa56392e278c69229260d69eba3 100644 (file)
--- a/data/rbot/plugins/lastfm.rb
+++ b/data/rbot/plugins/lastfm.rb
@@ -22,16 +22,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
+  BotConfig.register BotConfigIntegerValue.new('lastfm.max_events',
+    :default => 25, :validate => Proc.new{|v| v > 1},
+    :desc => "Maximum number of events to display.")
+  BotConfig.register BotConfigIntegerValue.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
     when :event, :events
-      "lastfm events in <location> => show information on events in or near <location> from last.fm"
+      "lastfm [<num>] events in <location> => show information on events in or near <location>. lastfm [<num>] events by <artist/group> => show information on events by <artist/group>. The number of events <num> 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 <name> => show information on artist/group <name> from last.fm"
     when :song, :track
@@ -44,11 +60,23 @@ 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}"
     begin
-      esc = URI.escape(location)
-      page = @bot.httputil.get "#{LASTFM}/events/?findloc=#{esc}"
+      if location
+        esc = CGI.escape(location)
+        page = @bot.httputil.get "#{LASTFM}/events/?findloc=#{esc}"
+      else
+        esc = CGI.escape(artist)
+        page = @bot.httputil.get "#{LASTFM}/events?s=#{esc}&findloc="
+      end
+
       if page
         events = Array.new
         disp_events = Array.new
@@ -58,7 +86,7 @@ class LastFmPlugin < Plugin
         pre_events = page.scan(/<tr class="vevent\s+\w+\s+\S+?-(\d\d)-(\d\d)-(\d\d\d\d)\s*">.*?<a class="url summary" href="(\/event\/\d+)">(.*?)<\/a>.*?<a href="(\/venue\/\d+)">(.*?)<\/a>.*?<td class="attendance">(.*?)<\/td>\s+<\/tr>/m)
         # debug pre_events.inspect
         if pre_events.empty?
-          m.reply "No events found in #{location}, sorry"
+          m.reply "No events found #{spec}, sorry"
         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 +98,7 @@ class LastFmPlugin < Plugin
             debug "who: #{who.inspect}"
             artist = who.ircify_html
           end
-          if where.match(/<strong>(.*?)<\/strong>(.+)?/)
+          if where.match(/<strong>(.*?)<\/strong>(?:<br\s*\/>(.+)?)?/)
             loc = Bold + $1.ircify_html + Bold
             loc << ", " << $2.ircify_html if $2
           else
@@ -82,16 +110,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 +131,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(/<h1 class="h1artist"><a href="([^"]+)">(.*?)<\/a><\/h1>/)
@@ -118,7 +146,7 @@ class LastFmPlugin < Plugin
           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
@@ -155,7 +183,9 @@ class LastFmPlugin < Plugin
 end
 
 plugin = LastFmPlugin.new
-plugin.map 'lastfm event[s] in :location', :action => :find_event
+plugin.map 'lastfm [:num] event[s] in *location', :action => :find_event, :requirements => { :num => /\d+/ }
+plugin.map 'lastfm [:num] event[s] by *who', :action => :find_event, :requirements => { :num => /\d+/ }
+plugin.map 'lastfm [:num] event[s] [for] *who', :action => :find_event, :requirements => { :num => /\d+/ }
 plugin.map 'lastfm artist *who', :action => :find_artist
 plugin.map 'lastfm group *who', :action => :find_artist
 plugin.map 'lastfm track *dunno', :action => :find_track