lastfm plugin: thread, don't block

1 files changed, 67 insertions, 71 deletions

diff --git a/data/rbot/plugins/lastfm.rb b/data/rbot/plugins/lastfm.rb
index c1e85da4..4ec79510 100644
--- a/data/rbot/plugins/lastfm.rb
+++ b/data/rbot/plugins/lastfm.rb
@@ -11,8 +11,6 @@
 #
 # 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
@@ -71,72 +69,68 @@ class LastFmPlugin < Plugin
     artist = params[:who].to_s if params[:who]
     page = nil
     spec = location ? "in #{location}" : "by #{artist}"
-    begin
-      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
-
-        pre_events = page.scan(LastFmEvent::REGEXP)
-        # debug pre_events.inspect
-        if pre_events.empty?
-          # 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(/<a href="(\/events\/\?l=[^"]+)">/)
-            debug "Rechecking with #{$1}"
-            page = @bot.httputil.get(LASTFM+$1)
-            pre_events = page.scan(LastFmEvent::REGEXP) if page
-          end
+    query = location ? "?findloc=#{CGI.escape(location)}" : "?s=#{CGI.escape(artist)}&findloc="
+    Thread.new {
+      begin
+        page = @bot.httputil.get LASTFM + "/events/" + query
+        if page
+          events = Array.new
+          disp_events = Array.new
+
+          pre_events = page.scan(LastFmEvent::REGEXP)
+          # debug pre_events.inspect
           if pre_events.empty?
-            m.reply "No events found #{spec}, sorry"
-            return
+            # 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(/<a href="(\/events\/\?l=[^"]+)">/)
+              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"
+              Thread.exit
+            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)
+            url = LASTFM + url_who
+            if who.match(/<strong>(.*?)<\/strong>(.+)?/)
+              artist = Bold + $1.ircify_html + Bold
+              artist << ", " << $2.ircify_html if $2
+            else
+              debug "who: #{who.inspect}"
+              artist = who.ircify_html
+            end
+            if where.match(/<strong>(.*?)<\/strong>(?:<br\s*\/>(.+)?)?/)
+              loc = Bold + $1.ircify_html + Bold
+              loc << ", " << $2.ircify_html if $2
+            else
+              debug where.inspect
+              loc = where.ircify_html
+            end
+            attendance = how_many.ircify_html
+            events << LastFmEvent.new(url, date, artist, loc, attendance)
+          }
+          # debug events.inspect
+
+          events[0...num].each { |event|
+            disp_events << event.to_s
+          }
+          m.reply disp_events.join(' | '), :split_at => /\s+\|\s+/
+        else
+          m.reply "No events found #{spec}"
+          Thread.exit
         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)
-          url = LASTFM + url_who
-          if who.match(/<strong>(.*?)<\/strong>(.+)?/)
-            artist = Bold + $1.ircify_html + Bold
-            artist << ", " << $2.ircify_html if $2
-          else
-            debug "who: #{who.inspect}"
-            artist = who.ircify_html
-          end
-          if where.match(/<strong>(.*?)<\/strong>(?:<br\s*\/>(.+)?)?/)
-            loc = Bold + $1.ircify_html + Bold
-            loc << ", " << $2.ircify_html if $2
-          else
-            debug where.inspect
-            loc = where.ircify_html
-          end
-          attendance = how_many.ircify_html
-          events << LastFmEvent.new(url, date, artist, loc, attendance)
-        }
-        # debug events.inspect
-
-        events[0...num].each { |event|
-          disp_events << event.to_s
-        }
-        m.reply disp_events.join(' | '), :split_at => /\s+\|\s+/
-      else
-        m.reply "No events found #{spec}"
-        return
+      rescue Exception => e
+        m.reply "I had problems looking for events #{spec}"
+        error e.inspect
+        debug e.backtrace.join("\n")
+        debug page[0...10*1024] if page
+        Thread.exit
       end
-    rescue Exception => e
-      m.reply "I had problems looking for events #{spec}"
-      error e.inspect
-      debug e.backtrace.join("\n")
-      debug page[0...10*1024] if page
-      return
-    end
+    }
   end
 
   def find_artist(m, params)
@@ -184,13 +178,15 @@ class LastFmPlugin < Plugin
     action = params[:action].intern
     action = :neighbours if action == :neighbors
     user = params[:user]
-    begin
-      data = open("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
-      m.reply "could not find #{action} for #{user} (is #{user} a user?)"
-    end
+    Thread.new {
+      begin
+        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
+        m.reply "could not find #{action} for #{user} (is #{user} a user?)"
+      end
+    }
   end
 end