The branch, eden-pre has been updated
via a4716bc2a9d68b2277a9e0a561a03930ee5d07f8 (commit)
from ecc686211cc338324790565d76377025f6008761 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=a4716bc2a9d68b2277a9e0a561a03930ee5d07f8
commit a4716bc2a9d68b2277a9e0a561a03930ee5d07f8
Author: olympia <[email protected]>
Date: Sat Jan 14 23:25:12 2012 +0100
[metadata.imdb.com] updated to version 2.3.4
diff --git a/metadata.common.imdb.com/addon.xml
b/metadata.common.imdb.com/addon.xml
index 11ff894..66fe1e3 100644
--- a/metadata.common.imdb.com/addon.xml
+++ b/metadata.common.imdb.com/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.common.imdb.com"
name="IMDB common scraper functions"
- version="2.1.4"
+ version="2.1.5"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.common.imdb.com/changelog.txt
b/metadata.common.imdb.com/changelog.txt
index 74dee2b..437fc18 100644
--- a/metadata.common.imdb.com/changelog.txt
+++ b/metadata.common.imdb.com/changelog.txt
@@ -1,3 +1,6 @@
+[B]2.1.5[/B]
+- fixed: Cleanup and factored out Genres to common
+
[B]2.1.4[/B]
- fixed: fetching directors and writers due to site changes
diff --git a/metadata.common.imdb.com/imdb.xml
b/metadata.common.imdb.com/imdb.xml
index 3ef4600..78e4318 100644
--- a/metadata.common.imdb.com/imdb.xml
+++ b/metadata.common.imdb.com/imdb.xml
@@ -1,64 +1,23 @@
<scraperfunctions>
- <GetIMDBRatingById dest="5">
- <RegExp input="$$1" output="<details><url
cache="$$1-main.html"
function="ParseIMDBRating">http://akas.imdb.com/title/$$1/</url></details>";
dest="5">
- <expression noclean="1" />
- </RegExp>
- </GetIMDBRatingById>
- <GetIMDBPlotById dest="5">
- <RegExp input="$$1" output="<details><url
cache="$$1-main.html"
function="ParseIMDBPlot">http://akas.imdb.com/title/$$1/</url></details>";
dest="5">
- <expression noclean="1" />
- </RegExp>
- </GetIMDBPlotById>
- <GetIMDBCastById dest="5">
- <RegExp input="$$1" output="<details><url
cache="$$1-main.html"
function="ParseIMDBCast">http://akas.imdb.com/title/$$1/</url></details>";
dest="5">
- <expression noclean="1" />
- </RegExp>
- </GetIMDBCastById>
- <GetIMDBScaledCastById dest="5">
- <RegExp input="$$1" output="<details><url
cache="$$1-main.html"
function="ParseIMDBScaledCast">http://akas.imdb.com/title/$$1/</url></details>";
dest="5">
- <expression noclean="1" />
- </RegExp>
- </GetIMDBScaledCastById>
- <GetIMDBDirectorsById dest="5">
- <RegExp input="$$1" output="<details><url
cache="$$1-main.html"
function="ParseIMDBDirectors">http://akas.imdb.com/title/$$1/</url></details>";
dest="5">
- <expression noclean="1" />
- </RegExp>
- </GetIMDBDirectorsById>
- <GetIMDBWritersById dest="5">
- <RegExp input="$$1" output="<details><url
cache="$$1-main.html"
function="ParseIMDBWriters">http://akas.imdb.com/title/$$1/</url></details>";
dest="5">
+ <GetIMDBGenresById dest="5">
+ <RegExp input="$$1" output="<details><url
cache="$$1-main.html"
function="ParseIMDBGenres">http://akas.imdb.com/title/$$1/</url></details>";
dest="5">
<expression noclean="1" />
</RegExp>
- </GetIMDBWritersById>
- <GetIMDBFullCastById dest="5">
- <RegExp input="$$1" output="<details><url
cache="$$1-combined.html"
function="ParseIMDBFullCast">http://akas.imdb.com/title/$$1/combined</url></details>";
dest="5">
- <expression noclean="1" />
- </RegExp>
- </GetIMDBFullCastById>
- <GetIMDBScaledFullCastById dest="5">
- <RegExp input="$$1" output="<details><url
cache="$$1-combined.html"
function="ParseIMDBScaledFullCast">http://akas.imdb.com/title/$$1/combined</url></details>";
dest="5">
- <expression noclean="1" />
- </RegExp>
- </GetIMDBScaledFullCastById>
- <GetIMDBFullDirectorsById dest="5">
- <RegExp input="$$1" output="<details><url
cache="$$1-combined.html"
function="ParseIMDBFullDirectors">http://akas.imdb.com/title/$$1/combined</url></details>";
dest="5">
- <expression noclean="1" />
- </RegExp>
- </GetIMDBFullDirectorsById>
- <GetIMDBFullWritersById dest="5">
- <RegExp input="$$1" output="<details><url
cache="$$1-combined.html"
function="ParseIMDBFullWriters">http://akas.imdb.com/title/$$1/combined</url></details>";
dest="5">
- <expression noclean="1" />
- </RegExp>
- </GetIMDBFullWritersById>
- <GetIMDBThumbsById dest="5">
- <RegExp input="$$1" output="<details><url
cache="$$1-posters.html"
function="ParseIMDBThumbs">http://akas.imdb.com/title/$$1/posters</url></details>";
dest="5">
+ </GetIMDBGenresById>
+ <ParseIMDBGenres dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1"
output="<genre>\1</genre>" dest="2">
+ <expression
repeat="yes">itemprop="genre"[^>]+>([^<]+)</a></expression>
+ </RegExp>
<expression noclean="1" />
</RegExp>
- </GetIMDBThumbsById>
- <GetIMDBTrailerById dest="5">
- <RegExp input="$$1" output="<details><url
cache="$$1-main.html"
function="GetIMDBTrailerPage">http://akas.imdb.com/title/$$1/</url></details>";
dest="5">
+ </ParseIMDBGenres>
+
+ <GetIMDBRatingById dest="5">
+ <RegExp input="$$1" output="<details><url
cache="$$1-main.html"
function="ParseIMDBRating">http://akas.imdb.com/title/$$1/</url></details>";
dest="5">
<expression noclean="1" />
</RegExp>
- </GetIMDBTrailerById>
+ </GetIMDBRatingById>
<ParseIMDBRating dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1"
output="<rating>\1</rating><votes>\2</votes>" dest="2">
@@ -67,6 +26,12 @@
<expression noclean="1" />
</RegExp>
</ParseIMDBRating>
+
+ <GetIMDBPlotById dest="5">
+ <RegExp input="$$1" output="<details><url
cache="$$1-main.html"
function="ParseIMDBPlot">http://akas.imdb.com/title/$$1/</url></details>";
dest="5">
+ <expression noclean="1" />
+ </RegExp>
+ </GetIMDBPlotById>
<ParseIMDBPlot dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1"
output="<plot>\1</plot>" dest="2">
@@ -75,6 +40,12 @@
<expression noclean="1" />
</RegExp>
</ParseIMDBPlot>
+
+ <GetIMDBCastById dest="5">
+ <RegExp input="$$1" output="<details><url
cache="$$1-main.html"
function="ParseIMDBCast">http://akas.imdb.com/title/$$1/</url></details>";
dest="5">
+ <expression noclean="1" />
+ </RegExp>
+ </GetIMDBCastById>
<ParseIMDBCast dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1" output="\1" dest="6">
@@ -92,6 +63,12 @@
<expression noclean="1" />
</RegExp>
</ParseIMDBCast>
+
+ <GetIMDBScaledCastById dest="5">
+ <RegExp input="$$1" output="<details><url
cache="$$1-main.html"
function="ParseIMDBScaledCast">http://akas.imdb.com/title/$$1/</url></details>";
dest="5">
+ <expression noclean="1" />
+ </RegExp>
+ </GetIMDBScaledCastById>
<ParseIMDBScaledCast dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1" output="\1" dest="6">
@@ -109,6 +86,12 @@
<expression noclean="1" />
</RegExp>
</ParseIMDBScaledCast>
+
+ <GetIMDBDirectorsById dest="5">
+ <RegExp input="$$1" output="<details><url
cache="$$1-main.html"
function="ParseIMDBDirectors">http://akas.imdb.com/title/$$1/</url></details>";
dest="5">
+ <expression noclean="1" />
+ </RegExp>
+ </GetIMDBDirectorsById>
<ParseIMDBDirectors dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1" output="\1" dest="6">
@@ -120,6 +103,12 @@
<expression noclean="1" />
</RegExp>
</ParseIMDBDirectors>
+
+ <GetIMDBWritersById dest="5">
+ <RegExp input="$$1" output="<details><url
cache="$$1-main.html"
function="ParseIMDBWriters">http://akas.imdb.com/title/$$1/</url></details>";
dest="5">
+ <expression noclean="1" />
+ </RegExp>
+ </GetIMDBWritersById>
<ParseIMDBWriters dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1" output="\1" dest="6">
@@ -131,6 +120,12 @@
<expression noclean="1" />
</RegExp>
</ParseIMDBWriters>
+
+ <GetIMDBFullCastById dest="5">
+ <RegExp input="$$1" output="<details><url
cache="$$1-combined.html"
function="ParseIMDBFullCast">http://akas.imdb.com/title/$$1/combined</url></details>";
dest="5">
+ <expression noclean="1" />
+ </RegExp>
+ </GetIMDBFullCastById>
<ParseIMDBFullCast dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1" output="\1" dest="6">
@@ -145,6 +140,12 @@
<expression noclean="1" />
</RegExp>
</ParseIMDBFullCast>
+
+ <GetIMDBScaledFullCastById dest="5">
+ <RegExp input="$$1" output="<details><url
cache="$$1-combined.html"
function="ParseIMDBScaledFullCast">http://akas.imdb.com/title/$$1/combined</url></details>";
dest="5">
+ <expression noclean="1" />
+ </RegExp>
+ </GetIMDBScaledFullCastById>
<ParseIMDBScaledFullCast dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1" output="\1" dest="6">
@@ -159,6 +160,12 @@
<expression noclean="1" />
</RegExp>
</ParseIMDBScaledFullCast>
+
+ <GetIMDBFullDirectorsById dest="5">
+ <RegExp input="$$1" output="<details><url
cache="$$1-combined.html"
function="ParseIMDBFullDirectors">http://akas.imdb.com/title/$$1/combined</url></details>";
dest="5">
+ <expression noclean="1" />
+ </RegExp>
+ </GetIMDBFullDirectorsById>
<ParseIMDBFullDirectors dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp conditional="fullcredits" input="$$1"
output="\1" dest="6">
@@ -170,6 +177,12 @@
<expression noclean="1" />
</RegExp>
</ParseIMDBFullDirectors>
+
+ <GetIMDBFullWritersById dest="5">
+ <RegExp input="$$1" output="<details><url
cache="$$1-combined.html"
function="ParseIMDBFullWriters">http://akas.imdb.com/title/$$1/combined</url></details>";
dest="5">
+ <expression noclean="1" />
+ </RegExp>
+ </GetIMDBFullWritersById>
<ParseIMDBFullWriters dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp conditional="fullcredits" input="$$1"
output="\1" dest="6">
@@ -181,6 +194,12 @@
<expression noclean="1" />
</RegExp>
</ParseIMDBFullWriters>
+
+ <GetIMDBThumbsById dest="5">
+ <RegExp input="$$1" output="<details><url
cache="$$1-posters.html"
function="ParseIMDBThumbs">http://akas.imdb.com/title/$$1/posters</url></details>";
dest="5">
+ <expression noclean="1" />
+ </RegExp>
+ </GetIMDBThumbsById>
<ParseIMDBThumbs dest="5">
<RegExp input="$$6" output="<details>\1</details>"
dest="5">
<RegExp input="$$1"
output="\1_SX$INFO[imdbscale]_SY$INFO[imdbscale]_\2" dest="4">
diff --git a/metadata.imdb.com/addon.xml b/metadata.imdb.com/addon.xml
index b615534..d82bbd8 100644
--- a/metadata.imdb.com/addon.xml
+++ b/metadata.imdb.com/addon.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.imdb.com"
name="IMDb"
- version="2.3.3"
+ version="2.3.4"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
<import addon="metadata.common.themoviedb.org" version="1.0.7"/>
<import addon="metadata.common.movieposterdb.com" version="1.0.5"/>
- <import addon="metadata.common.imdb.com" version="2.1.4"/>
+ <import addon="metadata.common.imdb.com" version="2.1.5"/>
<import addon="metadata.common.impa.com" version="1.0.3"/>
- <import addon="metadata.common.hdtrailers.net" version="1.0.6"/>
+ <import addon="metadata.common.hdtrailers.net" version="1.0.7"/>
<import addon="metadata.common.youtubetrailers" version="1.0.4"/>
</requires>
<extension point="xbmc.metadata.scraper.movies"
diff --git a/metadata.imdb.com/changelog.txt b/metadata.imdb.com/changelog.txt
index 326baca..b034afb 100644
--- a/metadata.imdb.com/changelog.txt
+++ b/metadata.imdb.com/changelog.txt
@@ -1,3 +1,6 @@
+[B]2.3.4[/B]
+- fixed: factored out genres to common
+
[B]2.3.3[/B]
- fixed: failed to fetch country and genre due to site changes
diff --git a/metadata.imdb.com/imdb.xml b/metadata.imdb.com/imdb.xml
index bc5e7ae..5960b4c 100644
--- a/metadata.imdb.com/imdb.xml
+++ b/metadata.imdb.com/imdb.xml
@@ -62,8 +62,8 @@
<RegExp input="$$2" output="<chain
function="GetIMDBRatingById">$$2</chain>" dest="5+">
<expression/>
</RegExp>
- <RegExp input="$$1"
output="<genre>\1</genre>" dest="5+">
- <expression
repeat="yes">itemprop="genre"[^>]+>([^<]+)</a></expression>
+ <RegExp input="$$2" output="<chain
function="GetIMDBGenresById">$$2</chain>" dest="5+">
+ <expression/>
</RegExp>
<RegExp input="$$1"
output="<country>\1</country>" dest="5+">
<expression
repeat="yes">"/country/[^>]+>([^<]+)</a></expression>
-----------------------------------------------------------------------
Summary of changes:
metadata.common.imdb.com/addon.xml | 2 +-
metadata.common.imdb.com/changelog.txt | 3 +
metadata.common.imdb.com/imdb.xml | 127 ++++++++++++++++++--------------
metadata.imdb.com/addon.xml | 6 +-
metadata.imdb.com/changelog.txt | 3 +
metadata.imdb.com/imdb.xml | 4 +-
6 files changed, 85 insertions(+), 60 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
RSA(R) Conference 2012
Mar 27 - Feb 2
Save $400 by Jan. 27
Register now!
http://p.sf.net/sfu/rsa-sfdev2dev2
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
