The branch, dharma has been updated
via 5146bd37ab003d2f34bde1bc234690fb0858bd5f (commit)
from d7c9a032394a992367c88af7a04dd9cbd494bba3 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=5146bd37ab003d2f34bde1bc234690fb0858bd5f
commit 5146bd37ab003d2f34bde1bc234690fb0858bd5f
Author: olympia <[email protected]>
Date: Mon Jun 13 15:10:52 2011 +0200
[metadata.imdb.com] updated to version 2.2.0
diff --git a/metadata.imdb.com/addon.xml b/metadata.imdb.com/addon.xml
index 5c1bda0..92eda0c 100644
--- a/metadata.imdb.com/addon.xml
+++ b/metadata.imdb.com/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.imdb.com"
name="IMDb"
- version="2.1.9"
+ version="2.2.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.imdb.com/changelog.txt b/metadata.imdb.com/changelog.txt
index 1088731..4b7faa7 100644
--- a/metadata.imdb.com/changelog.txt
+++ b/metadata.imdb.com/changelog.txt
@@ -1,3 +1,6 @@
+[B]2.2.0[/B]
+- Better USA/International title recognition + make NfoUrl imdb site
independent
+
[B]2.1.9[/B]
- fixed: actor roles and remove scraping of imdb trailers
diff --git a/metadata.imdb.com/imdb.xml b/metadata.imdb.com/imdb.xml
index 02d3011..796e93b 100644
--- a/metadata.imdb.com/imdb.xml
+++ b/metadata.imdb.com/imdb.xml
@@ -2,10 +2,10 @@
<scraper framework="1.1" date="2011-03-15">
<NfoUrl dest="3">
<RegExp input="$$1"
output="<url>http://akas.\1/title/tt\2/</url><id>tt\2</id>";
dest="3">
- <expression clear="yes"
noclean="1">(imdb.com)/Title\?([0-9]*)</expression>
+ <expression clear="yes"
noclean="1">(imdb.+)/Title\?([0-9]*)</expression>
</RegExp>
<RegExp input="$$1"
output="<url>http://akas.\1\2/</url><id>tt\2</id>";
dest="3+">
- <expression
noclean="1">(imdb.com/title/tt)([0-9]*)</expression>
+ <expression
noclean="1">(imdb.+/title/tt)([0-9]*)</expression>
</RegExp>
</NfoUrl>
<CreateSearchUrl dest="3" SearchStringEncoding="iso-8859-1">
@@ -152,32 +152,68 @@
<expression><meta
name="title"
content="(?:&#x22;)?([^"]*?)(?:&#x22;)?
\([^\(]*?([0-9]{4})\)</expression>
</RegExp>
<RegExp input="$$9" output="\1" dest="10">
- <expression/>
+ <expression />
</RegExp>
<RegExp input="$$1" output="\1" dest="11">
-
<expression>>\s*?"([^<]+)"[^<]+[<em>]?[^"]+(UK|USA|Canada\s(<em>)?\(English
title\))</expression>
+ <expression
clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+Hong
Kong [<em>][^"]+English</expression>
</RegExp>
<RegExp input="$$11" output="\1" dest="10">
<expression>(.+)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="11">
-
<expression>>\s*?"([^<]+)"[^<]+[<em>]?[^"]+Hong
Kong [<em>][^"]+English</expression>
+ <expression
clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+((Canada)\s(<em>)?\((English|imdb))</expression>
</RegExp>
<RegExp input="$$11" output="\1" dest="10">
<expression>(.+)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="11">
- <expression>>\s*?"([^<]+)" -
International [<em>]?[^"]+English</expression>
+ <expression
clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+(UK(<em>)?<br>)</expression>
</RegExp>
<RegExp input="$$11" output="\1" dest="10">
<expression>(.+)</expression>
</RegExp>
+ <RegExp input="$$1" output="\1" dest="11">
+ <expression
clear="yes">>\s*?"([^<]+)"[^"]+International\s(<em>)?\(English
title\)(</em>)?(,|<)( |b)</expression>
+ </RegExp>
+ <RegExp input="$$11" output="\1" dest="10">
+ <expression>(.+)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="11">
+ <expression
clear="yes">>\s*?"([^<]+)"[^"]+International\s(<em>)?\(English
title\)(</em>)? (<em>)?\(imdb</expression>
+ </RegExp>
+ <RegExp input="$$11" output="\1" dest="10">
+ <expression>(.+)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="12">
+ <expression clear="yes"><a
href="/country/[^>]+>(UK</a></div>)</expression>
+ </RegExp>
+ <RegExp input="$$12" output="$$9" dest="10">
+ <expression>(.+)</expression>
+ </RegExp>
<RegExp input="$$1" output="\1" dest="12">
- <expression><a
href="/country/[^>]+>(USA|UK|NewZealand|Canada)</expression>
+ <expression clear="yes"><a
href="/country/[^>]+>(USA</a></div>)</expression>
</RegExp>
<RegExp input="$$12" output="$$9" dest="10">
<expression>(.+)</expression>
</RegExp>
+ <RegExp input="$$1" output="\1" dest="11">
+ <expression
clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+(USA(<em>)?<br>)</expression>
+ </RegExp>
+ <RegExp input="$$11" output="\1" dest="10">
+ <expression>(.+)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="11">
+ <expression
clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+((USA)\s(<em>)?\((English|imdb))</expression>
+ </RegExp>
+ <RegExp input="$$11" output="\1" dest="10">
+ <expression>(.+)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="11">
+ <expression
clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+((USA)\s(<em>)?\((new
title))</expression>
+ </RegExp>
+ <RegExp input="$$11" output="\1" dest="10">
+ <expression>(.+)</expression>
+ </RegExp>
<expression noclean="1" />
</RegExp>
<RegExp input="$$4" output="\1" dest="2">
@@ -190,7 +226,7 @@
<expression>(.+)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="5">
- <expression><a
href="/country/[^>]+>($INFO[akatitles])</expression>
+ <expression><a
href="/country/[^>]+>($INFO[akatitles])</expression>
</RegExp>
<RegExp input="$$5" output="$$9" dest="4">
<expression>($INFO[akatitles])</expression>
-----------------------------------------------------------------------
Summary of changes:
metadata.imdb.com/addon.xml | 2 +-
metadata.imdb.com/changelog.txt | 3 ++
metadata.imdb.com/imdb.xml | 52 +++++++++++++++++++++++++++++++++------
3 files changed, 48 insertions(+), 9 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
