X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Flastfm.rb;h=e29ae31ea477fa91a1daf888578caef86c2a5c6a;hb=0ddf77c9d54236bbc75c2b603871fc0c9e072873;hp=ee9ef5bab92c92bf8a6ce050900ba312621496d4;hpb=2fac249c8427e262a0a6654b1fc54a78ec1f8917;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/lastfm.rb b/data/rbot/plugins/lastfm.rb
index ee9ef5ba..e29ae31e 100644
--- a/data/rbot/plugins/lastfm.rb
+++ b/data/rbot/plugins/lastfm.rb
@@ -19,6 +19,8 @@ require 'rexml/document'
 require 'cgi'
 
 class ::LastFmEvent
+  attr_reader :attendance, :date
+
   def initialize(hash)
     @url = hash[:url]
     @date = hash[:date]
@@ -48,6 +50,15 @@ class ::LastFmEvent
 end
 
 define_structure :LastFmVenue, :id, :city, :street, :postal, :country, :name, :url, :lat, :long
+class ::Struct::LastFmVenue
+  def to_s
+    str = self.name.dup
+    if self.country
+      str << " (" << [self.city, self.country].compact.join(", ") << ")"
+    end
+    str
+  end
+end
 
 class LastFmPlugin < Plugin
   include REXML
@@ -89,7 +100,7 @@ class LastFmPlugin < Plugin
     period = _(", where <period> can be one of: 3|6|12 months, a year")
     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 %{d} and cannot be higher than %{m}") % {:d => @bot.config['lastfm.default_events'], :m => @bot.config['lastfm.max_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>. lastfm [<num>] events at <venue> => show information on events at specific <venue>. The number of events <num> that can be displayed is optional, defaults to %{d} and cannot be higher than %{m}. Append 'sort by <what> [in <order> order]' to sort events. Events can be sorted by attendance or date (default) in ascending or descending order.") % {:d => @bot.config['lastfm.default_events'], :m => @bot.config['lastfm.max_events']}
     when :artist
       _("lastfm artist <name> => show information on artist <name> from last.fm")
     when :album
@@ -168,6 +179,10 @@ class LastFmPlugin < Plugin
     num = params[:num] || @bot.config['lastfm.default_events']
     num = num.to_i.clip(1, @bot.config['lastfm.max_events'])
 
+    sort_by    = params[:sort_by] || :date
+    sort_order = params[:sort_order]
+    sort_order = sort_order.to_sym unless sort_order.nil?
+
     location = params[:location]
     artist = params[:who]
     venue = params[:venue]
@@ -177,9 +192,23 @@ class LastFmPlugin < Plugin
       uri = "#{APIURL}method=geo.getevents&location=#{CGI.escape location.to_s}"
       emptymsg = _("no events found in %{location}") % {:location => location.to_s}
     elsif venue
-      venues = search_venue_by(:name => venue.to_s, :limit => 1)
+      begin
+        venues = search_venue_by(:name => venue.to_s, :limit => 1)
+      rescue Exception => err
+        error err
+        m.reply _("an error occurred looking for venue %{venue}: %{e}") % {
+          :venue => venue.to_s,
+          :e => err.message
+        }
+      end
+
+      if venues.empty?
+        m.reply _("no venue found matching %{venue}") % {:venue => venue.to_s}
+        return
+      end
       venue  = venues.first
       uri = "#{APIURL}method=venue.getevents&venue=#{venue.id}"
+      emptymsg = _("no events found at %{venue}") % {:venue => venue.to_s}
     elsif artist
       uri = "#{APIURL}method=artist.getevents&artist=#{CGI.escape artist.to_s}"
       emptymsg = _("no events found by %{artist}") % {:artist => artist.to_s}
@@ -222,6 +251,18 @@ class LastFmPlugin < Plugin
       m.reply emptymsg
       return
     end
+
+    # sort order when sorted by date is ascending by default
+    # and descending when sorted by attendance
+    case sort_by.to_sym
+    when :attendance
+      events = events.sort_by { |e| e.attendance }.reverse
+      events.reverse! if [:ascending, :asc].include? sort_order
+    when :date
+      events = events.sort_by { |e| e.date }
+      events.reverse! if [:descending, :desc].include? sort_order
+    end
+
     events[0...num].each { |event|
       disp_events << event.to_s
     }
@@ -295,9 +336,10 @@ class LastFmPlugin < Plugin
       return
     end
     if xml.class == Net::HTTPBadRequest
-      if doc.root.elements["error"].text == "Invalid user name supplied" then
-        m.reply _("%{user} doesn't exist on last.fm, perhaps they need to: lastfm user <username>") % {
-          :user => user
+      if doc.root.elements["error"].attributes["code"] == "6" then
+        m.reply _("%{user} doesn't exist on last.fm, perhaps they need to: %{prefix}lastfm set user <username>") % {
+          :user => user,
+          :prefix => @bot.config['core.address_prefix'].first
         }
         return
       else
@@ -312,13 +354,18 @@ class LastFmPlugin < Plugin
     end
     first = doc.root.elements[1].elements[1]
     now = first.attributes["nowplaying"]
-    artist = first.elements["artist"].text
+    artist = first.elements["artist/name"].text
     track = first.elements["name"].text
     albumtxt = first.elements["album"].text
-    album = ""
-    if albumtxt
+    album = if albumtxt
       year = get_album(artist, albumtxt)[2]
-      album = "[#{albumtxt}, #{year}]" if year
+      if year
+        _(" [%{albumtext}, %{year}]") % { :albumtext => albumtxt, :year => year }
+      else
+        _(" [%{albumtext}]") % { :albumtext => albumtxt }
+      end
+    else
+      nil
     end
     past = nil
     date = XPath.first(first, "//date")
@@ -331,17 +378,23 @@ class LastFmPlugin < Plugin
        if @registry.has_key? "#{m.sourcenick}_verb_present"
          verb = @registry["#{m.sourcenick}_verb_present"]
        end
-       reply = _("%{u} %{v} \"%{t}\" by %{a} %{b}") % {:u => user, :v => verb, :t => track, :a => artist, :b => album}
+       reply = _("%{u} %{v} \"%{t}\" by %{bold}%{a}%{bold}%{b}") % {:u => user, :v => verb, :t => track, :a => artist, :b => album, :bold => Bold}
     else
       verb = _("listened to")
        if @registry.has_key? "#{m.sourcenick}_verb_past"
          verb = @registry["#{m.sourcenick}_verb_past"]
        end
       ago = Utils.timeago(past)
-      reply = _("%{u} %{v} \"%{t}\" by %{a} %{b} %{p}") % {:u => user, :v => verb, :t => track, :a => artist, :b => album, :p => ago}
+      reply = _("%{u} %{v} \"%{t}\" by %{bold}%{a}%{bold}%{b} %{p};") % {:u => user, :v => verb, :t => track, :a => artist, :b => album, :p => ago, :bold => Bold}
+    end
+
+    if @bot.plugins['spotify'] && Object.const_defined?('Spotify')
+      if track = Spotify.search(:track, "#{artist} #{track}")
+        reply << _(" [%{u}%{url}%{u}]") % {:u => Underline, :url => track.url}
+      end
     end
 
-    reply << _("; see %{uri} for more") % { :uri => "http://www.last.fm/user/#{CGI.escape user}"}
+    reply << _(" -- see %{uri} for more") % { :uri => "http://www.last.fm/user/#{CGI.escape user}"}
     m.reply reply
   end
 
@@ -359,7 +412,7 @@ class LastFmPlugin < Plugin
     tags_xml = @bot.httputil.get("#{APIURL}method=artist.gettoptags&artist=#{CGI.escape params[:artist].to_s}")
     tags_doc = Document.new tags_xml
 
-    first = info_doc.root.elements["artist"]
+    first = info_doc.root.elements["artist/name"]
     artist = first.elements["name"].text
     url = first.elements["url"].text
     stats = {}
@@ -400,11 +453,11 @@ class LastFmPlugin < Plugin
     if results > 0
       begin
         hits = []
-        doc.root.each_element("results/trackmatches/track") do |track|
+        doc.root.each_element("results/trackmatches/track") do |trck|
           hits << _("%{bold}%{t}%{bold} by %{bold}%{a}%{bold} (%{n} listeners)") % {
-            :t => track.elements["name"].text,
-            :a => track.elements["artist"].text,
-            :n => track.elements["listeners"].text,
+            :t => trck.elements["name"].text,
+            :a => trck.elements["artist/name"].text,
+            :n => trck.elements["listeners"].text,
             :bold => Bold
           }
         end
@@ -555,8 +608,8 @@ class LastFmPlugin < Plugin
     begin
       res = @bot.httputil.get_response(uri)
       raise _("no response body") unless res.body
-    rescue Exception => e
-        m.reply _("I had problems accessing last.fm: %{e}") % {:e => e.message}
+    rescue Exception => err
+        m.reply _("I had problems accessing last.fm: %{e}") % {:e => err.message}
         return
     end
     doc = Document.new(res.body)
@@ -591,8 +644,7 @@ class LastFmPlugin < Plugin
         :user => user,
         :total => friends.size,
         :friends => Utils.comma_list(friends.shuffle[0, num]),
-        :uri => "http://www.last.fm/user/#{CGI.escape user}/friends",
-        :seemore => seemore
+        :seemore => seemore % { :uri => "http://www.last.fm/user/#{CGI.escape user}/friends" }
       }
     when :lovedtracks
       loved = doc.root.get_elements("lovedtracks/track").map do |track|
@@ -607,12 +659,12 @@ class LastFmPlugin < Plugin
       else
         reply = _("%{user} has loved %{total} tracks, including %{tracks}%{seemore}")
       end
+
       m.reply reply % {
           :user => user,
           :total => loved.size,
           :tracks => Utils.comma_list(loved_prep),
-          :uri => "http://www.last.fm/user/#{CGI.escape user}/library/loved",
-          :seemore => seemore
+          :seemore => seemore % { :uri => "http://www.last.fm/user/#{CGI.escape user}/library/loved" }
         }
     when :neighbours
       nbrs = doc.root.get_elements("neighbours/user").map do |u|
@@ -629,12 +681,11 @@ class LastFmPlugin < Plugin
       m.reply reply % {
           :user    => user,
           :nbrs    => Utils.comma_list(nbrs.shuffle[0, num]),
-          :uri     => "http://www.last.fm/user/#{CGI.escape user}/neighbours",
-          :seemore => seemore
+          :seemore => seemore % { :uri => "http://www.last.fm/user/#{CGI.escape user}/neighbours" }
       }
     when :recenttracks
       tracks = doc.root.get_elements("recenttracks/track").map do |track|
-        [track.elements["artist"].text, track.elements["name"].text].join(" - ")
+        [track.elements["artist/name"].text, track.elements["name"].text].join(" - ")
       end
 
       counts = []
@@ -679,7 +730,7 @@ class LastFmPlugin < Plugin
         case action
         when :weeklytrackchart, :weeklyalbumchart
           format = "%{artist} - %{title} (%{bold}%{plays}%{bold})"
-          artist = item.elements["artist"].text
+          artist = item.elements["artist/name"].text
         when :weeklyartistchart, :topartists
           format = "%{artist} (%{bold}%{plays}%{bold})"
           artist = item.elements["name"].text
@@ -709,11 +760,20 @@ class LastFmPlugin < Plugin
   end
 end
 
+event_map_options = {
+ :action => :find_events,
+ :requirements => {
+  :num => /\d+/,
+  :sort_order => /(?:asc|desc)(?:ending)?/
+ },
+ :thread => true
+}
+
 plugin = LastFmPlugin.new
-plugin.map 'lastfm [:num] event[s] in *location', :action => :find_events, :requirements => { :num => /\d+/ }, :thread => true
-plugin.map 'lastfm [:num] event[s] by *who', :action => :find_events, :requirements => { :num => /\d+/ }, :thread => true
-plugin.map 'lastfm [:num] event[s] at *venue', :action => :find_events, :requirements => { :num => /\d+/ }, :thread => true
-plugin.map 'lastfm [:num] event[s] [for] *who', :action => :find_events, :requirements => { :num => /\d+/ }, :thread => true
+plugin.map 'lastfm [:num] event[s] in *location [sort[ed] by :sort_by] [[in] :sort_order [order]]', event_map_options.dup
+plugin.map 'lastfm [:num] event[s] by *who [sort[ed] by :sort_by] [[in] :sort_order [order]]', event_map_options.dup
+plugin.map 'lastfm [:num] event[s] at *venue [sort[ed] by :sort_by] [[in] :sort_order [order]]', event_map_options.dup
+plugin.map 'lastfm [:num] event[s] [for] *who [sort[ed] by :sort_by] [[in] :sort_order [order]]', event_map_options.dup
 plugin.map 'lastfm artist *artist', :action => :find_artist, :thread => true
 plugin.map 'lastfm album *album [by *artist]', :action => :find_album
 plugin.map 'lastfm track *track', :action => :find_track, :thread => true