#{info}:<\/h5>\s+(.*?)<\/div>/mi.match(body)[1] rescue nil
+ /
\s*\s*#{info}:\s*<\/h[45]>\s*(.*?)<\/div>/mi.match(body)[1] rescue nil
end
def fix_article(org_tit)
@@ -122,6 +132,8 @@ class Imdb
def info_title(sr, opts={})
resp = nil
begin
+ # movie urls without tailing / trigger a redirect
+ sr += '/' if sr[-1,1] != '/'
resp = @bot.httputil.get_response(IMDB + sr, :max_redir => -1)
rescue Exception => e
error e.message
@@ -134,13 +146,17 @@ class Imdb
if resp.code == "200"
m = /([^<]*)<\/title>/.match(resp.body)
return nil if !m
- title_date = m[1]
- pre_title, date, extra = title_date.scan(/^(.*)\((\d\d\d\d(?:\/[IV]+)?)\)\s*(.+)?$/).first
+ title_date = m[1].ircify_html
+ debug title_date
+ # note that the date dash for series is a - (ndash), not a - (minus sign)
+ # also, the second date, if missing, is an no-break space
+ pre_title, extra, date, junk = title_date.scan(/^(.*)\((.+?\s+)?(\d\d\d\d(?:â(?:\d\d\d\d|Â )?)?(?:\/[IV]+)?)\)\s*(.+)?$/).first
+ extra.strip! if extra
pre_title.strip!
- title = fix_article(pre_title.ircify_html)
+ title = fix_article(pre_title)
dir = nil
- data = grab_info(/Directors?/, resp.body)
+ data = grab_info(/(?:Director|Creator)s?/, resp.body)
if data
dir = data.scan(NAME_MATCH).map { |url, name|
name.ircify_html
@@ -165,21 +181,28 @@ class Imdb
end
ratings = "no votes"
- m = /<b>([0-9.]+)\/10<\/b>\n?\r?\s+[^<]+<a href="ratings"[^>]+>([0-9,]+) votes?<\/a>/.match(resp.body)
- if m
- ratings = "#{m[1]}/10 (#{m[2]} voters)"
+ # parse imdb rating value:
+ if resp.body.match(/itemprop="ratingValue">([^<]+)</)
+ ratings = "#{$1}/10"
+ end
+ # parse imdb rating count:
+ if resp.body.match(/itemprop="ratingCount">([^<]+)</)
+ ratings += " (#{$1} voters)"
end
genre = Array.new
- resp.body.scan(/<a href="\/Sections\/Genres\/[^\/]+\/">([^<]+)<\/a>/) do |gnr|
- genre << gnr
+ resp.body.scan(/<a\s+href="\/genre\/[^\?]+\?[^"]+"\s+>([^<]+)<\/a>/) do |gnr|
+ genre << gnr.first.strip
end
- plot = nil
- data = grab_info(/Plot (?:Outline|Summary)/, resp.body)
- if data
- plot = "Plot: " + data.ircify_html.gsub(/\s+more$/,'')
- end
+ plot = resp.body.match(DESC_MATCH)[3] rescue nil
+ # TODO option to extract the long storyline
+ # data = resp.body.match(/<h2>Storyline<\/h2>\s+/m).post_match.match(/<\/p>/).pre_match rescue nil
+ # if data
+ # data.sub!(/<em class="nobr">Written by.*$/m, '')
+ # plot = data.ircify_html.gsub(/\s+more\s*$/,'').gsub(/\s+Full summary » \| Full synopsis »\s*$/,'')
+ # end
+ plot = "Plot: #{plot}" if plot
info << ["Ratings: " << ratings, "Genre: " << genre.join('/') , plot].compact.join(". ")
@@ -203,9 +226,9 @@ class Imdb
if resp.code == "200"
m = /<title>([^<]*)<\/title>/.match(resp.body)
return nil if !m
- name = m[1]
+ name = m[1].sub(/ - IMDb/, '')
- info << "#{name}"
+ info << name
info.last << " : http://www.imdb.com#{sr}" unless opts[:nourl]
return info if opts[:name_only]
@@ -296,8 +319,8 @@ class Imdb
}
end
- urls.map { |url|
- info = info_name(url, :movies_by_year => true)
+ urls.map { |u|
+ info = info_name(u, :movies_by_year => true)
debug info.inspect
@@ -357,14 +380,18 @@ class Imdb
end
def name_in_movie(name_urls, movie_urls)
+ debug name_urls
info = []
movie_urls.each { |movie|
title_info = info_title(movie, :title_only => true)
valid = []
data = @bot.httputil.get(IMDB + movie + "fullcredits")
- data.scan(CREDIT_NAME_MATCH).each { |url, name, role|
- valid << [url, name.ircify_html, role.ircify_html] if name_urls.include?(url)
+ data.scan(CREDIT_NAME_MATCH).each { |url, name, role_data|
+ ch_url, role = role_data.scan(CHAR_MATCH).first
+ debug [ch_url, role]
+ wanted = name_urls.include?(url) || name_urls.include?(ch_url)
+ valid << [url, name.ircify_html, role.ircify_html] if wanted
}
valid.each { |url, name, role|
info << "%s : %s was %s in %s" % [name, IMDB + url, role, title_info]
@@ -509,17 +536,23 @@ class ImdbPlugin < Plugin
# Find the character played by :who in :movie
#
def character(m, params)
- who = params[:who].to_s
movie = params[:movie].to_s
-
- name_urls = i.search(who, :type => :name)
- unless name_urls
- m.reply "nothing found about #{who}, sorry"
+ movie_urls = i.search(movie, :type => :title)
+ unless movie_urls
+ m.reply "movie #{who} not found, sorry"
return
end
- movie_urls = i.search(movie, :type => :title)
- unless movie_urls
+ if params[:actor]
+ who = params[:actor].to_s
+ type = :name
+ else
+ who = params[:character].to_s
+ type = :character
+ end
+
+ name_urls = i.search(who, :type => type, :all => true)
+ unless name_urls
m.reply "nothing found about #{who}, sorry"
return
end
@@ -550,7 +583,7 @@ plugin = ImdbPlugin.new
plugin.map "imdb [:type] *what", :requirements => { :type => /name|title/ }, :defaults => { :type => 'both' }
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 "character [played] by *actor in *movie"
+plugin.map "character of *character in *movie"
plugin.map "characters in *movie", :action => :imdb