The branch, eden-pre has been updated
via 0f69ffe0ff861b8c14a53de28396347c713a503b (commit)
from d06dafb0912f4350484381dd21a70d559b5fb2e4 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=0f69ffe0ff861b8c14a53de28396347c713a503b
commit 0f69ffe0ff861b8c14a53de28396347c713a503b
Author: olympia <[email protected]>
Date: Mon Dec 5 21:06:13 2011 +0100
[metadata.themoviedb.org] updated to version 2.0.0
diff --git a/metadata.common.themoviedb.org/addon.xml
b/metadata.common.themoviedb.org/addon.xml
index 196449f..2ffc075 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="1.1.0"
+ version="2.0.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 c9b775b..1e9ac72 100644
--- a/metadata.common.themoviedb.org/tmdb.xml
+++ b/metadata.common.themoviedb.org/tmdb.xml
@@ -1,88 +1,164 @@
<scraperfunctions>
+ <GetTMDBPlotByIdChain 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>
+ <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>
+ </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>
+ <RegExp input="$$1"
output="<outline>\1</outline>" dest="2+">
+ <expression
fixchars="1">"overview":"(.{180,}?)[.?!]</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseTMDBPlot>
+ <GetTMDBCastByIdChain 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>
+ <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>
+ </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>
+ <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>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseTMDBCast>
+ <GetTMDBGenresByIdChain 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>
+ <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>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GetTMDBGenresByIdChain>
+ <ParseTMDBGenres dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression
noclean="1">"genres":\[([^\]]*)</expression>
+ </RegExp>
+ <RegExp input="$$7"
output="<genre>\1</genre>" dest="2">
+ <expression repeat="yes"
fixchars="1">"name":"([^"]*)</expression>
+ </RegExp>
+ <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>
+ <expression noclean="1" />
+ </RegExp>
+ </GetTMDBRatingByIdChain>
+ <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>
+ </RegExp>
+ <RegExp input="$$1"
output="<votes>\1</votes>" dest="2+">
+ <expression
noclean="1">"votes":([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.xml">http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/\1</url>";
dest="5">
+ <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">
<expression>^([0-9]+)$</expression>
</RegExp>
- <expression noclean="1"/>
+ <expression noclean="1" />
</RegExp>
</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=([^<]*)</trailer></expression>
+ <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>
<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.xml">http://api.themoviedb.org/2.1/Movie.getImages/en/xml/57983e31fb435df4df77afb854740ea9/tt\1</url>";
dest="5">
+ <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.xml">http://api.themoviedb.org/2.1/Movie.getImages/en/xml/57983e31fb435df4df77afb854740ea9/\1</url>";
dest="5">
+ <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>
- <expression noclean="1"/>
+ <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.xml">http://api.themoviedb.org/2.1/Movie.getImages/en/xml/57983e31fb435df4df77afb854740ea9/tt\1</url>";
dest="5">
+ <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.xml">http://api.themoviedb.org/2.1/Movie.getImages/en/xml/57983e31fb435df4df77afb854740ea9/\1</url>";
dest="5">
+ <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>
- <expression noclean="1"/>
+ <expression noclean="1" />
</RegExp>
</GetTMDBFanartById>
<ParseTMDBFanart dest="5">
<RegExp input="$$2"
output="<details><fanart>\1</fanart></details>"
dest="5">
- <RegExp input="$$1"
output="<thumb>\1</thumb>" dest="3">
- <expression noclean="1"
repeat="yes"><backdrop[^>]*>(.*?)</backdrop></expression>
- </RegExp>
- <RegExp input="$$3" output="<thumb
preview="\2">\1\3</thumb>" dest="4">
- <expression noclean="1,3"
repeat="yes"><thumb>(.*?)url="([^"]*)"
size="poster"(.*?)</thumb></expression>
- </RegExp>
- <RegExp input="$$4"
output="<thumb\1>\2</thumb>" dest="2">
- <expression repeat="yes"
noclean="1"><thumb([^>]*)>.*?url="([^"]*)"
size="original".*?</thumb></expression>
+ <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>
<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.xml">http://api.themoviedb.org/2.1/Movie.getImages/en/xml/57983e31fb435df4df77afb854740ea9/tt\1</url>";
dest="5">
+ <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.xml">http://api.themoviedb.org/2.1/Movie.getImages/en/xml/57983e31fb435df4df77afb854740ea9/\1</url>";
dest="5">
+ <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>
- <expression noclean="1"/>
+ <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.xml">http://api.themoviedb.org/2.1/Movie.getImages/en/xml/57983e31fb435df4df77afb854740ea9/tt\1</url>";
dest="5">
+ <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.xml">http://api.themoviedb.org/2.1/Movie.getImages/en/xml/57983e31fb435df4df77afb854740ea9/\1</url>";
dest="5">
+ <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>
- <expression noclean="1"/>
+ <expression noclean="1" />
</RegExp>
</GetTMDBThumbsById>
<ParseTMDBThumbs dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1"
output="<thumb>\1</thumb>" dest="3">
- <expression noclean="1"
repeat="yes"><poster[^>]*>(.*?)</poster></expression>
- </RegExp>
- <RegExp input="$$3" output="<thumb
preview="\2">\1\3</thumb>" dest="4">
- <expression noclean="1,3"
repeat="yes"><thumb>(.*?)url="([^"]*)"
size="mid"(.*?)</thumb></expression>
- </RegExp>
- <RegExp input="$$4"
output="<thumb\1>\2</thumb>" dest="2">
- <expression repeat="yes"
noclean="1"><thumb([^>]*)>.*?url="([^"]*)"
size="original".*?</thumb></expression>
+ <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>
<expression noclean="1">(.+)</expression>
</RegExp>
diff --git a/metadata.themoviedb.org/addon.xml
b/metadata.themoviedb.org/addon.xml
index dc9538c..8a31396 100644
--- a/metadata.themoviedb.org/addon.xml
+++ b/metadata.themoviedb.org/addon.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.themoviedb.org"
name="The MovieDB"
- version="1.4.5"
+ version="2.0.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
- <import addon="metadata.common.themoviedb.org" version="1.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"/>
@@ -18,7 +18,7 @@
<summary lang="de">Film-Scraper für TheMovieDB</summary>
<summary lang="es">Scraper de pelÃculas de TheMovieDB</summary>
<summary lang="hu">TMDB filmadat leolvasó</summary>
- <summary lang="nl">TMDb-filmscraper</summary> <!--Themoviedb.org
gebruikt zelf als afkorting TMDb en niet TMDB.-->
+ <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>
diff --git a/metadata.themoviedb.org/changelog.txt
b/metadata.themoviedb.org/changelog.txt
index 5c562d4..8352044 100644
--- a/metadata.themoviedb.org/changelog.txt
+++ b/metadata.themoviedb.org/changelog.txt
@@ -1,3 +1,6 @@
+[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
diff --git a/metadata.themoviedb.org/resources/language/English/strings.xml
b/metadata.themoviedb.org/resources/language/English/strings.xml
index 026e1dc..664a610 100644
--- a/metadata.themoviedb.org/resources/language/English/strings.xml
+++ b/metadata.themoviedb.org/resources/language/English/strings.xml
@@ -5,4 +5,5 @@
<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="30005">Keep Original Title</string>
</strings>
diff --git a/metadata.themoviedb.org/resources/language/Hungarian/strings.xml
b/metadata.themoviedb.org/resources/language/Hungarian/strings.xml
index ff8a1cd..8d2eb32 100644
--- a/metadata.themoviedb.org/resources/language/Hungarian/strings.xml
+++ b/metadata.themoviedb.org/resources/language/Hungarian/strings.xml
@@ -5,4 +5,5 @@
<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="30005">Eredeti filmcÃm megtartása</string>
</strings>
diff --git a/metadata.themoviedb.org/resources/settings.xml
b/metadata.themoviedb.org/resources/settings.xml
index 871115c..31ba842 100644
--- a/metadata.themoviedb.org/resources/settings.xml
+++ b/metadata.themoviedb.org/resources/settings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<settings>
+ <setting label="30005" type="bool" id="keeporiginaltitle" default="false"/>
<setting label="30000" type="bool" id="fanart" default="true"/>
<setting label="30004" type="bool" id="trailer" default="true"/>
<setting label="30001" type="labelenum" values="No|480p|720p|1080p"
id="TrailerQ" default="No"/>
diff --git a/metadata.themoviedb.org/tmdb.xml b/metadata.themoviedb.org/tmdb.xml
index a93cb05..692fed4 100644
--- a/metadata.themoviedb.org/tmdb.xml
+++ b/metadata.themoviedb.org/tmdb.xml
@@ -1,136 +1,136 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.1" date="2011-04-25">
- <CreateSearchUrl dest="3">
- <RegExp input="$$1"
output="<url>http://api.themoviedb.org/2.1/Movie.search/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/\1$$4</url>";
dest="3">
- <RegExp input="$$2" output="+\1" dest="4">
- <expression clear="yes">(.+)</expression>
- </RegExp>
- <expression noclean="1"/>
- </RegExp>
- </CreateSearchUrl>
- <NfoUrl dest="3">
- <RegExp input="$$1"
output="<details><url>http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/\2</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]/xml/57983e31fb435df4df77afb854740ea9/tt\1</url></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]/xml/57983e31fb435df4df77afb854740ea9/tt\1</url></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.xml">http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/\1</url><id>\1</id></details>";
dest="3+">
- <expression><id>([0-9]*)</id></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.xml">http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/\2</url></entity>";
dest="3">
- <expression
repeat="yes"><movie>.*?<name>([^<]*)</name>.*?<id>([^<]*)</id>.*?<released>([0-9]*).*?</movie></expression>
- </RegExp>
- <RegExp input="$$1"
output="<entity><title>\1</title><id>\2</id><year>\3</year><url
cache="tmdb-$INFO[language]-\2.xml">http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/\2</url></entity>";
dest="3+">
- <expression
repeat="yes"><movie>.*?<original_name>([^<]*)</original_name>.*?<id>([^<]*)</id>.*?<released>([0-9]*).*?</movie></expression>
- </RegExp>
- <RegExp input="$$1"
output="<entity><title>\1</title><id>\2</id><year>\3</year><url
cache="tmdb-$INFO[language]-\2.xml">http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/\2</url></entity>";
dest="3+">
- <expression
repeat="yes"><movie>.*?<alternative_name>([^<]*)</alternative_name>.*?<id>([^<]*)</id>.*?<released>([0-9]*).*?</movie></expression>
- </RegExp>
- <expression noclean="1"/>
- </RegExp>
- </GetSearchResults>
- <GetDetails dest="3">
- <RegExp input="$$5" output="<details>\1</details>"
dest="3">
- <RegExp input="$$1" output="<id>\1</id>"
dest="5">
- <expression
noclean="1"><id>([^<]*)</id></expression>
- </RegExp>
- <RegExp input="$$1" output="<id>\1</id>"
dest="5+">
- <expression clear="yes"
noclean="1"><imdb_id>([^<]*)</imdb_id></expression>
- </RegExp>
- <RegExp input="$$1"
output="<title>\1</title>" dest="5+">
- <expression
noclean="1"><name>([^<]*)</name></expression>
- </RegExp>
- <RegExp input="$$1"
output="<originaltitle>\1</originaltitle>" dest="5+">
- <expression
noclean="1"><original_name>([^<]*)</original_name></expression>
- </RegExp>
- <RegExp input="$$1"
output="<year>\1</year>" dest="5+">
- <expression
noclean="1"><released>([0-9]+)-</expression>
- </RegExp>
- <RegExp input="$$1"
output="<runtime>\1</runtime>" dest="5+">
- <expression
noclean="1"><runtime>([^<]*)</runtime></expression>
- </RegExp>
- <RegExp conditional="!imdbrating" input="$$1"
output="<rating>\1</rating>" dest="5+">
- <expression
noclean="1"><rating>([^<]*)</rating></expression>
- </RegExp>
- <RegExp conditional="!imdbrating" input="$$1"
output="<votes>\1</votes>" dest="5+">
- <expression
noclean="1"><votes>([^<]*)</votes></expression>
- </RegExp>
- <RegExp input="$$1"
output="<tagline>\1</tagline>" dest="5+">
- <expression
noclean="1"><tagline>([^<]*)</tagline></expression>
- </RegExp>
- <RegExp input="$$1" output="\1" dest="6">
-
<expression><certification>([^<]*)</certification></expression>
- </RegExp>
- <RegExp input="$$6" output="<mpaa>Rated
\1</mpaa>" dest="5+">
- <expression>(.+)</expression>
- </RegExp>
- <RegExp input="$$1"
output="<genre>\1</genre>" dest="5+">
- <expression noclean="1"
repeat="yes"><category type="genre"
name="([^"]*)"</expression>
- </RegExp>
- <RegExp input="$$1"
output="<studio>\1</studio>" dest="5+">
- <expression noclean="1"><studio
name="([^"]*)"</expression>
- </RegExp>
- <RegExp input="$$1"
output="<country>\1</country>" dest="5+">
- <expression noclean="1"
repeat="yes"><country name="([^"]*)"</expression>
- </RegExp>
- <RegExp input="$$1"
output="<plot>\1</plot>" dest="5+">
- <expression
noclean="1"><overview>([^<]*)</overview></expression>
- </RegExp>
- <RegExp input="$$1"
output="<overview>\1</overview>" dest="5+">
- <expression
noclean="1"><overview>([^<]*)</overview></expression>
- </RegExp>
- <RegExp input="$$1"
output="<director>\1</director>" dest="5+">
- <expression noclean="1"
repeat="yes"><person.*?name="([^"]*)" character=""
job="Director"</expression>
- </RegExp>
- <RegExp input="$$1"
output="<credits>\1</credits>" dest="5+">
- <expression noclean="1"
repeat="yes"><person.*?name="([^"]*)" character=""
job="Screenplay"</expression>
- </RegExp>
- <RegExp input="$$1"
output="<actor><name>\1</name><role>\2</role></actor>"
dest="5+">
- <expression noclean="1"
repeat="yes"><person.*?name="([^"]*)"
character="([^"]*)" job="Actor"</expression>
- </RegExp>
- <RegExp input="$$1"
output="<actor><name>\1</name><role>\2</role><thumb>http://\4original\5</thumb></actor>";
dest="5+">
- <expression noclean="1"
repeat="yes"><person.*?name="([^"]*)"
character="([^"]*)" job="Actor"
id="([0-9]+)"
thumb="http://(.*?)w45([^"]*)"</expression>
- </RegExp>
- <RegExp input="$$2" output="<chain
function="GetTMDBThumbsByIdChain">$$2</chain>" dest="5+">
- <expression/>
- </RegExp>
- <RegExp conditional="fanart" input="$$2"
output="<chain
function="GetTMDBFanartByIdChain">$$2</chain>" dest="5+">
- <expression/>
- </RegExp>
- <RegExp conditional="trailer" input="$$2"
output="<chain
function="GetTMDBTrailerByIdChain">$$2</chain>" dest="5+">
- <expression/>
- </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>([^<]*)</original_name></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>([^<]*)</original_name></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>([^<]*)</original_name></expression>
- </RegExp>
- <expression>1080p</expression>
- </RegExp>
- <RegExp conditional="imdbrating" input="$$1"
output="<chain function="GetIMDBRatingById">\1</chain>"
dest="5+">
- <expression
noclean="1"><imdb_id>([^<]*)</imdb_id></expression>
- </RegExp>
- <expression noclean="1"/>
- </RegExp>
- </GetDetails>
-</scraper>
+<?xml version="1.0" encoding="UTF-8"?>
+<scraper framework="1.1" date="2010-10-11">
+ <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="$$2" output="+\1" dest="4">
+ <expression clear="yes">(.+)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </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">
+ <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+">
+ <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+">
+ <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+">
+ <expression><id>([0-9]*)</id></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>
+ <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>
+ <expression noclean="1" />
+ </RegExp>
+ </GetSearchResults>
+ <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>
+ </RegExp>
+ <RegExp input="$$1" output="<id>\1</id>"
dest="5+">
+ <expression clear="yes"
noclean="1">"movie","id":[0-9]*,"imdb_id":"([^"]*)</expression>
+ </RegExp>
+ <RegExp conditional="keeporiginaltitle" input="$$1"
output="<title>\1</title>" dest="5+">
+ <expression
fixchars="1">"original_name":"([^"]*)</expression>
+ </RegExp>
+ <RegExp input="$$1"
output="<title>\1</title>" dest="5+">
+ <expression
fixchars="1">"name":"([^"]*)</expression>
+ </RegExp>
+ <RegExp input="$$1"
output="<originaltitle>\1</originaltitle>" dest="5+">
+ <expression
fixchars="1">"original_name":"([^"]*)</expression>
+ </RegExp>
+ <RegExp input="$$1"
output="<year>\1</year>" dest="5+">
+ <expression
noclean="1">"released":"([0-9]+)-</expression>
+ </RegExp>
+ <RegExp input="$$1"
output="<runtime>\1</runtime>" dest="5+">
+ <expression
noclean="1">"runtime":([0-9]+)</expression>
+ </RegExp>
+ <RegExp input="$$1"
output="<tagline>\1</tagline>" dest="5+">
+ <expression
fixchars="1">"tagline":"([^"]*)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="6">
+
<expression>"certification":"([^"]*)</expression>
+ </RegExp>
+ <RegExp input="$$6" output="<mpaa>Rated
\1</mpaa>" dest="5+">
+ <expression>(.+)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression clear="yes"
noclean="1">"studios":\[([^\]]*)</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>
+ </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>
+ <RegExp input="$$1"
output="<credits>\1</credits>" dest="5+">
+ <expression repeat="yes"
fixchars="1">"name":"([^"]*)","job":"[^"]*","department":"Writing"</expression>
+ </RegExp>
+ <RegExp conditional="!imdbrating" input="$$2"
output="<chain
function="GetTMDBRatingByIdChain">$$2</chain>" dest="5+">
+ <expression />
+ </RegExp>
+ <RegExp input="$$2" output="<chain
function="GetTMDBPlotByIdChain">$$2</chain>" dest="5+">
+ <expression />
+ </RegExp>
+ <RegExp input="$$2" output="<chain
function="GetTMDBCastByIdChain">$$2</chain>" dest="5+">
+ <expression />
+ </RegExp>
+ <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>
+ <RegExp conditional="fanart" input="$$2"
output="<chain
function="GetTMDBFanartByIdChain">$$2</chain>" dest="5+">
+ <expression />
+ </RegExp>
+ <RegExp conditional="trailer" input="$$2"
output="<chain
function="GetTMDBTrailerByIdChain">$$2</chain>" dest="5+">
+ <expression />
+ </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>
+ </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>
+ </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>
+ </RegExp>
+ <expression>1080p</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GetDetails>
+</scraper>
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
metadata.common.themoviedb.org/addon.xml | 2 +-
metadata.common.themoviedb.org/tmdb.xml | 140 ++++++++---
metadata.themoviedb.org/addon.xml | 6 +-
metadata.themoviedb.org/changelog.txt | 3 +
.../resources/language/English/strings.xml | 1 +
.../resources/language/Hungarian/strings.xml | 1 +
metadata.themoviedb.org/resources/settings.xml | 1 +
metadata.themoviedb.org/tmdb.xml | 272 ++++++++++----------
8 files changed, 254 insertions(+), 172 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
