#
# 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>/
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]
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
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
bclip = b[1][0,5]
quot = '"'
(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?
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(" | ")
#
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
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]
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
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