X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fimdb.rb;h=0f5c6024b6306ddcd73079500208dde7a02dbf55;hb=90656f4203a0a989b6fb110d4a07598dd186b84c;hp=f0497c0b503e55448f235614cc3aa9dc486db25d;hpb=0e6e5a51ab7485459e6864377456498756d15669;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git
diff --git a/data/rbot/plugins/imdb.rb b/data/rbot/plugins/imdb.rb
index f0497c0b..0f5c6024 100644
--- a/data/rbot/plugins/imdb.rb
+++ b/data/rbot/plugins/imdb.rb
@@ -12,10 +12,10 @@
# License:: MIT license
class Imdb
- IMDB = "http://www.imdb.com"
+ IMDB = "https://www.imdb.com"
TITLE_OR_NAME_MATCH = /]*)>([^<]*)<\/a>/
TITLE_MATCH = /]*)>([^<]*)<\/a>/
- NAME_MATCH = /]*)>([^<]*)<\/a>/
+ NAME_MATCH = /]*)>([^<]*)<\/a>/
CHAR_MATCH = /]*)>([^<]*)<\/a>/
CREDIT_NAME_MATCH = /#{NAME_MATCH}\s*<\/td>\s*
]+>\s*\.\.\.\s*<\/td>\s* | ]+>\s*(.+?)\s*<\/td>/m
FINAL_ARTICLE_MATCH = /, ([A-Z]\S{0,2})$/
@@ -33,8 +33,12 @@ class Imdb
end
def search(rawstr, rawopts={})
+ # allow the user to search directly for (movie) IDs
+ if rawstr.match /$tt\d+^/ then
+ return ["/movie/#{rawstr}/"]
+ end
str = CGI.escape(rawstr)
- str << ";site=aka" if @bot.config['imdb.aka']
+ str << "&site=aka" if @bot.config['imdb.aka']
opts = rawopts.dup
opts[:type] = :both unless opts[:type]
return do_search(str, opts)
@@ -128,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
@@ -143,7 +149,8 @@ class Imdb
title_date = m[1].ircify_html
debug title_date
# note that the date dash for series is a - (ndash), not a - (minus sign)
- pre_title, extra, date, junk = title_date.scan(/^(.*)\((.+?\s+)?(\d\d\d\d(?:â(?:\d\d\d\d)?)?(?:\/[IV]+)?)\)\s*(.+)?$/).first
+ # 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)
@@ -174,14 +181,18 @@ class Imdb
end
ratings = "no votes"
- m = resp.body.match(/([0-9.]+)<\/b>]+>\/10<\/span><\/span>\s*[^<]+]*href="ratings"[^>]+>([0-9,]+) votes?<\/a>/m)
- 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>/) do |gnr|
- genre << gnr
+ resp.body.scan(/([^<]+)<\/a>/) do |gnr|
+ genre << gnr.first.strip
end
plot = resp.body.match(DESC_MATCH)[3] rescue nil
@@ -308,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
|