The branch, eden-pre has been updated
via c7a5b8e47c262ad211b690d3818ad7328d67438d (commit)
from 7c2545c9f6b1b24291647587710fec3b57de69f5 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=c7a5b8e47c262ad211b690d3818ad7328d67438d
commit c7a5b8e47c262ad211b690d3818ad7328d67438d
Author: olympia <[email protected]>
Date: Wed Jan 18 08:39:37 2012 +0100
[metadata.themoviedb.org] update to version 3.0.0
diff --git a/metadata.common.themoviedb.org/addon.xml
b/metadata.common.themoviedb.org/addon.xml
index b82ec53..63a8d02 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 MovieDB common scraper functions"
- version="2.0.0"
+ version="2.1.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
@@ -11,10 +11,8 @@
<extension point="xbmc.addon.metadata">
<platform>all</platform>
<minversion>20000</minversion>
- <summary lang="bg">ÐиблиоÑека за ÑвалÑне на инÑ.
Ð¾Ñ TMDb</summary>
<summary lang="en">TMDb Scraper Library</summary>
<summary lang="es">Scraper de peliculas de TMDb</summary>
- <summary lang="fi">TMDb elokuvatietojen lataajan kirjasto</summary>
<summary lang="fr">Scraper TMDb</summary>
<summary lang="hu">TMDb leolvasó-könyvtár</summary>
<summary lang="nl">TMDb-scraperfuncties</summary> <!--Dit
gaat over de functies, niet over de mediabibliotheek!-->
@@ -24,10 +22,8 @@
<summary lang="ru">ÐбÑабоÑÑик Ð´Ð»Ñ TMDb</summary>
<summary lang="se">Skrapebibliotek för TMDb</summary>
<summary lang="zh">TMDbå®åå¨ä»£ç åº</summary>
- <description lang="bg">Ð¡Ð²Ð°Ð»Ñ Ð¼Ð¸Ð½Ð¸Ð°ÑÑÑи и fanarts оÑ
www.themoviedb.org</description>
<description lang="en">Download thumbs and fanarts from
www.themoviedb.org</description>
<description lang="es">Descarga posters y fanart de
www.themoviedb.org</description>
- <description lang="fi">Lataa pienoiskuvia ja fanitaidetta
www.themoviedb.org -sivustolta</description>
<description lang="fr">Télécharge vignettes et backdrops depuis
www.themoviedb.org</description>
<description lang="hu">Bélyeg- és fanartképek letöltése a
www.themoviedb.org webhelyrÅl</description>
<description lang="nl">Miniaturen en fanart ophalen van
www.themoviedb.org</description>
diff --git a/metadata.common.themoviedb.org/tmdb.xml
b/metadata.common.themoviedb.org/tmdb.xml
index 1e9ac72..ee00071 100644
--- a/metadata.common.themoviedb.org/tmdb.xml
+++ b/metadata.common.themoviedb.org/tmdb.xml
@@ -1,19 +1,43 @@
<scraperfunctions>
- <GetTMDBPlotByIdChain dest="4">
+
+ <GetTMDBCertificationsByIdChain dest="4">
<RegExp input="$$5" output="<details>\1</details>"
dest="4">
- <RegExp input="$$1" output="<url
function="ParseTMDBPlot"
cache="tmdb-$INFO[language]-tt\1.json">http://api.themoviedb.org/2.1/Movie.getInfo/en/json/57983e31fb435df4df77afb854740ea9/tt\1</url>";
dest="5">
- <expression>tt([0-9]+)</expression>
+ <RegExp input="$$1" output="<url
function="ParseTMDBCertifications"
cache="tmdb-cert-\1.json">http://api.themoviedb.org/3/movie/\1/releases?api_key=57983e31fb435df4df77afb854740ea9</url>";
dest="5">
+ <expression />
</RegExp>
- <RegExp input="$$1" output="<url
function="ParseTMDBPlot"
cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/2.1/Movie.getInfo/en/json/57983e31fb435df4df77afb854740ea9/\1</url>";
dest="5">
- <expression>^([0-9]+)$</expression>
+ <expression noclean="1" />
+ </RegExp>
+ </GetTMDBCertificationsByIdChain>
+ <ParseTMDBCertifications dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1" output="<mpaa>Rated
\1</mpaa>" dest="2">
+ <expression
fixchars="1">"US","certification":"([^"]*)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseTMDBCertifications>
+
+ <GetTMDBPlotByIdChain 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="ParseTMDBPlot"
cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[language]</url>";
dest="5">
+ <expression />
</RegExp>
<expression noclean="1" />
</RegExp>
</GetTMDBPlotByIdChain>
<ParseTMDBPlot dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1"
output="<plot>\1</plot>" dest="2">
- <expression
fixchars="1">"overview":"(.*?)",</expression>
+ <RegExp input="$$1" output="\1" dest="9">
+ <expression clear="yes"
fixchars="1">"overview":"(.*?)",</expression>
+ </RegExp>
+ <RegExp input="$$9" output="<url
function="ParseFallbackTMDBPlot"
cache="tmdb-en-$$8.json">http://api.themoviedb.org/3/movie/$$8?api_key=57983e31fb435df4df77afb854740ea9&language=en</url>";
dest="2">
+ <expression>^$</expression>
+ </RegExp>
+ <RegExp input="$$9"
output="<plot>\1</plot>" dest="2">
+ <expression>(.+)</expression>
</RegExp>
<RegExp input="$$1"
output="<outline>\1</outline>" dest="2+">
<expression
fixchars="1">"overview":"(.{180,}?)[.?!]</expression>
@@ -21,35 +45,102 @@
<expression noclean="1" />
</RegExp>
</ParseTMDBPlot>
- <GetTMDBCastByIdChain dest="4">
+ <ParseFallbackTMDBPlot dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1"
output="<plot>\1</plot>" dest="2">
+ <expression clear="yes"
fixchars="1">"overview":"(.*?)",</expression>
+ </RegExp>
+ <RegExp input="$$1"
output="<outline>\1</outline>" dest="2+">
+ <expression
fixchars="1">"overview":"(.{180,}?)[.?!]</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseFallbackTMDBPlot>
+
+ <GetTMDBSetByIdChain dest="4">
<RegExp input="$$5" output="<details>\1</details>"
dest="4">
- <RegExp input="$$1" output="<url
function="ParseTMDBCast"
cache="tmdb-$INFO[language]-tt\1.json">http://api.themoviedb.org/2.1/Movie.getInfo/en/json/57983e31fb435df4df77afb854740ea9/tt\1</url>";
dest="5">
- <expression>tt([0-9]+)</expression>
+ <RegExp input="$$1" output="<url
function="ParseTMDBSet"
cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[language]</url>";
dest="5">
+ <expression />
</RegExp>
- <RegExp input="$$1" output="<url
function="ParseTMDBCast"
cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/2.1/Movie.getInfo/en/json/57983e31fb435df4df77afb854740ea9/\1</url>";
dest="5">
- <expression>^([0-9]+)$</expression>
+ <expression noclean="1" />
+ </RegExp>
+ </GetTMDBSetByIdChain>
+ <ParseTMDBSet dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1" output="<set>\1</set>"
dest="2">
+ <expression
noclean="1">"belongs_to_collection":{"id":[0-9]+,"name":"([^"]*)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseTMDBSet>
+
+ <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">
+ <expression />
</RegExp>
<expression noclean="1" />
</RegExp>
</GetTMDBCastByIdChain>
<ParseTMDBCast dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1"
output="<actor><name>\1</name><role>\2</role></actor>"
dest="2">
- <expression repeat="yes"
fixchars="1">"name":"([^"]*)","job":"Actor","department":"Actors","character":"([^"]*)</expression>
+ <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></actor>"
dest="2">
+ <expression repeat="yes"
fixchars="1">"name":"([^"]*)","character":"([^"]*)</expression>
</RegExp>
- <RegExp input="$$1"
output="<actor><name>\1</name><role>\2</role><thumb>http://\3original\4</thumb></actor>";
dest="2+">
- <expression repeat="yes"
fixchars="1">"name":"([^"]*)","job":"Actor","department":"Actors","character":"([^"]*)","id":[0-9]+,"order":[0-9]*,"cast_id":[0-9]*,"url":"[^"]*","profile":"http://(.*?)w[0-9]+([^"]*)"</expression>
+ <RegExp input="$$7"
output="<actor><name>\1</name><role>\2</role><thumb>http://cf2.imgobject.com/t/p/original\3</thumb></actor>";
dest="2+">
+ <expression repeat="yes"
fixchars="1">"name":"([^"]*)","character":"([^"]*)","order":[0-9]*,"profile_path":"([^"]*)"</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
</ParseTMDBCast>
- <GetTMDBGenresByIdChain dest="4">
+
+ <GetTMDBDirectorsByIdChain dest="4">
<RegExp input="$$5" output="<details>\1</details>"
dest="4">
- <RegExp input="$$1" output="<url
function="ParseTMDBGenres"
cache="tmdb-$INFO[language]-tt\1.json">http://api.themoviedb.org/2.1/Movie.getInfo/en/json/57983e31fb435df4df77afb854740ea9/tt\1</url>";
dest="5">
- <expression>tt([0-9]+)</expression>
+ <RegExp input="$$1" output="<url
function="ParseTMDBDirectors"
cache="tmdb-cast-\1.json">http://api.themoviedb.org/3/movie/\1/casts?api_key=57983e31fb435df4df77afb854740ea9</url>";
dest="5">
+ <expression />
</RegExp>
- <RegExp input="$$1" output="<url
function="ParseTMDBGenres"
cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/2.1/Movie.getInfo/en/json/57983e31fb435df4df77afb854740ea9/\1</url>";
dest="5">
- <expression>^([0-9]+)$</expression>
+ <expression noclean="1" />
+ </RegExp>
+ </GetTMDBDirectorsByIdChain>
+ <ParseTMDBDirectors dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression clear="yes"
noclean="1">"crew":\[([^\]]*)</expression>
+ </RegExp>
+ <RegExp input="$$7"
output="<director>\1</director>" dest="2">
+ <expression repeat="yes"
fixchars="1">"name":"([^"]*)","department":"Directing","job":"Director"</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseTMDBDirectors>
+
+ <GetTMDBWitersByIdChain dest="4">
+ <RegExp input="$$5" output="<details>\1</details>"
dest="4">
+ <RegExp input="$$1" output="<url
function="ParseTMDBWriters"
cache="tmdb-cast-\1.json">http://api.themoviedb.org/3/movie/\1/casts?api_key=57983e31fb435df4df77afb854740ea9</url>";
dest="5">
+ <expression />
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GetTMDBWitersByIdChain>
+ <ParseTMDBWriters dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression clear="yes"
noclean="1">"crew":\[([^\]]*)</expression>
+ </RegExp>
+ <RegExp input="$$7"
output="<credits>\1</credits>" dest="2">
+ <expression repeat="yes"
fixchars="1">"name":"([^"]*)","department":"Writing",</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseTMDBWriters>
+
+ <GetTMDBGenresByIdChain dest="4">
+ <RegExp input="$$5" output="<details>\1</details>"
dest="4">
+ <RegExp input="$$1" output="<url
function="ParseTMDBGenres"
cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[language]</url>";
dest="5">
+ <expression />
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -57,7 +148,7 @@
<ParseTMDBGenres dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1" output="\1" dest="7">
- <expression
noclean="1">"genres":\[([^\]]*)</expression>
+ <expression clear="yes"
noclean="1">"genres":\[([^\]]*)</expression>
</RegExp>
<RegExp input="$$7"
output="<genre>\1</genre>" dest="2">
<expression repeat="yes"
fixchars="1">"name":"([^"]*)</expression>
@@ -65,13 +156,11 @@
<expression noclean="1" />
</RegExp>
</ParseTMDBGenres>
+
<GetTMDBRatingByIdChain dest="4">
<RegExp input="$$5" output="<details>\1</details>"
dest="4">
- <RegExp input="$$1" output="<url
function="ParseTMDBRating"
cache="tmdb-$INFO[language]-tt\1.json">http://api.themoviedb.org/2.1/Movie.getInfo/en/json/57983e31fb435df4df77afb854740ea9/tt\1</url>";
dest="5">
- <expression>tt([0-9]+)</expression>
- </RegExp>
- <RegExp input="$$1" output="<url
function="ParseTMDBRating"
cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/2.1/Movie.getInfo/en/json/57983e31fb435df4df77afb854740ea9/\1</url>";
dest="5">
- <expression>^([0-9]+)$</expression>
+ <RegExp input="$$1" output="<url
function="ParseTMDBRating"
cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[language]</url>";
dest="5">
+ <expression />
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -79,17 +168,18 @@
<ParseTMDBRating dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1"
output="<rating>\1</rating>" dest="2">
- <expression
noclean="1">"rating":([^,]*),"</expression>
+ <expression
noclean="1">"vote_average":([^,]*),"</expression>
</RegExp>
<RegExp input="$$1"
output="<votes>\1</votes>" dest="2+">
- <expression
noclean="1">"votes":([0-9]+)</expression>
+ <expression
noclean="1">"vote_count":([0-9]+)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
</ParseTMDBRating>
+
<GetTMDBTrailerByIdChain dest="4">
<RegExp input="$$5" output="<details>\1</details>"
dest="4">
- <RegExp input="$$1" output="<url
function="ParseTMDBTrailer"
cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/json/57983e31fb435df4df77afb854740ea9/\1</url>";
dest="5">
+ <RegExp input="$$1" output="<url
function="ParseTMDBTrailer"
cache="tmdb-trailer-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1/trailers?api_key=57983e31fb435df4df77afb854740ea9</url>";
dest="5">
<expression>^([0-9]+)$</expression>
</RegExp>
<expression noclean="1" />
@@ -97,70 +187,84 @@
</GetTMDBTrailerByIdChain>
<ParseTMDBTrailer dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1"
output="<trailer>plugin://plugin.video.youtube/?action=play_video&videoid=\1</trailer>"
dest="2+">
- <expression
noclean="1">"trailer":".*?youtube.com/watch\?v=([^"]*)</expression>
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression clear="yes"
noclean="1">"youtube":\[{([^\]]*)</expression>
+ </RegExp>
+ <RegExp input="$$7"
output="<trailer>plugin://plugin.video.youtube/?action=play_video&videoid=\1</trailer>"
dest="2">
+ <expression
noclean="1">"source":"([^"]*)</expression>
</RegExp>
<expression noclean="1">(.+)</expression>
</RegExp>
</ParseTMDBTrailer>
+
<GetTMDBFanartByIdChain dest="4">
<RegExp input="$$5" output="<details>\1</details>"
dest="4">
- <RegExp input="$$1" output="<url
function="ParseTMDBFanart"
cache="tmdb-images-tt\1.json">http://api.themoviedb.org/2.1/Movie.getImages/en/json/57983e31fb435df4df77afb854740ea9/tt\1</url>";
dest="5">
- <expression>tt([0-9]+)</expression>
- </RegExp>
- <RegExp input="$$1" output="<url
function="ParseTMDBFanart"
cache="tmdb-images-\1.json">http://api.themoviedb.org/2.1/Movie.getImages/en/json/57983e31fb435df4df77afb854740ea9/\1</url>";
dest="5">
- <expression>^([0-9]+)$</expression>
+ <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" />
</RegExp>
</GetTMDBFanartByIdChain>
<GetTMDBFanartById dest="4">
<RegExp input="$$5" output="<details>\1</details>"
dest="4">
- <RegExp input="$$1" output="<url
function="ParseTMDBFanart"
cache="tmdb-images-tt\1.json">http://api.themoviedb.org/2.1/Movie.getImages/en/json/57983e31fb435df4df77afb854740ea9/tt\1</url>";
dest="5">
- <expression>/tt([0-9]+)</expression>
- </RegExp>
- <RegExp input="$$1" output="<url
function="ParseTMDBFanart"
cache="tmdb-images-\1.json">http://api.themoviedb.org/2.1/Movie.getImages/en/json/57983e31fb435df4df77afb854740ea9/\1</url>";
dest="5">
-
<expression><id>([0-9]*)</id></expression>
+ <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" />
</RegExp>
</GetTMDBFanartById>
<ParseTMDBFanart dest="5">
<RegExp input="$$2"
output="<details><fanart>\1</fanart></details>"
dest="5">
- <RegExp input="$$1" output="<thumb
preview="\1w780\2">\1original\2</thumb>" dest="2">
- <expression repeat="yes"
noclean="1">"type":"backdrop","size":"original".*?"url":"(.*?)original([^"]*)</expression>
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression clear="yes"
noclean="1">"backdrops":\[{([^\]]*)</expression>
+ </RegExp>
+ <RegExp input="$$7" output="<thumb
preview="http://cf2.imgobject.com/t/p/w780\1">http://cf2.imgobject.com/t/p/original\1</thumb>";
dest="2">
+ <expression repeat="yes"
noclean="1">"file_path":"([^"]*)</expression>
</RegExp>
<expression noclean="1">(.+)</expression>
</RegExp>
</ParseTMDBFanart>
+
<GetTMDBThumbsByIdChain dest="4">
<RegExp input="$$5" output="<details>\1</details>"
dest="4">
- <RegExp input="$$1" output="<url
function="ParseTMDBThumbs"
cache="tmdb-images-tt\1.json">http://api.themoviedb.org/2.1/Movie.getImages/en/json/57983e31fb435df4df77afb854740ea9/tt\1</url>";
dest="5">
- <expression>tt([0-9]+)</expression>
- </RegExp>
- <RegExp input="$$1" output="<url
function="ParseTMDBThumbs"
cache="tmdb-images-\1.json">http://api.themoviedb.org/2.1/Movie.getImages/en/json/57983e31fb435df4df77afb854740ea9/\1</url>";
dest="5">
- <expression>^([0-9]+)$</expression>
+ <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&language=$INFO[language]</url>";
dest="5">
+ <expression />
</RegExp>
<expression noclean="1" />
</RegExp>
</GetTMDBThumbsByIdChain>
<GetTMDBThumbsById dest="4">
<RegExp input="$$5" output="<details>\1</details>"
dest="4">
- <RegExp input="$$1" output="<url
function="ParseTMDBThumbs"
cache="tmdb-images-tt\1.json">http://api.themoviedb.org/2.1/Movie.getImages/en/json/57983e31fb435df4df77afb854740ea9/tt\1</url>";
dest="5">
- <expression>/tt([0-9]+)</expression>
- </RegExp>
- <RegExp input="$$1" output="<url
function="ParseTMDBThumbs"
cache="tmdb-images-\1.json">http://api.themoviedb.org/2.1/Movie.getImages/en/json/57983e31fb435df4df77afb854740ea9/\1</url>";
dest="5">
-
<expression><id>([0-9]*)</id></expression>
+ <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&language=$INFO[language]</url>";
dest="5">
+ <expression />
</RegExp>
<expression noclean="1" />
</RegExp>
</GetTMDBThumbsById>
<ParseTMDBThumbs dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1" output="<thumb
preview="\1w500\2">\1original\2</thumb>" dest="2">
- <expression repeat="yes"
noclean="1">"type":"poster","size":"original".*?"url":"(.*?)original([^"]*)</expression>
+ <RegExp input="$$1" output="<url
function="ParseTMDBAllThumbs"
cache="tmdb-images-\1.json">http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9</url>";
dest="2">
+ <expression
noclean="1">"id":([0-9]*),</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression clear="yes"
noclean="1">"posters":\[{([^\]]*)</expression>
+ </RegExp>
+ <RegExp input="$$7" output="<thumb
preview="http://cf2.imgobject.com/t/p/w500\1">http://cf2.imgobject.com/t/p/original\1</thumb>";
dest="2+">
+ <expression repeat="yes"
noclean="1">"file_path":"([^"]*)</expression>
</RegExp>
<expression noclean="1">(.+)</expression>
</RegExp>
</ParseTMDBThumbs>
+ <ParseTMDBAllThumbs dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression clear="yes"
noclean="1">"posters":\[{([^\]]*)</expression>
+ </RegExp>
+ <RegExp input="$$7" output="<thumb
preview="http://cf2.imgobject.com/t/p/w500\1">http://cf2.imgobject.com/t/p/original\1</thumb>";
dest="2">
+ <expression repeat="yes"
noclean="1">"file_path":"([^"]*)</expression>
+ </RegExp>
+ <expression noclean="1">(.+)</expression>
+ </RegExp>
+ </ParseTMDBAllThumbs>
+
</scraperfunctions>
diff --git a/metadata.themoviedb.org/addon.xml
b/metadata.themoviedb.org/addon.xml
index 0e0596c..c4aec59 100644
--- a/metadata.themoviedb.org/addon.xml
+++ b/metadata.themoviedb.org/addon.xml
@@ -1,44 +1,38 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.themoviedb.org"
name="The MovieDB"
- version="2.0.1"
+ version="3.0.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
- <import addon="metadata.common.themoviedb.org" version="2.0.0"/>
- <import addon="metadata.common.hdtrailers.net" version="1.0.6"/>
- <import addon="metadata.common.imdb.com" version="2.1.3"/>
- <import addon="plugin.video.youtube" version="2.1.0"/>
+ <import addon="metadata.common.themoviedb.org" version="2.1.0"/>
+ <import addon="metadata.common.hdtrailers.net" version="1.0.7"/>
+ <import addon="metadata.common.imdb.com" version="2.1.5"/>
+ <import addon="plugin.video.youtube" version="2.1.0" optional="true"/>
</requires>
<extension point="xbmc.metadata.scraper.movies"
language="en"
library="tmdb.xml"/>
<extension point="xbmc.addon.metadata">
- <summary lang="bg">Ð¡Ð²Ð°Ð»Ñ Ð¸Ð½Ñ. за Ñилми Ð¾Ñ TMDB</summary>
<summary lang="en">TMDB Movie Scraper</summary>
<summary lang="de">Film-Scraper für TheMovieDB</summary>
<summary lang="es">Scraper de pelÃculas de TheMovieDB</summary>
- <summary lang="fi">TMDB elokuvatietojen lataaja</summary>
<summary lang="hu">TMDB filmadat leolvasó</summary>
<summary lang="nl">TMDb-filmscraper</summary>
<summary lang="pl">Scraper filmowy TMDB</summary>
<summary lang="pt">Scraper de filmes TMDb</summary>
<summary lang="ro">Scraper de filme TMDb</summary>
<summary lang="ru">ÐбÑабоÑÑик ФилÑмов длÑ
TMDB</summary>
- <summary lang="se">Skrapa för TMDb</summary>
<summary lang="zh">TMDBçµå½±å®åå¨</summary>
- <description lang="bg">themoviedb.org е безплаÑна и
оÑвоÑена база Ð¾Ñ Ð´Ð°Ð½Ð½Ð¸ за Ñилми. Ðадвижва
Ñе изÑÑло Ð¾Ñ Ð¿Ð¾ÑÑебиÑелиÑе Ñи - Ñ
оÑа каÑо
ваÑ. Ðилиони Ñ
оÑа по ÑвеÑа вÑеки меÑеÑ
Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ TMDb, благодаÑение на
многоÑÑнкÑионалноÑо API. ÐдновÑеменно Ñ
Ñова е и изÑоÑник на инÑоÑмаÑÐ¸Ñ Ð·Ð° медийни
ÑенÑÑове, каÑо XBMC, коиÑо извлиÑаÑ
меÑаинÑоÑмаÑÐ¸Ñ Ð·Ð° Ñилми, поÑÑеÑи и
Fanart.</description>
<description lang="en">themoviedb.org is a free and open movie database.
It's completely user driven by people like you. TMDb is currently used by
millions of people every month and with their powerful API, it is also used by
many popular media centers like XBMC to retrieve Movie Metadata, Posters and
Fanart to enrich the user's experience.</description>
<description lang="de">TheMovieDB.org ist eine freie und offene
Film-Datenbank. Sie wird nur User wie dir betrieben. TheMovieDB wird zur Zeit
monatlich von Millionen genutzt. Mit der mächtigen API wird sie auch von
vielen Media-Center, wie z.B. XBMC, genutzt um Filme-Meta-Daten, Poster und
Fanrts zu beziehen, damit der User sein Media-Center verschönern
kann</description>
<description lang="es">themovieDB.org es una base de datos de pelÃculas
gratuita y abierta. Es una página web que se basa en contenido subido por los
usuarios. TMDb es usada diariamente por mucha gente gracias a su API, que es
usada por más programas aparte de XBMC para descargar información de
pelÃculas asà como Posters o Fanart (Fondos de escritorio basados en
pelÃculas usados en distintos skins) para enriquecer la experiencia de usar
XBMC.</description>
- <description lang="fi">themoviedb.org on vapaa ja avoin elokuvatietokanta.
Se on täysin käyttäjien ylläpitämä. TMDb:a käyttää miljoonat ihmiset
joka kuukausi, sitä käytetään käyttäjäkokemuksen rikastuttamiseen
monissa muissakin suosituissa XBMC:n kaltaisissa ohjelmissa lataamalla
elokuvien tietoja, julisteita ja fanitaidetta.</description>
<description lang="hu">A themoviedb.org egy ingyenes és nyÃlt
filmadatbázis. Teljes egészében olyan felhasználók töltik fel, mint
például Te. A TMDb-t havonta emberek milliói használják és a hatékony
API-n keresztül számos népszerű média center is, mint például az XBMC a
filmadatok, poszterek, fanartképek letöltésére.</description>
<description lang="nl">Themoviedb.org is een vrije en open filmdatabank.
Gebruikers zoals jij vormen de motor van deze site. Op dit moment gebruiken
elke maand miljoenen mensen TMDb. De krachtige API van de site laat
mediacenters zoals XBMC toe om metadata, posters en fanart op te halen en zo de
gebruikerservaring te verrijken.</description>
<description lang="pl">themoviedb.org jest wolnÄ
i otwartÄ
filmowÄ
bazÄ
danych. Jest zarzÄ
dzana caÅkowicie przez osoby takie jak Ty. Obecnie
odwiedzajÄ
jÄ
miliony osób miesiÄcznie, a dziÄki dostÄpnoÅci API jest
używana w wielu media center, takich jak XBMC, do pobierania informacji o
filmach, plakatów i fanartów.</description>
<description lang="pt">O themoviedb.org é uma base de dados de filmes
livre e aberta. à completamente actualizado por pessoas como você e usado por
milhões todos os meses. Com o poderoso motor de busca disponÃvel, também se
tornou no favorito de muitos softwares média center, como o popular XBMC, para
obter informação, posters e fanart que enriquecem a experiência do
utilizador.</description>
<description lang="ro">themoviedb.org este o bazÄ de date de filme
gratuitÄ Èi deschisÄ. Este actualizatÄ de oameni ca Èi tine. TMDb este
curent folositÄ de milioane de oameni în fiecare lunÄ Èi datoritÄ API-ului
puternic, este de asemena folositÄ de multe centre media populare ca XBMC
pentru a obÈine informaÈii despre filme, afiÈe Èi imagini produse de fani
(Fanart) care îmbogÄÈesc experienÈa utilizatorului.</description>
<description lang="ru">themoviedb.org ÑÑо беÑплаÑÐ½Ð°Ñ Ð¸
оÑкÑÑÑÐ°Ñ Ð±Ð°Ð·Ð° даннÑÑ
ÑилÑмов. Ðна
полноÑÑÑÑ Ð¿Ð¾Ð´Ð´ÐµÑживаеÑÑÑ Ñакими же лÑдÑми
как и ÑÑ. РданнÑй Ð¼Ð¾Ð¼ÐµÐ½Ñ TMDb иÑполÑзÑеÑÑÑ
миллионами лÑдей каждÑй меÑÑÑ, и, Ñ ÐµÐ³Ð¾
моÑнÑм API, иÑполÑзÑеÑÑÑ ÑазлиÑнÑми
попÑлÑÑнÑми медиа-ÑенÑÑами, Ñакими как XBMC,
Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ Ðº ФилÑмам меÑа-даннÑÑ
,
поÑÑеÑов и ÑанаÑÑа в ÑелÑÑ
ÑлÑÑÑениÑ
полÑзоваÑелÑÑкого опÑÑа.</description>
- <description lang="se">themoviedb.org är en fri och öppen filmdatabas.
Det drivs helt av människor som dig. TMDb används av miljontals människor
varje månad och med deras kraftfulla API, är det också använt av många
populära mediacenter som XBMC för att hämta filmmetadata, omslag och fanart
för att förgylla användarens upplevelse.</description>
<description
lang="zh">themoviedb.orgæ¯ä¸ä¸ªå¼æ¾åèªç±ççµå½±æ°æ®åºãå®å®å
¨ç±è±¡ä½ ä¸æ ·çç¨æ·æ¥ææ§ãTMDbæ¯æ为ä¸ç¾ä¸ç¨æ·æä¾æå¡ï¼å¹¶éè¿å¼ºå¤§çAPIçé¢ä¸ºè®¸å¤æµè¡çåªä½ä¸å¿ç³»ç»å¦XBMCæä¾çµå½±èµæãå°é¢æµ·æ¥åå人ç»ä»¥ä¸°å¯ç¨æ·çä½éªã</description>
<platform>all</platform>
</extension>
diff --git a/metadata.themoviedb.org/changelog.txt
b/metadata.themoviedb.org/changelog.txt
index dfe20b4..4ee2158 100644
--- a/metadata.themoviedb.org/changelog.txt
+++ b/metadata.themoviedb.org/changelog.txt
@@ -1,106 +1,109 @@
-[B]2.0.1[/B]
-- fixed: imdb url nfo not resolving tmdb id
-
-[B]2.0.0[/B]
-- complete rewrite to use the json api
-
-[B]1.4.5[/B]
-- added: support for IMDb.xx support for NFO scraping
-
-[B]1.4.4[/B]
-- fixed: actor thumb scraping was broken due to API changes
-
-[B]1.4.3[/B]
-- fixed: use imdb ID from nfo
-- changed: scrape only one studio
-
-[B]1.4.2[/B]
-- fixed: url/mixed nfo scraping
-
-[B]1.4.1[/B]
-- fixed: IMDb rating after site change
-
-[B]1.4.0[/B]
-- added: trailer scraping from TMDB via youtube plugin
-
-[B]1.3.1[/B]
-- fixed: added year to search string properly
-
-[B]1.3.0[/B]
-- added: year to search string
-
-[B]1.2.5[/B]
-- fixed: mpaa is returning string 'Rated' if there is no rating on tmdb
-
-[B]1.2.4[/B]
-- fixed: not scraping artwork for movies without IMDb id
-
-[B]1.2.3[/B]
-- fixed: can't get full search results list when some have <released> message
and some haven't
-
-[B]1.2.2[/B]
-- fixed: real fix for hd-trailers.net
-
-[B]1.2.1[/B]
-- fixed: trailer scraping from hd-trailers.net
-
-[B]1.2.0[/B]
-- Added option to scrape rating from IMDb
-
-[B]1.1.6[/B]
-- Fix rating images to show up on default skins
-
-[B]1.1.5[/B]
-- Fix decimal separator
-
-[B]1.1.4[/B]
-- Support for <alternative_name> and <original_name> in searches
-
-[B]1.1.3[/B]
-- fixed missing imdb id (#2)
-
-[B]1.1.2[/B]
-- fixed missing imdb id
-
-[B]1.1.1[/B]
-- no writers due to API changes
-
-[B]1.1.0[/B]
-- added multi-language support
-
-[B]1.0.11[/B]
-- added Polish translation
-
-[B]1.0.9[/B]
-- translation cosmetics
-
-[B]1.0.8[/B]
-- changed hdtrailers.net version dependency
-
-[B]1.0.7[/B]
-- final fix for nfourl scraping issue
-
-[B]1.0.6[/B]
-- fixed nfourl scraping issue
-
-[B]1.0.5[/B]
-- switch tmdb scraper to chain tmdb scraper library functions
-
-[B]1.0.4[/B]
-- replace dtrailer.com with HD-Trailers.net for trailer scraping
-
-[B]1.0.3[/B]
-- scraper library interfaces changed. no functional changes
-
-[B]1.0.2[/B]
-
-- scraper might fetch wrong studio, genre and country values
-- no search results in case the release date is missing
-
-[B]1.0.1[/B]
-
-- various fixes after api change
-
-[B]1.0.0[/B]
-
-- Initial import into addons repository
+[B]3.0.0[/B]
+- major rewrite: utilize TMDb API v3, scraping set information, prioritize
posters on the selected language
+
+[B]2.0.1[/B]
+- fixed: imdb url nfo not resolving tmdb id
+
+[B]2.0.0[/B]
+- complete rewrite to use the json api
+
+[B]1.4.5[/B]
+- added: support for IMDb.xx support for NFO scraping
+
+[B]1.4.4[/B]
+- fixed: actor thumb scraping was broken due to API changes
+
+[B]1.4.3[/B]
+- fixed: use imdb ID from nfo
+- changed: scrape only one studio
+
+[B]1.4.2[/B]
+- fixed: url/mixed nfo scraping
+
+[B]1.4.1[/B]
+- fixed: IMDb rating after site change
+
+[B]1.4.0[/B]
+- added: trailer scraping from TMDB via youtube plugin
+
+[B]1.3.1[/B]
+- fixed: added year to search string properly
+
+[B]1.3.0[/B]
+- added: year to search string
+
+[B]1.2.5[/B]
+- fixed: mpaa is returning string 'Rated' if there is no rating on tmdb
+
+[B]1.2.4[/B]
+- fixed: not scraping artwork for movies without IMDb id
+
+[B]1.2.3[/B]
+- fixed: can't get full search results list when some have <released> message
and some haven't
+
+[B]1.2.2[/B]
+- fixed: real fix for hd-trailers.net
+
+[B]1.2.1[/B]
+- fixed: trailer scraping from hd-trailers.net
+
+[B]1.2.0[/B]
+- Added option to scrape rating from IMDb
+
+[B]1.1.6[/B]
+- Fix rating images to show up on default skins
+
+[B]1.1.5[/B]
+- Fix decimal separator
+
+[B]1.1.4[/B]
+- Support for <alternative_name> and <original_name> in searches
+
+[B]1.1.3[/B]
+- fixed missing imdb id (#2)
+
+[B]1.1.2[/B]
+- fixed missing imdb id
+
+[B]1.1.1[/B]
+- no writers due to API changes
+
+[B]1.1.0[/B]
+- added multi-language support
+
+[B]1.0.11[/B]
+- added Polish translation
+
+[B]1.0.9[/B]
+- translation cosmetics
+
+[B]1.0.8[/B]
+- changed hdtrailers.net version dependency
+
+[B]1.0.7[/B]
+- final fix for nfourl scraping issue
+
+[B]1.0.6[/B]
+- fixed nfourl scraping issue
+
+[B]1.0.5[/B]
+- switch tmdb scraper to chain tmdb scraper library functions
+
+[B]1.0.4[/B]
+- replace dtrailer.com with HD-Trailers.net for trailer scraping
+
+[B]1.0.3[/B]
+- scraper library interfaces changed. no functional changes
+
+[B]1.0.2[/B]
+
+- scraper might fetch wrong studio, genre and country values
+- no search results in case the release date is missing
+
+[B]1.0.1[/B]
+
+- various fixes after api change
+
+[B]1.0.0[/B]
+
+- Initial import into addons repository
diff --git a/metadata.themoviedb.org/resources/language/English/strings.xml
b/metadata.themoviedb.org/resources/language/English/strings.xml
index 664a610..d61eda0 100644
--- a/metadata.themoviedb.org/resources/language/English/strings.xml
+++ b/metadata.themoviedb.org/resources/language/English/strings.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<strings>
<string id="30000">Enable Fanart</string>
- <string id="30004">Enable Trailer</string>
+ <string id="30004">Enable Trailer (YouTube)</string>
<string id="30001">Prefer Trailer from HD-Trailers.net</string>
<string id="30002">Preferred language</string>
- <string id="30003">Get rating from IMDb</string>
+ <string id="30003">Get rating from</string>
<string id="30005">Keep Original Title</string>
</strings>
diff --git a/metadata.themoviedb.org/resources/language/German/strings.xml
b/metadata.themoviedb.org/resources/language/German/strings.xml
index 091b7cd..eac6640 100644
--- a/metadata.themoviedb.org/resources/language/German/strings.xml
+++ b/metadata.themoviedb.org/resources/language/German/strings.xml
@@ -4,6 +4,4 @@
<string id="30001">Aktiviere Trailer von HD-Trailers.net</string>
<string id="30002">Bevorzugte Sprache</string>
<string id="30003">Bewertung von IMDb nutzen</string>
- <string id="30004">Aktiviere Trailer</string>
- <string id="30005">Behalte original Filmtitel bei</string>
</strings>
diff --git a/metadata.themoviedb.org/resources/language/Hungarian/strings.xml
b/metadata.themoviedb.org/resources/language/Hungarian/strings.xml
index 8d2eb32..d5e3f07 100644
--- a/metadata.themoviedb.org/resources/language/Hungarian/strings.xml
+++ b/metadata.themoviedb.org/resources/language/Hungarian/strings.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<strings>
<string id="30000">Fanartképek engedélyezése</string>
- <string id="30004">FilmelÅzetesek engedélyezése</string>
+ <string id="30004">FilmelÅzetesek engedélyezése (YouTube)</string>
<string id="30001">FilmelÅzetesek inkább a HD-Trailers.net-rÅl</string>
<string id="30002">Preferált nyelv</string>
- <string id="30003">Ãrtékelés az IMDb-rÅl</string>
+ <string id="30003">Ãrtékelés letöltése innen</string>
<string id="30005">Eredeti filmcÃm megtartása</string>
</strings>
diff --git a/metadata.themoviedb.org/resources/language/Swedish/strings.xml
b/metadata.themoviedb.org/resources/language/Swedish/strings.xml
index 5ad3990..a781158 100644
--- a/metadata.themoviedb.org/resources/language/Swedish/strings.xml
+++ b/metadata.themoviedb.org/resources/language/Swedish/strings.xml
@@ -2,13 +2,10 @@
<!--Language file translated with Team XBMC Translator-->
<!--Translator: blittan-->
<!--Email: [email protected]>
-<!--Date of translation: 12/26/2011-->
+<!--Date of translation: 09/11/2010-->
<!--$Revision$-->
<strings>
<string id="30000">Aktivera fanart</string>
<string id="30001">Aktivera trailers från HD-Trailers.net</string>
<string id="30002">Föredraget språk</string>
- <string id="30003">Hämta betyg från IMDb</string>
- <string id="30004">Aktivera trailers</string>
- <string id="30005">Behåll originaltitel</string>
</strings>
\ No newline at end of file
diff --git a/metadata.themoviedb.org/resources/settings.xml
b/metadata.themoviedb.org/resources/settings.xml
index 31ba842..d711325 100644
--- a/metadata.themoviedb.org/resources/settings.xml
+++ b/metadata.themoviedb.org/resources/settings.xml
@@ -5,5 +5,5 @@
<setting label="30004" type="bool" id="trailer" default="true"/>
<setting label="30001" type="labelenum" values="No|480p|720p|1080p"
id="TrailerQ" default="No"/>
<setting label="30002" type="labelenum"
values="da|fi|nl|de|it|es|fr|pl|hu|el|tr|ru|he|ja|pt|zh|cs|sl|hr|ko|en|sv|no"
id="language" default="en"/>
- <setting label="30003" type="bool" id="imdbrating" default="false"/>
+ <setting label="30003" type="labelenum" values="TMDb|IMDb" id="RatingS"
default="TMDb"/>
</settings>
diff --git a/metadata.themoviedb.org/tmdb.xml b/metadata.themoviedb.org/tmdb.xml
index baba466..8efd089 100644
--- a/metadata.themoviedb.org/tmdb.xml
+++ b/metadata.themoviedb.org/tmdb.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.1" date="2010-10-11">
+<scraper framework="1.1" date="2012-01-16">
<CreateSearchUrl dest="3">
- <RegExp input="$$1"
output="<url>http://api.themoviedb.org/2.1/Movie.search/$INFO[language]/json/57983e31fb435df4df77afb854740ea9/\1$$4</url>";
dest="3">
+ <RegExp input="$$1"
output="<url>http://api.themoviedb.org/3/search/movie?api_key=57983e31fb435df4df77afb854740ea9&query=\1$$4&language=$INFO[language]</url>";
dest="3">
<RegExp input="$$2" output="+\1" dest="4">
<expression clear="yes">(.+)</expression>
</RegExp>
@@ -9,31 +9,28 @@
</RegExp>
</CreateSearchUrl>
<NfoUrl dest="3">
- <RegExp input="$$1"
output="<details><url>http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/json/57983e31fb435df4df77afb854740ea9/\2</url><id>\2</id></details>";
dest="3">
+ <RegExp input="$$1"
output="<details><url>http://api.themoviedb.org/3/movie/\2?api_key=57983e31fb435df4df77afb854740ea9&$INFO[language]</url><id>\2</id></details>";
dest="3">
<expression clear="yes"
noclean="1">(themoviedb.org/movie/)([0-9]*)</expression>
</RegExp>
- <RegExp input="$$1" output="<details><url
function="GetTMDBId">http://api.themoviedb.org/2.1/Movie.imdbLookup/$INFO[language]/json/57983e31fb435df4df77afb854740ea9/tt\1</url></details>";
dest="3+">
+ <RegExp input="$$1"
output="<details><url>http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&$INFO[language]</url><id>\1</id></details>";
dest="3">
<expression>imdb....?/title/tt([0-9]*)</expression>
</RegExp>
- <RegExp input="$$1" output="<details><url
function="GetTMDBId">http://api.themoviedb.org/2.1/Movie.imdbLookup/$INFO[language]/json/57983e31fb435df4df77afb854740ea9/tt\1</url></details>";
dest="3+">
+ <RegExp input="$$1"
output="<details><url>http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&$INFO[language]</url><id>\1</id></details>";
dest="3">
<expression>imdb....?/Title\?([0-9]*)</expression>
</RegExp>
</NfoUrl>
<GetTMDBId dest="3">
- <RegExp input="$$1" output="<details><url
cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/json/57983e31fb435df4df77afb854740ea9/\1</url><id>\1</id></details>";
dest="3+">
+ <RegExp input="$$1" output="<details><url
cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[language]</url><id>\1</id></details>";
dest="3+">
<expression>"movie","id":([0-9]*),</expression>
</RegExp>
</GetTMDBId>
<GetSearchResults dest="8">
<RegExp input="$$3" output="<results>\1</results>"
dest="8">
- <RegExp input="$$1"
output="<entity><title>\1</title><id>\2</id><year>\3</year><url
cache="tmdb-$INFO[language]-\2.json">http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/json/57983e31fb435df4df77afb854740ea9/\2</url></entity>";
dest="3">
- <expression
repeat="yes">"name":"([^"]*).*?"id":([^,]*).*?"released":"([0-9]*)</expression>
+ <RegExp input="$$1"
output="<entity><title>\4</title><id>\1</id><year>\3</year><url
cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[language]</url></entity>";
dest="3">
+ <expression
repeat="yes">"id":([0-9]*),"original_title":"([^"]*)","release_date":"([0-9]+)-.*?"title":"([^"]*)</expression>
</RegExp>
- <RegExp input="$$1"
output="<entity><title>\1</title><id>\2</id><year>\3</year><url
cache="tmdb-$INFO[language]-\2.json">http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/json/57983e31fb435df4df77afb854740ea9/\2</url></entity>";
dest="3+">
- <expression
repeat="yes">"original_name":"([^"]*).*?"id":([^,]*).*?"released":"([0-9]*)</expression>
- </RegExp>
- <RegExp input="$$1"
output="<entity><title>\1</title><id>\2</id><year>\3</year><url
cache="tmdb-$INFO[language]-\2.json">http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/json/57983e31fb435df4df77afb854740ea9/\2</url></entity>";
dest="3+">
- <expression
repeat="yes">"alternative_name":"([^"]*).*?"id":([^,]*).*?"released":"([0-9]*)</expression>
+ <RegExp input="$$1"
output="<entity><title>\2</title><id>\1</id><year>\3</year><url
cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[language]</url></entity>";
dest="3+">
+ <expression
repeat="yes">"id":([0-9]*),"original_title":"([^"]*)","release_date":"([0-9]+)-</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -41,54 +38,81 @@
<GetDetails dest="3">
<RegExp input="$$5" output="<details>\1</details>"
dest="3">
<RegExp input="$$1" output="<id>\1</id>"
dest="5">
- <expression
noclean="1">"movie","id":([0-9]*),</expression>
+ <expression
noclean="1">"id":([0-9]*),"imdb</expression>
</RegExp>
<RegExp input="$$1" output="<id>\1</id>"
dest="5+">
- <expression clear="yes"
noclean="1">"movie","id":[0-9]*,"imdb_id":"([^"]*)</expression>
+ <expression clear="yes"
noclean="1">"id":[0-9]*,"imdb_id":"([^"]*)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="9">
+ <expression
fixchars="1">"original_title":"([^"]*)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="10">
+ <expression
fixchars="1">"title":"([^"]*)</expression>
+ </RegExp>
+ <RegExp input="$$10" output="<url
function="ParseFallbackTMDBTitle"
cache="tmdb-en-$$2.json">http://api.themoviedb.org/3/movie/$$2?api_key=57983e31fb435df4df77afb854740ea9&language=en</url>";
dest="5+">
+ <expression>^$</expression>
</RegExp>
- <RegExp conditional="keeporiginaltitle" input="$$1"
output="<title>\1</title>" dest="5+">
- <expression
fixchars="1">"original_name":"([^"]*)</expression>
+ <RegExp input="$$10"
output="<title>\1</title>" dest="5+">
+ <expression>(.+)</expression>
</RegExp>
- <RegExp input="$$1"
output="<title>\1</title>" dest="5+">
- <expression
fixchars="1">"name":"([^"]*)</expression>
+ <RegExp conditional="keeporiginaltitle" input="$$9"
output="<title>\1</title>" dest="5+">
+ <expression/>
</RegExp>
- <RegExp input="$$1"
output="<originaltitle>\1</originaltitle>" dest="5+">
- <expression
fixchars="1">"original_name":"([^"]*)</expression>
+ <RegExp input="$$9"
output="<originaltitle>\1</originaltitle>" dest="5+">
+ <expression/>
</RegExp>
<RegExp input="$$1"
output="<year>\1</year>" dest="5+">
- <expression
noclean="1">"released":"([0-9]+)-</expression>
+ <expression
noclean="1">"release_date":"([0-9]+)-</expression>
</RegExp>
- <RegExp input="$$1"
output="<runtime>\1</runtime>" dest="5+">
- <expression
noclean="1">"runtime":([0-9]+)</expression>
+ <RegExp input="$$1" output="\1" dest="10">
+ <expression clear="yes"
noclean="1">"runtime":([0-9]+)</expression>
</RegExp>
- <RegExp input="$$1"
output="<tagline>\1</tagline>" dest="5+">
- <expression
fixchars="1">"tagline":"([^"]*)</expression>
+ <RegExp input="$$10" output="<url
function="ParseFallbackTMDBRuntime"
cache="tmdb-en-$$2.json">http://api.themoviedb.org/3/movie/$$2?api_key=57983e31fb435df4df77afb854740ea9&language=en</url>";
dest="5+">
+ <expression>^$</expression>
</RegExp>
- <RegExp input="$$1" output="\1" dest="6">
-
<expression>"certification":"([^"]*)</expression>
+ <RegExp input="$$10"
output="<runtime>\1</runtime>" dest="5+">
+ <expression>(.+)</expression>
</RegExp>
- <RegExp input="$$6" output="<mpaa>Rated
\1</mpaa>" dest="5+">
+ <RegExp input="$$1" output="\1" dest="10">
+ <expression clear="yes"
fixchars="1">"tagline":"([^"]*)</expression>
+ </RegExp>
+ <RegExp input="$$10" output="<url
function="ParseFallbackTMDBTagline"
cache="tmdb-en-$$2.json">http://api.themoviedb.org/3/movie/$$2?api_key=57983e31fb435df4df77afb854740ea9&language=en</url>";
dest="5+">
+ <expression>^$</expression>
+ </RegExp>
+ <RegExp input="$$10"
output="<tagline>\1</tagline>" dest="5+">
<expression>(.+)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="7">
- <expression clear="yes"
noclean="1">"studios":\[([^\]]*)</expression>
+ <expression clear="yes"
noclean="1">"production_companies":\[([^\]]*)</expression>
</RegExp>
<RegExp input="$$7"
output="<studio>\1</studio>" dest="5+">
<expression trim="1"
fixchars="1">"name":"([^"]*)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="7">
- <expression clear="yes"
noclean="1">"countries":\[([^\]]*)</expression>
+ <expression clear="yes"
noclean="1">"production_countries":\[([^\]]*)</expression>
</RegExp>
<RegExp input="$$7"
output="<country>\1</country>" dest="5+">
<expression trim="1"
fixchars="1">"name":"([^"]*)</expression>
</RegExp>
- <RegExp input="$$1"
output="<director>\1</director>" dest="5+">
- <expression repeat="yes"
fixchars="1">"name":"([^"]*)","job":"Director"</expression>
+ <RegExp input="$INFO[RatingS]" output="<chain
function="GetIMDBRatingById">$$6</chain>" dest="5+">
+ <RegExp input="$$1" output="\1" dest="6">
+ <expression
noclean="1">"id":[0-9]*,"imdb_id":"([^"]*)</expression>
+ </RegExp>
+ <expression>IMDb</expression>
+ </RegExp>
+ <RegExp input="$INFO[RatingS]" output="<chain
function="GetTMDBRatingByIdChain">$$2</chain>" dest="5+">
+ <expression>TMDb</expression>
+ </RegExp>
+ <RegExp input="$$2" output="<chain
function="GetTMDBDirectorsByIdChain">$$2</chain>" dest="5+">
+ <expression />
+ </RegExp>
+ <RegExp input="$$2" output="<chain
function="GetTMDBWitersByIdChain">$$2</chain>" dest="5+">
+ <expression />
</RegExp>
- <RegExp input="$$1"
output="<credits>\1</credits>" dest="5+">
- <expression repeat="yes"
fixchars="1">"name":"([^"]*)","job":"[^"]*","department":"Writing"</expression>
+ <RegExp input="$$2" output="<chain
function="GetTMDBCertificationsByIdChain">$$2</chain>"
dest="5+">
+ <expression />
</RegExp>
- <RegExp conditional="!imdbrating" input="$$2"
output="<chain
function="GetTMDBRatingByIdChain">$$2</chain>" dest="5+">
+ <RegExp input="$$2" output="<chain
function="GetTMDBSetByIdChain">$$2</chain>" dest="5+">
<expression />
</RegExp>
<RegExp input="$$2" output="<chain
function="GetTMDBPlotByIdChain">$$2</chain>" dest="5+">
@@ -100,9 +124,6 @@
<RegExp input="$$2" output="<chain
function="GetTMDBGenresByIdChain">$$2</chain>" dest="5+">
<expression />
</RegExp>
- <RegExp conditional="imdbrating" input="$$1"
output="<chain function="GetIMDBRatingById">\1</chain>"
dest="5+">
- <expression
noclean="1">"movie","id":[0-9]*,"imdb_id":"([^"]*)</expression>
- </RegExp>
<RegExp input="$$2" output="<chain
function="GetTMDBThumbsByIdChain">$$2</chain>" dest="5+">
<expression />
</RegExp>
@@ -114,23 +135,47 @@
</RegExp>
<RegExp input="$INFO[TrailerQ]" output="<chain
function="GetHDTrailersnet480p">$$6</chain>" dest="5+">
<RegExp input="$$1" output="\1" dest="6">
- <expression
noclean="1">"original_name":"([^"]*)</expression>
+ <expression clear="yes"
noclean="1">"original_title":"([^"]*)</expression>
</RegExp>
<expression>480p</expression>
</RegExp>
<RegExp input="$INFO[TrailerQ]" output="<chain
function="GetHDTrailersnet720p">$$6</chain>" dest="5+">
<RegExp input="$$1" output="\1" dest="6">
- <expression
noclean="1">"original_name":"([^"]*)</expression>
+ <expression clear="yes"
noclean="1">"original_title":"([^"]*)</expression>
</RegExp>
<expression>720p</expression>
</RegExp>
<RegExp input="$INFO[TrailerQ]" output="<chain
function="GetHDTrailersnet1080p">$$6</chain>" dest="5+">
<RegExp input="$$1" output="\1" dest="6">
- <expression
noclean="1">"original_name":"([^"]*)</expression>
+ <expression clear="yes"
noclean="1">"original_title":"([^"]*)</expression>
</RegExp>
<expression>1080p</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
</GetDetails>
+ <ParseFallbackTMDBTitle dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1"
output="<title>\1</title>" dest="2">
+ <expression
fixchars="1">"title":"([^"]*)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseFallbackTMDBTitle>
+ <ParseFallbackTMDBRuntime dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1"
output="<runtime>\1</runtime>" dest="2">
+ <expression
noclean="1">"runtime":([0-9]+)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseFallbackTMDBRuntime>
+ <ParseFallbackTMDBTagline dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1"
output="<tagline>\1</tagline>" dest="2">
+ <expression
fixchars="1">"tagline":"([^"]*)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseFallbackTMDBTagline>
</scraper>
-----------------------------------------------------------------------
Summary of changes:
metadata.common.themoviedb.org/addon.xml | 6 +-
metadata.common.themoviedb.org/tmdb.xml | 216 +++++++++++++++-----
metadata.themoviedb.org/addon.xml | 16 +-
metadata.themoviedb.org/changelog.txt | 215 ++++++++++----------
.../resources/language/English/strings.xml | 4 +-
.../resources/language/German/strings.xml | 2 -
.../resources/language/Hungarian/strings.xml | 4 +-
.../resources/language/Swedish/strings.xml | 5 +-
metadata.themoviedb.org/resources/settings.xml | 2 +-
metadata.themoviedb.org/tmdb.xml | 129 ++++++++----
10 files changed, 368 insertions(+), 231 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
