The branch, eden has been updated
via cc3baf896252189fbdb154e0034ae757548cfac9 (commit)
from 821901e868397beac1643bff3b4f82a103434fdd (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=cc3baf896252189fbdb154e0034ae757548cfac9
commit cc3baf896252189fbdb154e0034ae757548cfac9
Author: Lee Pollock <[email protected]>
Date: Thu Dec 12 16:51:31 2013 +0000
[metadata.common.themoviedb.org] updated to version 2.11.0
diff --git a/metadata.common.themoviedb.org/addon.xml
b/metadata.common.themoviedb.org/addon.xml
index 4331121..c191cfd 100644
--- a/metadata.common.themoviedb.org/addon.xml
+++ b/metadata.common.themoviedb.org/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.common.themoviedb.org"
name="The Movie Database Scraper Library"
- version="2.9.6"
+ version="2.11.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.common.themoviedb.org/tmdb.xml
b/metadata.common.themoviedb.org/tmdb.xml
index ac35cf1..881e49f 100644
--- a/metadata.common.themoviedb.org/tmdb.xml
+++ b/metadata.common.themoviedb.org/tmdb.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<scraperfunctions>
+
<GetTMDBCertificationsByIdChain dest="4">
<RegExp input="$$5" output="<details>\1</details>"
dest="4">
<RegExp input="$$1" output="<url
function="ParseTMDBCertifications"
cache="tmdb-cert-\1.json">http://api.themoviedb.org/3/movie/\1/releases?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbcertcountry]</url>";
dest="5">
@@ -132,6 +133,26 @@
</RegExp>
</ParseFallbackTMDBTagline>
+ <GetTMDBTagsByIdChain clearbuffers="no" dest="4">
+ <RegExp input="$$5" output="<details>\1</details>"
dest="4">
+ <RegExp input="$$1" output="\1" dest="8">
+ <expression clear="yes" noclean="1" />
+ </RegExp>
+ <RegExp input="$$8" output="<url
function="ParseTMDBTags"
>http://api.themoviedb.org/3/movie/\1/keywords?api_key=57983e31fb435df4df77afb854740ea9</url>";
dest="5">
+ <expression />
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GetTMDBTagsByIdChain>
+ <ParseTMDBTags dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1" output="<tag>\1</tag>"
dest="2">
+ <expression repeat="yes"
noclean="1">\{"id":[0-9]+,"name":"([^"]*)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseTMDBTags>
+
<GetTMDBSetByIdChain clearbuffers="no" dest="4">
<RegExp input="$$5" output="<details>\1</details>"
dest="4">
<RegExp input="$$1" output="\1" dest="8">
@@ -179,7 +200,10 @@
<GetTMDBCastByIdChain dest="4">
<RegExp input="$$5" output="<details>\1</details>"
dest="4">
- <RegExp input="$$1" output="<url
function="ParseTMDBCast"
cache="tmdb-cast-\1.json">http://api.themoviedb.org/3/movie/\1/casts?api_key=57983e31fb435df4df77afb854740ea9</url>";
dest="5">
+ <RegExp input="$$1" output="<url
function="ParseTMDBBaseImageURL"
cache="tmdb-config.json">http://api.themoviedb.org/3/configuration?api_key=57983e31fb435df4df77afb854740ea9</url>";
dest="5">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1" output="<url
function="ParseTMDBCast"
cache="tmdb-cast-\1.json">http://api.themoviedb.org/3/movie/\1/casts?api_key=57983e31fb435df4df77afb854740ea9</url>";
dest="5+">
<expression />
</RegExp>
<expression noclean="1" />
@@ -190,7 +214,7 @@
<RegExp input="$$1" output="\1" dest="7">
<expression clear="yes"
noclean="1">"cast":\[([^\]]*)</expression>
</RegExp>
- <RegExp input="$$7"
output="<actor><name>\1</name><role>\2</role><order>\3</order><thumb>http://d3gtl9l2a4fn1j.cloudfront.net/t/p/original\4</thumb></actor>";
dest="2">
+ <RegExp input="$$7"
output="<actor><name>\1</name><role>\2</role><order>\3</order><thumb>$$20original\4</thumb></actor>"
dest="2">
<expression repeat="yes"
fixchars="1">"name":"([^"]*)","character":"([^"]*)","order":([0-9]*),"cast_id":[0-9]*,"profile_path":"([^"]*)"</expression>
</RegExp>
<RegExp input="$$7"
output="<actor><name>\1</name><role>\2</role><order>\3</order></actor>"
dest="2+">
@@ -398,7 +422,10 @@
<GetTMDBFanartByIdChain dest="4">
<RegExp input="$$5" output="<details>\1</details>"
dest="4">
- <RegExp input="$$1" output="<url
function="ParseTMDBFanart"
cache="tmdb-images-\1.json">http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9</url>";
dest="5">
+ <RegExp input="$$1" output="<url
function="ParseTMDBBaseImageURL"
cache="tmdb-config.json">http://api.themoviedb.org/3/configuration?api_key=57983e31fb435df4df77afb854740ea9</url>";
dest="5">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1" output="<url
function="ParseTMDBFanart"
cache="tmdb-images-\1.json">http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9</url>";
dest="5+">
<expression />
</RegExp>
<expression noclean="1" />
@@ -409,8 +436,8 @@
<RegExp input="$$1" output="\1" dest="7">
<expression clear="yes"
noclean="1">"backdrops":\[\{([^\]]*)</expression>
</RegExp>
- <RegExp input="$$7" output="<thumb
preview="http://d3gtl9l2a4fn1j.cloudfront.net/t/p/w780\1">http://d3gtl9l2a4fn1j.cloudfront.net/t/p/original\1</thumb>";
dest="2">
- <expression repeat="yes"
noclean="1">"file_path":"([^"]*)</expression>
+ <RegExp input="$$7" output="<thumb
preview="$$20w780\1">$$20original\1</thumb>" dest="2">
+ <expression clear="yes" repeat="yes"
noclean="1">"file_path":"([^"]*)</expression>
</RegExp>
<expression noclean="1">(.+)</expression>
</RegExp>
@@ -418,7 +445,10 @@
<GetTMDBThumbsByIdChain dest="4">
<RegExp input="$$5" output="<details>\1</details>"
dest="4">
- <RegExp input="$$1" output="<url
function="ParseTMDBThumbs"
cache="tmdb-images-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>";
dest="5">
+ <RegExp input="$$1" output="<url
function="ParseTMDBBaseImageURL"
cache="tmdb-config.json">http://api.themoviedb.org/3/configuration?api_key=57983e31fb435df4df77afb854740ea9</url>";
dest="5">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1" output="<url
function="ParseTMDBThumbs"
cache="tmdb-images-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>";
dest="5+">
<expression />
</RegExp>
<expression noclean="1" />
@@ -426,13 +456,16 @@
</GetTMDBThumbsByIdChain>
<GetTMDBLangThumbsByIdChain dest="4">
<RegExp input="$$5" output="<details>\1</details>"
dest="4">
- <RegExp input="$$1" output="<url
function="ParseTMDBLangThumbs"
cache="tmdb-images-$INFO[tmdbthumblanguage]-\1.json">http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbthumblanguage]</url>";
dest="5">
+ <RegExp input="$$1" output="<url
function="ParseTMDBBaseImageURL"
cache="tmdb-config.json">http://api.themoviedb.org/3/configuration?api_key=57983e31fb435df4df77afb854740ea9</url>";
dest="5">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1" output="<url
function="ParseTMDBLangThumbs"
cache="tmdb-images-$INFO[tmdbthumblanguage]-\1.json">http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbthumblanguage]</url>";
dest="5+">
<expression />
</RegExp>
<expression noclean="1" />
</RegExp>
</GetTMDBLangThumbsByIdChain>
- <ParseTMDBThumbs dest="5">
+ <ParseTMDBThumbs clearbuffers="no" dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1" output="\1" dest="8">
<expression
noclean="1">"id":([0-9]*),</expression>
@@ -440,8 +473,11 @@
<RegExp input="$$1" output="\1" dest="7">
<expression clear="yes"
noclean="1">"posters":\[\{([^\]]*)</expression>
</RegExp>
- <RegExp input="$$7" output="<thumb
aspect="poster"
preview="http://d3gtl9l2a4fn1j.cloudfront.net/t/p/w500\1">http://d3gtl9l2a4fn1j.cloudfront.net/t/p/original\1</thumb>";
dest="9">
- <expression repeat="yes"
noclean="1">"file_path":"([^"]*)</expression>
+ <RegExp input="$$7" output="<thumb
aspect="poster"
preview="$$20w500\1">$$20original\1</thumb>" dest="9">
+ <expression clear="yes" repeat="yes"
noclean="1">"file_path":"([^"]*)</expression>
+ </RegExp>
+ <RegExp input="$$9" output="$$9" dest="2">
+ <expression clear="yes">(.+)</expression>
</RegExp>
<RegExp input="$$9" output="$$12" dest="2+">
<RegExp input="$INFO[language]" output="<url
function="ParseTMDBAllThumbs"
cache="tmdb-images-$$8.json">http://api.themoviedb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9</url>";
dest="12">
@@ -449,16 +485,13 @@
</RegExp>
<expression>^$</expression>
</RegExp>
- <RegExp input="$$9" output="$$9" dest="2+">
- <expression>(.+)</expression>
- </RegExp>
<RegExp input="$INFO[language]" output="<url
function="ParseTMDBEnThumbs"
cache="tmdb-images-en-$$8.json">http://api.themoviedb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>";
dest="2+">
<expression>^((?!en).)*$</expression>
</RegExp>
<expression noclean="1">(.+)</expression>
</RegExp>
</ParseTMDBThumbs>
- <ParseTMDBLangThumbs dest="5">
+ <ParseTMDBLangThumbs clearbuffers="no" dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1" output="\1" dest="8">
<expression
noclean="1">"id":([0-9]*),</expression>
@@ -466,8 +499,11 @@
<RegExp input="$$1" output="\1" dest="7">
<expression clear="yes"
noclean="1">"posters":\[\{([^\]]*)</expression>
</RegExp>
- <RegExp input="$$7" output="<thumb
aspect="poster"
preview="http://d3gtl9l2a4fn1j.cloudfront.net/t/p/w500\1">http://d3gtl9l2a4fn1j.cloudfront.net/t/p/original\1</thumb>";
dest="9">
- <expression repeat="yes"
noclean="1">"file_path":"([^"]*)</expression>
+ <RegExp input="$$7" output="<thumb
aspect="poster"
preview="$$20w500\1">$$20original\1</thumb>" dest="9">
+ <expression clear="yes" repeat="yes"
noclean="1">"file_path":"([^"]*)</expression>
+ </RegExp>
+ <RegExp input="$$9" output="$$9" dest="2">
+ <expression clear="yes">(.+)</expression>
</RegExp>
<RegExp input="$$9" output="$$12" dest="2+">
<RegExp input="$INFO[tmdbthumblanguage]"
output="<url function="ParseTMDBAllThumbs"
cache="tmdb-images-$$8.json">http://api.themoviedb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9</url>";
dest="12">
@@ -475,16 +511,13 @@
</RegExp>
<expression>^$</expression>
</RegExp>
- <RegExp input="$$9" output="$$9" dest="2+">
- <expression>(.+)</expression>
- </RegExp>
<RegExp input="$INFO[tmdbthumblanguage]"
output="<url function="ParseTMDBEnThumbs"
cache="tmdb-images-en-$$8.json">http://api.themoviedb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>";
dest="2+">
<expression>^((?!en).)*$</expression>
</RegExp>
<expression noclean="1">(.+)</expression>
</RegExp>
</ParseTMDBLangThumbs>
- <ParseTMDBEnThumbs dest="5">
+ <ParseTMDBEnThumbs clearbuffers="no" dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1" output="\1" dest="8">
<expression
noclean="1">"id":([0-9]*),</expression>
@@ -492,15 +525,15 @@
<RegExp input="$$1" output="\1" dest="7">
<expression clear="yes"
noclean="1">"posters":\[\{([^\]]*)</expression>
</RegExp>
- <RegExp input="$$7" output="<thumb
aspect="poster"
preview="http://d3gtl9l2a4fn1j.cloudfront.net/t/p/w500\1">http://d3gtl9l2a4fn1j.cloudfront.net/t/p/original\1</thumb>";
dest="9">
+ <RegExp input="$$7" output="<thumb
aspect="poster"
preview="$$20w500\1">$$20original\1</thumb>" dest="9">
<expression repeat="yes"
noclean="1">"file_path":"([^"]*)</expression>
</RegExp>
+ <RegExp input="$$9" output="$$9" dest="2">
+ <expression clear="yes">(.+)</expression>
+ </RegExp>
<RegExp input="$$9" output="<url
function="ParseTMDBAllThumbs"
cache="tmdb-images-$$8.json">http://api.themoviedb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9</url>";
dest="2">
<expression>^$</expression>
</RegExp>
- <RegExp input="$$9" output="$$9" dest="2">
- <expression>(.+)</expression>
- </RegExp>
<expression noclean="1">(.+)</expression>
</RegExp>
</ParseTMDBEnThumbs>
@@ -509,11 +542,20 @@
<RegExp input="$$1" output="\1" dest="7">
<expression clear="yes"
noclean="1">"posters":\[\{([^\]]*)</expression>
</RegExp>
- <RegExp input="$$7" output="<thumb
aspect="poster"
preview="http://d3gtl9l2a4fn1j.cloudfront.net/t/p/w500\1">http://d3gtl9l2a4fn1j.cloudfront.net/t/p/original\1</thumb>";
dest="2">
+ <RegExp input="$$7" output="<thumb
aspect="poster"
preview="$$20w500\1">$$20original\1</thumb>" dest="2">
<expression repeat="yes"
noclean="1">"file_path":"([^"]*)</expression>
</RegExp>
<expression noclean="1">(.+)</expression>
</RegExp>
</ParseTMDBAllThumbs>
+ <ParseTMDBBaseImageURL clearbuffers="no" dest="4">
+ <RegExp input="$$5"
output="<details>$$20</details>" dest="4">
+ <RegExp input="$$1" output="\1" dest="20">
+
<expression>"images":\{"base_url":"([^"]*)"</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseTMDBBaseImageURL>
+
</scraperfunctions>
-----------------------------------------------------------------------
Summary of changes:
metadata.common.themoviedb.org/addon.xml | 2 +-
metadata.common.themoviedb.org/tmdb.xml | 92 ++++++++++++++++++++++--------
2 files changed, 68 insertions(+), 26 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
