X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Flastfm.rb;h=09ea380305ae8166dcf1007a88c8731042001768;hb=b0c7f5f17b65043a796f8b3f4dc27cbfa287e087;hp=9c6e97b9ac246ac36cd9e815cb0e1862142de8f2;hpb=e2f8ecd2aead7a4d3b226ab9a7884eed7e8552eb;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/lastfm.rb b/data/rbot/plugins/lastfm.rb
index 9c6e97b9..09ea3803 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
@@ -38,17 +36,17 @@ class ::LastFmEvent
 end
 
 class LastFmPlugin < Plugin
-  BotConfig.register BotConfigIntegerValue.new('lastfm.max_events',
+  Config.register Config::IntegerValue.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',
+  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 [<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
@@ -71,15 +69,9 @@ class LastFmPlugin < Plugin
     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
-      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
-
+      page = @bot.httputil.get LASTFM + "/events/" + query
       if page
         events = Array.new
         disp_events = Array.new
@@ -154,7 +146,7 @@ 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 class="wikiAbstract">(.*?)<\/div>/m)
+        if page.match(/<div (?:class|id)="wikiAbstract">(.*?)<\/div>/m)
           wiki = $1.ircify_html
         end
 
@@ -185,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
@@ -195,12 +187,12 @@ class LastFmPlugin < Plugin
 end
 
 plugin = LastFmPlugin.new
-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 [: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