The branch, dharma-pre has been updated
via 2356592e4bce53f7dcad1f55729c73cbdc32ddf2 (commit)
from ae8d0df90be47ba9ba48f22a0ebbe2a8b264144a (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=2356592e4bce53f7dcad1f55729c73cbdc32ddf2
commit 2356592e4bce53f7dcad1f55729c73cbdc32ddf2
Author: olympia <[email protected]>
Date: Mon Oct 11 20:52:17 2010 +0200
[metadata.themoviedb.org] Change EOL
diff --git a/metadata.themoviedb.org/tmdb.xml b/metadata.themoviedb.org/tmdb.xml
index eb5fa96..dbd9de3 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="2010-09-11">
- <CreateSearchUrl dest="3">
- <RegExp input="$$1"
output="<url>http://api.themoviedb.org/2.1/Movie.search/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/\1</url>"
dest="3">
- <RegExp input="$$2" output="%20(\1)" dest="4">
- <expression clear="yes">(.+)</expression>
- </RegExp>
- <expression noclean="1"/>
- </RegExp>
- </CreateSearchUrl>
- <NfoUrl dest="3">
- <RegExp input="$$1"
output="<url>http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/\2</url><id>\2</id>"
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\2</url></details>"
dest="3+">
- <expression>(imdb.com/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\2</url></details>"
dest="3+">
- <expression>(imdb.com/)Title\?([0-9]+)</expression>
- </RegExp>
- </NfoUrl>
- <GetTMDBId dest="3">
- <RegExp input="$$1" output="<url
cache="tmdb-$INFO[language]-\1.xml">http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/\1</url><id>\1</id>"
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>
- <RegExp input="$$1"
output="<entity><title>\1</title><id>\2</id><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></released>.*?</movie></expression>
- </RegExp>
- <RegExp input="$$1"
output="<entity><title>\1</title><id>\2</id><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></released>.*?</movie></expression>
- </RegExp>
- <RegExp input="$$1"
output="<entity><title>\1</title><id>\2</id><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></released>.*?</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 input="$$1"
output="<rating>\1</rating>" dest="5+">
- <expression
noclean="1"><rating>([^<]*)</rating></expression>
- </RegExp>
- <RegExp 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="<mpaa>Rated
\1</mpaa>" dest="5+">
-
<expression><certification>([^<]*)</certification></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" repeat="yes"><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://\4-original\5</thumb></actor>"
dest="5+">
- <expression noclean="1"
repeat="yes"><person.*?name="([^"]*)"
character="([^"]*)" job="Actor"
id="([0-9]+)"
thumb="http://(.*?)-thumb([^"]*)"</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 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>
- <expression noclean="1"/>
- </RegExp>
- </GetDetails>
-</scraper>
+<?xml version="1.0" encoding="UTF-8"?>
+<scraper framework="1.1" date="2010-09-11">
+ <CreateSearchUrl dest="3">
+ <RegExp input="$$1"
output="<url>http://api.themoviedb.org/2.1/Movie.search/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/\1</url>"
dest="3">
+ <RegExp input="$$2" output="%20(\1)" dest="4">
+ <expression clear="yes">(.+)</expression>
+ </RegExp>
+ <expression noclean="1"/>
+ </RegExp>
+ </CreateSearchUrl>
+ <NfoUrl dest="3">
+ <RegExp input="$$1"
output="<url>http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/\2</url><id>\2</id>"
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\2</url></details>"
dest="3+">
+ <expression>(imdb.com/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\2</url></details>"
dest="3+">
+ <expression>(imdb.com/)Title\?([0-9]+)</expression>
+ </RegExp>
+ </NfoUrl>
+ <GetTMDBId dest="3">
+ <RegExp input="$$1" output="<url
cache="tmdb-$INFO[language]-\1.xml">http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/\1</url><id>\1</id>"
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>
+ <RegExp input="$$1"
output="<entity><title>\1</title><id>\2</id><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></released>.*?</movie></expression>
+ </RegExp>
+ <RegExp input="$$1"
output="<entity><title>\1</title><id>\2</id><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></released>.*?</movie></expression>
+ </RegExp>
+ <RegExp input="$$1"
output="<entity><title>\1</title><id>\2</id><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></released>.*?</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 input="$$1"
output="<rating>\1</rating>" dest="5+">
+ <expression
noclean="1"><rating>([^<]*)</rating></expression>
+ </RegExp>
+ <RegExp 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="<mpaa>Rated
\1</mpaa>" dest="5+">
+
<expression><certification>([^<]*)</certification></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" repeat="yes"><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://\4-original\5</thumb></actor>"
dest="5+">
+ <expression noclean="1"
repeat="yes"><person.*?name="([^"]*)"
character="([^"]*)" job="Actor"
id="([0-9]+)"
thumb="http://(.*?)-thumb([^"]*)"</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 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>
+ <expression noclean="1"/>
+ </RegExp>
+ </GetDetails>
+</scraper>
-----------------------------------------------------------------------
Summary of changes:
metadata.themoviedb.org/tmdb.xml | 272 +++++++++++++++++++-------------------
1 files changed, 136 insertions(+), 136 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons