From: <ar...@us...> - 2010-08-24 11:41:28
|
Revision: 30559 http://xbmc4xbox.svn.sourceforge.net/xbmc4xbox/?rev=30559&view=rev Author: arnova Date: 2010-08-24 11:41:19 +0000 (Tue, 24 Aug 2010) Log Message: ----------- updated: TheMovieDB (tmdb) scraper Modified Paths: -------------- trunk/system/scrapers/video/tmdb.xml Modified: trunk/system/scrapers/video/tmdb.xml =================================================================== --- trunk/system/scrapers/video/tmdb.xml 2010-08-23 16:57:56 UTC (rev 30558) +++ trunk/system/scrapers/video/tmdb.xml 2010-08-24 11:41:19 UTC (rev 30559) @@ -14,7 +14,7 @@ </RegExp> </GetSettings> <CreateSearchUrl dest="3"> - <RegExp input="$$1" output="<url>http://api.themoviedb.org/2.1/Movie.search/en/xml/57983e31fb435df4df77afb854740ea9/\1</url>" 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> @@ -22,27 +22,27 @@ </RegExp> </CreateSearchUrl> <NfoUrl dest="3"> - <RegExp input="$$1" output="<url>http://api.themoviedb.org/2.1/Movie.getInfo/en/xml/57983e31fb435df4df77afb854740ea9/\2</url><id>\2</id>" 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="<url function="GetTMDBId">http://api.themoviedb.org/2.1/Movie.imdbLookup/en/xml/57983e31fb435df4df77afb854740ea9/tt\2</url>" dest="3+"> + <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="<url function="GetTMDBId">http://api.themoviedb.org/2.1/Movie.imdbLookup/en/xml/57983e31fb435df4df77afb854740ea9/tt\2</url>" dest="3+"> + <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-\1.xml">http://api.themoviedb.org/2.1/Movie.getInfo/en/xml/57983e31fb435df4df77afb854740ea9/\1</url><id>\1</id>" 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-\2.xml">http://api.themoviedb.org/2.1/Movie.getInfo/en/xml/57983e31fb435df4df77afb854740ea9/\2</url></entity>" dest="3"> + <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><url cache="tmdb-\2.xml">http://api.themoviedb.org/2.1/Movie.getInfo/en/xml/57983e31fb435df4df77afb854740ea9/\2</url></entity>" dest="3+"> + <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> <expression noclean="1"/> @@ -50,9 +50,18 @@ </GetSearchResults> <GetDetails dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> - <RegExp input="$$1" output="<title>\1</title>" dest="5"> + <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> @@ -62,6 +71,9 @@ <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> @@ -87,7 +99,7 @@ <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="Author"</expression> + <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> @@ -95,10 +107,10 @@ <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="$$1" output="<url cache="tmdb-$$2.xml" function="GetTMDBThumbsById">$$3</url>" dest="5+"> + <RegExp input="$$2" output="<chain function="GetTMDBThumbsByIdChain">$$2</chain>" dest="5+"> <expression/> </RegExp> - <RegExp conditional="fanart" input="$$1" output="<url cache="tmdb-$$2.xml" function="GetTMDBFanartById">$$3</url>" dest="5+"> + <RegExp conditional="fanart" input="$$2" output="<chain function="GetTMDBFanartByIdChain">$$2</chain>" dest="5+"> <expression/> </RegExp> <RegExp conditional="dtrailer" input="$$6" output="<url function="GetDTrailerLink">http://en.dtrailer.com/movies/search/\1</url>" dest="5+"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |