X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fimdb.rb;h=0a878c7516f8e112506bdc817ffd3958b1097cac;hb=51c35168127e0faed56bceb3f5103f92ed31478c;hp=240ded86303cfb35420bc2b1d37dee588ee09d9d;hpb=ab18d5d5d98b360c5269dbcf4c55a1876fd6f3ec;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/imdb.rb b/data/rbot/plugins/imdb.rb
index 240ded86..0a878c75 100644
--- a/data/rbot/plugins/imdb.rb
+++ b/data/rbot/plugins/imdb.rb
@@ -11,8 +11,6 @@
 #
 # License:: MIT license
 
-require 'uri/common'
-
 class Imdb
   IMDB = "http://us.imdb.com"
   TITLE_OR_NAME_MATCH = /<a href="(\/(?:title|name)\/(?:tt|nm)[0-9]+\/?)[^"]*"(?:[^>]*)>([^<]*)<\/a>/
@@ -32,7 +30,7 @@ class Imdb
   end
 
   def search(rawstr, rawopts={})
-    str = URI.escape(rawstr)
+    str = CGI.escape(rawstr)
     str << ";site=aka" if @bot.config['imdb.aka']
     opts = rawopts.dup
     opts[:type] = :both unless opts[:type]
@@ -155,13 +153,13 @@ class Imdb
         country = data.ircify_html.gsub(' / ','/')
       end
 
-      info << [title, "(#{country}, #{date})", extra, dir ? "[#{dir}]" : nil, ": http://us.imdb.com#{sr}"].compact.join(" ")
+      info << [title, "(#{country}, #{date})", extra, dir ? "[#{dir}]" : nil, opts[:nourl] ? nil : ": http://www.imdb.com#{sr}"].compact.join(" ")
 
       return info if opts[:title_only]
 
       if opts[:characters]
         info << resp.body.scan(CREDIT_NAME_MATCH).map { |url, name, role|
-          "%s: %s" % [name, role]
+          "%s: %s" % [name, role.ircify_html]
         }.join('; ')
         return info
       end
@@ -207,14 +205,15 @@ class Imdb
       return nil if !m
       name = m[1]
 
-      info << "#{name} : http://us.imdb.com#{sr}"
+      info << "#{name}"
+      info.last << " : http://www.imdb.com#{sr}" unless opts[:nourl]
 
       return info if opts[:name_only]
 
-      if year = opts[:movies_in_year]
+      if opts[:movies_by_year]
         filmoyear = @bot.httputil.get(IMDB + sr + "filmoyear")
         if filmoyear
-          info << filmoyear.scan(/#{TITLE_MATCH} \(#{year}\)[^\[\n]*((?:\s+\[[^\]]+\](?:\s+\([^\[<]+\))*)+)\s+</)
+          info << filmoyear.scan(/#{TITLE_MATCH} \((\d\d\d\d)\)[^\[\n]*((?:\s+\[[^\]]+\](?:\s+\([^\[<]+\))*)+)\s+</)
         end
         return info
       end
@@ -280,9 +279,25 @@ class Imdb
     return nil
   end
 
-  def year_movies(urls, year)
+  def year_movies(urls, years_txt_org, role_req)
+    years_txt = years_txt_org.dup
+    years_txt.sub!(/^'/,'')
+    years_txt = "9#{years_txt}" if years_txt.match(/^\d\ds?$/)
+    years_txt = "1#{years_txt}" if years_txt.match(/^\d\d\ds?$/)
+
+    years = []
+    case years_txt
+    when /^\d\d\d\d$/
+      years << years_txt
+    when /^(\d\d\d\d)s$/
+      base = $1.to_i
+      base.upto(base+9) { |year|
+        years << year.to_s
+      }
+    end
+
     urls.map { |url|
-      info = info_name(url, :movies_in_year => year)
+      info = info_name(url, :movies_by_year => true)
 
       debug info.inspect
 
@@ -296,23 +311,41 @@ class Imdb
         bclip = b[1][0,5]
         quot = '&#34;'
         (aclip == quot ? 1 : -1) <=> (bclip == quot ? 1 : -1)
-      }.each { |url, pre_title, pre_roles|
+      }.each { |url, pre_title, year, pre_roles|
+        next unless years.include?(year)
         title = fix_article(pre_title.ircify_html)
         if title[0] == ?" and not @bot.config['imdb.tv_series_in_movies']
           next
         end
+        title << " (#{year})" unless years.length == 1
         role_array = []
         pre_roles.strip.scan(/\[([^\]]+)\]((?:\s+\([^\[]+\))+)?/) { |txt, comm|
+          role = nil
+          extra = nil
           if txt.match(/^(.*)\s+\.\.\.\.\s+(.*)$/)
-            role_array << "#{$1} (#{$2})"
+            role = $1
+            extra = "(#{$2.ircify_html})"
           else
-            role_array << txt
+            role = txt
+          end
+          next if role_req and not role.match(/^#{role_req}/i)
+          if comm
+            extra ||= ""
+            extra += comm.ircify_html if comm
           end
-          role_array.last << " " + comm.ircify_html if comm
+          role_array << [role, extra]
         }
+        next if role_req and role_array.empty?
 
-        roles = role_array.join(', ')
-        movies << [roles, title].join(": ")
+        roles = role_array.map { |ar|
+          if role_req
+            ar[1] # works for us both if it's nil and if it's something
+          else
+            ar.compact.join(" ")
+          end
+        }.compact.join(', ')
+        roles = nil if roles.empty?
+        movies << [roles, title].compact.join(": ")
       }
 
       if movies.empty?
@@ -344,31 +377,70 @@ class Imdb
 end
 
 class ImdbPlugin < Plugin
-  BotConfig.register BotConfigBooleanValue.new('imdb.aka',
+  Config.register Config::BooleanValue.new('imdb.aka',
     :default => true,
     :desc => "Look for IMDB matches also in translated titles and other 'also known as' information")
-  BotConfig.register BotConfigBooleanValue.new('imdb.popular',
+  Config.register Config::BooleanValue.new('imdb.popular',
     :default => true,
     :desc => "Display info on popular IMDB entries matching the request closely")
-  BotConfig.register BotConfigBooleanValue.new('imdb.exact',
+  Config.register Config::BooleanValue.new('imdb.exact',
     :default => true,
     :desc => "Display info on IMDB entries matching the request exactly")
-  BotConfig.register BotConfigBooleanValue.new('imdb.fix_article',
+  Config.register Config::BooleanValue.new('imdb.fix_article',
     :default => false,
     :desc => "Try to detect an article placed at the end and move it in front of the title")
-  BotConfig.register BotConfigBooleanValue.new('imdb.tv_series_in_movies',
+  Config.register Config::BooleanValue.new('imdb.tv_series_in_movies',
     :default => false,
     :desc => "Whether searching movies by person/year should also return TV series")
 
   def help(plugin, topic="")
-    "imdb <string> => search http://www.imdb.org for <string>: prefix <string> with 'name' or 'title' if you only want to search for people or films respectively, e.g.: imdb name ed wood"
+    case plugin
+    when "movies"
+      "movies by <who> in <years> [as <role>] => display the movies in the <years> where which <who> was <role>; <role> can be one of actor, actress, director or anything: if it's omitted, the role is defined by the prefix: \"movies by ...\" implies director, \"movies with ...\" implies actor or actress; the years can be specified as \"in the 60s\" or as \"in 1953\""
+    when /characters?/
+      "character played by <who> in <movie> => show the character played by <who> in movie <movie>. characters in <movie> => show the actors and characters in movie <movie>"
+    else
+      "imdb <string> => search http://www.imdb.org for <string>: prefix <string> with 'name' or 'title' if you only want to search for people or films respectively, e.g.: imdb name ed wood. see also movies and characters"
+    end
   end
 
   attr_reader :i
 
+  TITLE_URL = %r{^http://(?:[^.]+\.)?imdb.com(/title/tt\d+/)}
+  NAME_URL = %r{^http://(?:[^.]+\.)?imdb.com(/name/nm\d+/)}
+  def imdb_filter(s)
+    loc = Utils.check_location(s, TITLE_URL)
+    if loc
+      sr = loc.first.match(TITLE_URL)[1]
+      extra = $2 # nothign for the time being, could be fullcredits or whatever
+      res = i.info_title(sr, :nourl => true, :characters => (extra == 'fullcredits'))
+      debug res
+      if res
+        return {:title => res.first, :content => res.last}
+      else
+        return nil
+      end
+    end
+    loc = Utils.check_location(s, NAME_URL)
+    if loc
+      sr = loc.first.match(NAME_URL)[1]
+      extra = $2 # nothing for the time being, could be filmoyear or whatever
+      res = i.info_name(sr, :nourl => true, :movies_by_year => (extra == 'filmoyear'))
+      debug res
+      if res
+        name = res.shift
+        return {:title => name, :content => res.join(". ")}
+      else
+        return nil
+      end
+    end
+    return nil
+  end
+
   def initialize
     super
     @i = Imdb.new(@bot)
+    @bot.register_filter(:imdb, :htmlinfo) { |s| imdb_filter(s) }
   end
 
   # Find a person or movie on IMDB. A :type (name/title, default both) can be
@@ -388,7 +460,7 @@ class ImdbPlugin < Plugin
       end
     end
     if info.length == 1
-      m.reply Utils.decode_html_entities info.first.join("\n")
+      m.reply Utils.decode_html_entities(info.first.join("\n"))
     else
       m.reply info.map { |si|
         Utils.decode_html_entities si.join(" | ")
@@ -401,7 +473,18 @@ class ImdbPlugin < Plugin
   #
   def movies(m, params)
     who = params[:who].to_s
-    year = params[:year]
+    years = params[:years]
+    role = params[:role]
+    if role and role.downcase == 'anything'
+      role = nil
+    elsif not role
+      case params[:prefix].intern
+      when :with
+        role = /actor|actress/i
+      when :by
+        role = 'director'
+      end
+    end
 
     name_urls = i.search(who, :type => :name)
     unless name_urls
@@ -409,7 +492,7 @@ class ImdbPlugin < Plugin
       return
     end
 
-    movie_urls = i.year_movies(name_urls, year)
+    movie_urls = i.year_movies(name_urls, years, role)
     debug movie_urls.inspect
     debug movie_urls[0][1]
 
@@ -417,7 +500,7 @@ class ImdbPlugin < Plugin
       m.reply movie_urls.join("\n")
     else
       m.reply movie_urls.map { |si|
-        si[1] = "no movies in #{year}" unless si[1]
+        si[1] = "no movies in #{years}" unless si[1]
         Utils.decode_html_entities si.join(" | ")
       }.join("\n")
     end
@@ -466,7 +549,7 @@ end
 plugin = ImdbPlugin.new
 
 plugin.map "imdb [:type] *what", :requirements => { :type => /name|title/ }, :defaults => { :type => 'both' }
-plugin.map "movies :prefix *who in :year", :requirements => { :prefix => /with|by|from/, :year => /\d+/ }
+plugin.map "movies :prefix *who in [the] :years [as :role]", :requirements => { :prefix => /with|by|from/, :years => /'?\d+s?/ }
 plugin.map "character [played] by *who in *movie"
 plugin.map "character of *who in *movie"
 plugin.map "characters in *movie", :action => :imdb