X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fimdb.rb;h=0f4b8c809e9124ac0fa1557ae0e5590d5bbe6d53;hb=fc0c682cbf7a68b8ccd458ac776770fccf9e59f4;hp=78060142a89dba2d74a61370ad2188bf79ba92f2;hpb=5f1c92ac9eb22f8b977d66147af663f12000338e;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git
diff --git a/data/rbot/plugins/imdb.rb b/data/rbot/plugins/imdb.rb
index 78060142..0f4b8c80 100644
--- a/data/rbot/plugins/imdb.rb
+++ b/data/rbot/plugins/imdb.rb
@@ -12,14 +12,17 @@
# License:: MIT license
class Imdb
- IMDB = "http://us.imdb.com"
- TITLE_OR_NAME_MATCH = /]*)>([^<]*)<\/a>/
- TITLE_MATCH = /]*)>([^<]*)<\/a>/
- NAME_MATCH = /]*)>([^<]*)<\/a>/
- CREDIT_NAME_MATCH = /#{NAME_MATCH}<\/td>
]+> \.\.\. <\/td> | ]+>(.+?)<\/td>/
+ IMDB = "http://www.imdb.com"
+ TITLE_OR_NAME_MATCH = /]*)>([^<]*)<\/a>/
+ TITLE_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})$/
+ DESC_MATCH = //
MATCHER = {
+ :character => CHAR_MATCH,
:title => TITLE_MATCH,
:name => NAME_MATCH,
:both => TITLE_OR_NAME_MATCH
@@ -52,6 +55,9 @@ class Imdb
matcher = MATCHER[opts[:type]]
if resp.code == "200"
+ if opts[:all]
+ return resp.body.scan(matcher).map { |m| m.first }.compact.uniq
+ end
m = []
m << matcher.match(resp.body) if @bot.config['imdb.popular']
if resp.body.match(/\(Exact Matches\)<\/b>/) and @bot.config['imdb.exact']
@@ -99,7 +105,7 @@ class Imdb
end
def grab_info(info, body)
- / |