country = data.ircify_html.gsub(' / ','/')
end
- info << [title, "(#{country}, #{date})", extra, dir ? "[#{dir}]" : nil, opts[:nourl] ? 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]
end
ratings = "no votes"
- m = /<b>([0-9.]+)\/10<\/b>\n?\r?\s+<small>\(<a href="ratings">([0-9,]+) votes?<\/a>\)<\/small>/.match(resp.body)
+ 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)"
end
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]
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
+ 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 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
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