X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fimdb.rb;h=33e13b637295e8d5535337ed33e8b21897bdf3b5;hb=4fa049e0386d8044f0063e90b7e7efbca9c712de;hp=8c46f3fe24fae918000cbbd5fab0130e51a5296c;hpb=37c38bb9571052b75ede02602e568754c5ff8158;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git diff --git a/data/rbot/plugins/imdb.rb b/data/rbot/plugins/imdb.rb index 8c46f3fe..33e13b63 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>/ @@ -101,7 +99,7 @@ class Imdb end def grab_info(info, body) - /
\s+
#{info}:<\/h5>\s+(.*?)<\/div>/mi.match(body)[1] rescue nil + /
\s+
#{info}:<\/h5>\s+(.*?)<\/div>/mi.match(body)[1] rescue nil end def fix_article(org_tit) @@ -155,19 +153,19 @@ 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 ratings = "no votes" - m = /([0-9.]+)\/10<\/b>\n?\r?\s+\(([0-9,]+) votes?<\/a>\)<\/small>/.match(resp.body) + m = /([0-9.]+)\/10<\/b>\n?\r?\s+[^<]+]+>([0-9,]+) votes?<\/a>/.match(resp.body) if m ratings = "#{m[1]}/10 (#{m[2]} voters)" end @@ -207,7 +205,8 @@ 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] @@ -280,7 +279,7 @@ class Imdb return nil end - def year_movies(urls, years_txt_org) + 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?$/) @@ -321,16 +320,32 @@ class Imdb 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? @@ -362,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 => search http://www.imdb.org for : prefix 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 in [as ] => display the movies in the where which was ; 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 in => show the character played by in movie . characters in => show the actors and characters in movie " + else + "imdb => search http://www.imdb.org for : prefix 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 @@ -406,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(" | ") @@ -415,11 +469,22 @@ class ImdbPlugin < Plugin end # Find the movies with a participation of :who in the year :year - # TODO: allow year to be either a year or a decade ('[in the] 1960s') + # TODO: allow year to be either a year or a decade ('[in the] 1960s') # def movies(m, params) who = params[:who].to_s 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 @@ -427,7 +492,7 @@ class ImdbPlugin < Plugin return end - movie_urls = i.year_movies(name_urls, years) + movie_urls = i.year_movies(name_urls, years, role) debug movie_urls.inspect debug movie_urls[0][1] @@ -484,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 [the] :years", :requirements => { :prefix => /with|by|from/, :years => /'?\d+s?/ } +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