diff options
| author | Martijn Kaijser <mcm.kaijser@gmail.com> | 2014-06-07 09:01:39 +0200 |
|---|---|---|
| committer | Martijn Kaijser <mcm.kaijser@gmail.com> | 2014-06-07 09:01:39 +0200 |
| commit | 9cc00f663f911ee947adb6069c48ebc66c0f5314 (patch) | |
| tree | 4dc77e2e3e918acfcc742c5484c305fcba12f4db /addons/metadata.common.themoviedb.org | |
| parent | 02a0b39b755fe22551faeb00676d7cb800dbb6e6 (diff) | |
[add-ons] sync add-ons with repo
Diffstat (limited to 'addons/metadata.common.themoviedb.org')
| -rw-r--r-- | addons/metadata.common.themoviedb.org/addon.xml | 2 | ||||
| -rw-r--r-- | addons/metadata.common.themoviedb.org/tmdb.xml | 158 |
2 files changed, 101 insertions, 59 deletions
diff --git a/addons/metadata.common.themoviedb.org/addon.xml b/addons/metadata.common.themoviedb.org/addon.xml index bd879c3330..55f6e5ba4c 100644 --- a/addons/metadata.common.themoviedb.org/addon.xml +++ b/addons/metadata.common.themoviedb.org/addon.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.common.themoviedb.org" name="The Movie Database Scraper Library" - version="2.9.4" + version="2.12.1" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="2.1.0"/> diff --git a/addons/metadata.common.themoviedb.org/tmdb.xml b/addons/metadata.common.themoviedb.org/tmdb.xml index 65b207a8ec..dec77f5dbb 100644 --- a/addons/metadata.common.themoviedb.org/tmdb.xml +++ b/addons/metadata.common.themoviedb.org/tmdb.xml @@ -1,8 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> <scraperfunctions> <GetTMDBCertificationsByIdChain dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBCertifications" cache="tmdb-cert-\1.json">http://api.themoviedb.org/3/movie/\1/releases?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbcertcountry]</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBCertifications" cache="tmdb-cert-\1.json">http://api.tmdb.org/3/movie/\1/releases?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbcertcountry]</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -19,7 +20,7 @@ <GetTMDBTitleByIdChain dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBTitle" cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBTitle" cache="tmdb-$INFO[language]-\1.json">http://api.tmdb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -27,7 +28,7 @@ </GetTMDBTitleByIdChain> <GetTMDBLangTitleByIdChain dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBTitle" cache="tmdb-$INFO[tmdbtitlelanguage]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbtitlelanguage]</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBTitle" cache="tmdb-$INFO[tmdbtitlelanguage]-\1.json">http://api.tmdb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbtitlelanguage]</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -47,7 +48,7 @@ <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&amp;language=$INFO[language]</url>" dest="5"> + <RegExp input="$$8" output="<url function="ParseTMDBPlot" cache="tmdb-$INFO[language]-\1.json">http://api.tmdb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -58,7 +59,7 @@ <RegExp input="$$1" output="\1" dest="8"> <expression clear="yes" noclean="1" /> </RegExp> - <RegExp input="$$8" output="<url function="ParseTMDBPlot" cache="tmdb-$INFO[tmdbplotlanguage]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbplotlanguage]</url>" dest="5"> + <RegExp input="$$8" output="<url function="ParseTMDBPlot" cache="tmdb-$INFO[tmdbplotlanguage]-\1.json">http://api.tmdb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbplotlanguage]</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -69,7 +70,7 @@ <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&amp;language=en</url>" dest="2"> + <RegExp input="$$9" output="<url function="ParseFallbackTMDBPlot" cache="tmdb-en-$$8.json">http://api.tmdb.org/3/movie/$$8?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>" dest="2"> <expression>^$</expression> </RegExp> <RegExp input="$$9" output="<plot>\1</plot>" dest="2"> @@ -92,7 +93,7 @@ <RegExp input="$$1" output="\1" dest="8"> <expression clear="yes" noclean="1" /> </RegExp> - <RegExp input="$$8" output="<url function="ParseTMDBTagline" cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>" dest="5"> + <RegExp input="$$8" output="<url function="ParseTMDBTagline" cache="tmdb-$INFO[language]-\1.json">http://api.tmdb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -103,7 +104,7 @@ <RegExp input="$$1" output="\1" dest="8"> <expression clear="yes" noclean="1" /> </RegExp> - <RegExp input="$$8" output="<url function="ParseTMDBTagline" cache="tmdb-$INFO[tmdbtaglinelanguage]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbtaglinelanguage]</url>" dest="5"> + <RegExp input="$$8" output="<url function="ParseTMDBTagline" cache="tmdb-$INFO[tmdbtaglinelanguage]-\1.json">http://api.tmdb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbtaglinelanguage]</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -114,7 +115,7 @@ <RegExp input="$$1" output="\1" dest="9"> <expression clear="yes" fixchars="1">"tagline":"([^"]*)</expression> </RegExp> - <RegExp input="$$9" output="<url function="ParseFallbackTMDBTagline" cache="tmdb-en-$$8.json">http://api.themoviedb.org/3/movie/$$8?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>" dest="2"> + <RegExp input="$$9" output="<url function="ParseFallbackTMDBTagline" cache="tmdb-en-$$8.json">http://api.tmdb.org/3/movie/$$8?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>" dest="2"> <expression>^$</expression> </RegExp> <RegExp input="$$9" output="<tagline>\1</tagline>" dest="2"> @@ -132,12 +133,32 @@ </RegExp> </ParseFallbackTMDBTagline> + <GetTMDBTagsByIdChain clearbuffers="no" dest="4"> + <RegExp input="$$5" output="<details>\1</details>" dest="4"> + <RegExp input="$$1" output="\1" dest="8"> + <expression clear="yes" noclean="1" /> + </RegExp> + <RegExp input="$$8" output="<url function="ParseTMDBTags" >http://api.tmdb.org/3/movie/\1/keywords?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5"> + <expression /> + </RegExp> + <expression noclean="1" /> + </RegExp> + </GetTMDBTagsByIdChain> + <ParseTMDBTags dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="<tag>\1</tag>" dest="2"> + <expression repeat="yes" noclean="1">\{"id":[0-9]+,"name":"([^"]*)</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseTMDBTags> + <GetTMDBSetByIdChain clearbuffers="no" dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> <RegExp input="$$1" output="\1" dest="8"> <expression clear="yes" noclean="1" /> </RegExp> - <RegExp input="$$8" output="<url function="ParseTMDBSet" cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>" dest="5"> + <RegExp input="$$8" output="<url function="ParseTMDBSet" cache="tmdb-$INFO[language]-\1.json">http://api.tmdb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -148,7 +169,7 @@ <RegExp input="$$1" output="\1" dest="8"> <expression clear="yes" noclean="1" /> </RegExp> - <RegExp input="$$8" output="<url function="ParseTMDBSet" cache="tmdb-$INFO[tmdbsetlanguage]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbsetlanguage]</url>" dest="5"> + <RegExp input="$$8" output="<url function="ParseTMDBSet" cache="tmdb-$INFO[tmdbsetlanguage]-\1.json">http://api.tmdb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbsetlanguage]</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -159,7 +180,7 @@ <RegExp input="$$1" output="\1" dest="9"> <expression noclean="1">"belongs_to_collection":\{"id":[0-9]+,"name":"([^"]*)</expression> </RegExp> - <RegExp input="$$9" output="<url function="ParseFallbackTMDBSet" cache="tmdb-en-$$8.json">http://api.themoviedb.org/3/movie/$$8?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>" dest="2"> + <RegExp input="$$9" output="<url function="ParseFallbackTMDBSet" cache="tmdb-en-$$8.json">http://api.tmdb.org/3/movie/$$8?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>" dest="2"> <expression>^$</expression> </RegExp> <RegExp input="$$9" output="<set>\1</set>" dest="2"> @@ -179,7 +200,10 @@ <GetTMDBCastByIdChain dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBCast" cache="tmdb-cast-\1.json">http://api.themoviedb.org/3/movie/\1/casts?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBBaseImageURL" cache="tmdb-config.json">http://api.tmdb.org/3/configuration?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5"> + <expression /> + </RegExp> + <RegExp input="$$1" output="<url function="ParseTMDBCast" cache="tmdb-cast-\1.json">http://api.tmdb.org/3/movie/\1/casts?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5+"> <expression /> </RegExp> <expression noclean="1" /> @@ -190,11 +214,11 @@ <RegExp input="$$1" output="\1" dest="7"> <expression clear="yes" noclean="1">"cast":\[([^\]]*)</expression> </RegExp> - <RegExp input="$$7" output="<actor><name>\1</name><role>\2</role><order>\3</order><thumb>http://cf2.imgobject.com/t/p/original\4</thumb></actor>" dest="2"> - <expression repeat="yes" fixchars="1">"name":"([^"]*)","character":"([^"]*)","order":([0-9]*),"cast_id":[0-9]*,"profile_path":"([^"]*)"</expression> + <RegExp input="$$7" output="<actor><name>\2</name><role>\1</role><order>\3</order><thumb>$$20original\4</thumb></actor>" dest="2"> + <expression repeat="yes" fixchars="1,2">"character":"((?:[^"]|(?<=\\)")*)","credit_id":"[^"]*","id":[0-9]*,"name":"([^"]*)","order":([0-9]*),"profile_path":"([^"]*)"</expression> </RegExp> - <RegExp input="$$7" output="<actor><name>\1</name><role>\2</role><order>\3</order></actor>" dest="2+"> - <expression repeat="yes" fixchars="1">"name":"([^"]*)","character":"([^"]*)","order":([0-9]*),"cast_id":[0-9]*,"profile_path":null</expression> + <RegExp input="$$7" output="<actor><name>\2</name><role>\1</role><order>\3</order></actor>" dest="2+"> + <expression repeat="yes" fixchars="1,2">"character":"((?:[^"]|(?<=\\)")*)","credit_id":"[^"]*","id":[0-9]*,"name":"([^"]*)","order":([0-9]*),"profile_path":null</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -202,7 +226,7 @@ <GetTMDBDirectorsByIdChain dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <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"> + <RegExp input="$$1" output="<url function="ParseTMDBDirectors" cache="tmdb-cast-\1.json">http://api.tmdb.org/3/movie/\1/casts?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -214,7 +238,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> + <expression repeat="yes" fixchars="1">"department":"Directing","id":[0-9]*,"job":"Director","name":"([^"]*)"</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -222,7 +246,7 @@ <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"> + <RegExp input="$$1" output="<url function="ParseTMDBWriters" cache="tmdb-cast-\1.json">http://api.tmdb.org/3/movie/\1/casts?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -234,7 +258,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> + <expression repeat="yes" fixchars="1">"department":"Writing","id":[0-9]*,"job":"(?:Screenplay|Writer|Author)?","name":"([^"]*)"</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -242,7 +266,7 @@ <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&amp;language=$INFO[language]</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBGenres" cache="tmdb-$INFO[language]-\1.json">http://api.tmdb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -250,7 +274,7 @@ </GetTMDBGenresByIdChain> <GetTMDBLangGenresByIdChain dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBGenres" cache="tmdb-$INFO[tmdbgenreslanguage]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbgenreslanguage]</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBGenres" cache="tmdb-$INFO[tmdbgenreslanguage]-\1.json">http://api.tmdb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbgenreslanguage]</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -270,7 +294,7 @@ <GetTMDBRatingByIdChain dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBRating" cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBRating" cache="tmdb-$INFO[language]-\1.json">http://api.tmdb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -290,7 +314,7 @@ <GetTMDBStudioByIdChain dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBStudio" cache="tmdb-en-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBStudio" cache="tmdb-en-\1.json">http://api.tmdb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -310,7 +334,7 @@ <GetTMDBCountryByIdChain dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBCountry" cache="tmdb-en-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBCountry" cache="tmdb-en-\1.json">http://api.tmdb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -330,7 +354,7 @@ <GetTMDBTrailerByIdChain dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <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&amp;language=$INFO[language]</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBTrailer" cache="tmdb-trailer-$INFO[language]-\1.json">http://api.tmdb.org/3/movie/\1/trailers?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -338,7 +362,7 @@ </GetTMDBTrailerByIdChain> <GetTMDBLangTrailerByIdChain dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBTrailer" cache="tmdb-trailer-$INFO[tmdbtrailerlanguage]-\1.json">http://api.themoviedb.org/3/movie/\1/trailers?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbtrailerlanguage]</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBTrailer" cache="tmdb-trailer-$INFO[tmdbtrailerlanguage]-\1.json">http://api.tmdb.org/3/movie/\1/trailers?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbtrailerlanguage]</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -355,7 +379,7 @@ <RegExp input="$$7" output="<trailer>plugin://plugin.video.youtube/?action=play_video&amp;videoid=\1</trailer>" dest="9"> <expression noclean="1">"source":"([^"]*)</expression> </RegExp> - <RegExp input="$$9" output="<url function="ParseTMDBEnTrailer" cache="tmdb-trailer-en-$$8.json">http://api.themoviedb.org/3/movie/$$8/trailers?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>" dest="2"> + <RegExp input="$$9" output="<url function="ParseTMDBEnTrailer" cache="tmdb-trailer-en-$$8.json">http://api.tmdb.org/3/movie/$$8/trailers?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>" dest="2"> <expression>^$</expression> </RegExp> <RegExp input="$$9" output="$$9" dest="2"> @@ -375,7 +399,7 @@ <RegExp input="$$7" output="<trailer>plugin://plugin.video.youtube/?action=play_video&amp;videoid=\1</trailer>" dest="9"> <expression noclean="1">"source":"([^"]*)</expression> </RegExp> - <RegExp input="$$9" output="<url function="ParseTMDBAllTrailer" cache="tmdb-trailer-$$8.json">http://api.themoviedb.org/3/movie/$$8/trailers?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5"> + <RegExp input="$$9" output="<url function="ParseTMDBAllTrailer" cache="tmdb-trailer-$$8.json">http://api.tmdb.org/3/movie/$$8/trailers?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5"> <expression>^$</expression> </RegExp> <RegExp input="$$9" output="$$9" dest="2"> @@ -398,7 +422,10 @@ <GetTMDBFanartByIdChain dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBFanart" cache="tmdb-images-\1.json">http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBBaseImageURL" cache="tmdb-config.json">http://api.tmdb.org/3/configuration?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5"> + <expression /> + </RegExp> + <RegExp input="$$1" output="<url function="ParseTMDBFanart" cache="tmdb-images-\1.json">http://api.tmdb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5+"> <expression /> </RegExp> <expression noclean="1" /> @@ -409,8 +436,8 @@ <RegExp input="$$1" output="\1" dest="7"> <expression clear="yes" noclean="1">"backdrops":\[\{([^\]]*)</expression> </RegExp> - <RegExp input="$$7" output="<thumb preview="http://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 input="$$7" output="<thumb preview="$$20w780\1">$$20original\1</thumb>" dest="2"> + <expression clear="yes" repeat="yes" noclean="1">"file_path":"([^"]*)</expression> </RegExp> <expression noclean="1">(.+)</expression> </RegExp> @@ -418,7 +445,10 @@ <GetTMDBThumbsByIdChain dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBThumbs" cache="tmdb-images-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBBaseImageURL" cache="tmdb-config.json">http://api.tmdb.org/3/configuration?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5"> + <expression /> + </RegExp> + <RegExp input="$$1" output="<url function="ParseTMDBThumbs" cache="tmdb-images-$INFO[language]-\1.json">http://api.tmdb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>" dest="5+"> <expression /> </RegExp> <expression noclean="1" /> @@ -426,13 +456,16 @@ </GetTMDBThumbsByIdChain> <GetTMDBLangThumbsByIdChain dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBLangThumbs" cache="tmdb-images-$INFO[tmdbthumblanguage]-\1.json">http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbthumblanguage]</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBBaseImageURL" cache="tmdb-config.json">http://api.tmdb.org/3/configuration?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5"> + <expression /> + </RegExp> + <RegExp input="$$1" output="<url function="ParseTMDBLangThumbs" cache="tmdb-images-$INFO[tmdbthumblanguage]-\1.json">http://api.tmdb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbthumblanguage]</url>" dest="5+"> <expression /> </RegExp> <expression noclean="1" /> </RegExp> </GetTMDBLangThumbsByIdChain> - <ParseTMDBThumbs dest="5"> + <ParseTMDBThumbs clearbuffers="no" dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="\1" dest="8"> <expression noclean="1">"id":([0-9]*),</expression> @@ -440,25 +473,25 @@ <RegExp input="$$1" output="\1" dest="7"> <expression clear="yes" noclean="1">"posters":\[\{([^\]]*)</expression> </RegExp> - <RegExp input="$$7" output="<thumb aspect="poster" preview="http://cf2.imgobject.com/t/p/w500\1">http://cf2.imgobject.com/t/p/original\1</thumb>" dest="9"> - <expression repeat="yes" noclean="1">"file_path":"([^"]*)</expression> + <RegExp input="$$7" output="<thumb aspect="poster" preview="$$20w500\1">$$20original\1</thumb>" dest="9"> + <expression clear="yes" repeat="yes" noclean="1">"file_path":"([^"]*)</expression> + </RegExp> + <RegExp input="$$9" output="$$9" dest="2"> + <expression clear="yes">(.+)</expression> </RegExp> <RegExp input="$$9" output="$$12" dest="2+"> - <RegExp input="$INFO[language]" output="<url function="ParseTMDBAllThumbs" cache="tmdb-images-$$8.json">http://api.themoviedb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="12"> + <RegExp input="$INFO[language]" output="<url function="ParseTMDBAllThumbs" cache="tmdb-images-$$8.json">http://api.tmdb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="12"> <expression>en</expression> </RegExp> <expression>^$</expression> </RegExp> - <RegExp input="$$9" output="$$9" dest="2+"> - <expression>(.+)</expression> - </RegExp> - <RegExp input="$INFO[language]" output="<url function="ParseTMDBEnThumbs" cache="tmdb-images-en-$$8.json">http://api.themoviedb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>" dest="2+"> + <RegExp input="$INFO[language]" output="<url function="ParseTMDBEnThumbs" cache="tmdb-images-en-$$8.json">http://api.tmdb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>" dest="2+"> <expression>^((?!en).)*$</expression> </RegExp> <expression noclean="1">(.+)</expression> </RegExp> </ParseTMDBThumbs> - <ParseTMDBLangThumbs dest="5"> + <ParseTMDBLangThumbs clearbuffers="no" dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="\1" dest="8"> <expression noclean="1">"id":([0-9]*),</expression> @@ -466,25 +499,25 @@ <RegExp input="$$1" output="\1" dest="7"> <expression clear="yes" noclean="1">"posters":\[\{([^\]]*)</expression> </RegExp> - <RegExp input="$$7" output="<thumb aspect="poster" preview="http://cf2.imgobject.com/t/p/w500\1">http://cf2.imgobject.com/t/p/original\1</thumb>" dest="9"> - <expression repeat="yes" noclean="1">"file_path":"([^"]*)</expression> + <RegExp input="$$7" output="<thumb aspect="poster" preview="$$20w500\1">$$20original\1</thumb>" dest="9"> + <expression clear="yes" repeat="yes" noclean="1">"file_path":"([^"]*)</expression> + </RegExp> + <RegExp input="$$9" output="$$9" dest="2"> + <expression clear="yes">(.+)</expression> </RegExp> <RegExp input="$$9" output="$$12" dest="2+"> - <RegExp input="$INFO[tmdbthumblanguage]" output="<url function="ParseTMDBAllThumbs" cache="tmdb-images-$$8.json">http://api.themoviedb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="12"> + <RegExp input="$INFO[tmdbthumblanguage]" output="<url function="ParseTMDBAllThumbs" cache="tmdb-images-$$8.json">http://api.tmdb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="12"> <expression>en</expression> </RegExp> <expression>^$</expression> </RegExp> - <RegExp input="$$9" output="$$9" dest="2+"> - <expression>(.+)</expression> - </RegExp> - <RegExp input="$INFO[tmdbthumblanguage]" output="<url function="ParseTMDBEnThumbs" cache="tmdb-images-en-$$8.json">http://api.themoviedb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>" dest="2+"> + <RegExp input="$INFO[tmdbthumblanguage]" output="<url function="ParseTMDBEnThumbs" cache="tmdb-images-en-$$8.json">http://api.tmdb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>" dest="2+"> <expression>^((?!en).)*$</expression> </RegExp> <expression noclean="1">(.+)</expression> </RegExp> </ParseTMDBLangThumbs> - <ParseTMDBEnThumbs dest="5"> + <ParseTMDBEnThumbs clearbuffers="no" dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="\1" dest="8"> <expression noclean="1">"id":([0-9]*),</expression> @@ -492,14 +525,14 @@ <RegExp input="$$1" output="\1" dest="7"> <expression clear="yes" noclean="1">"posters":\[\{([^\]]*)</expression> </RegExp> - <RegExp input="$$7" output="<thumb aspect="poster" preview="http://cf2.imgobject.com/t/p/w500\1">http://cf2.imgobject.com/t/p/original\1</thumb>" dest="9"> + <RegExp input="$$7" output="<thumb aspect="poster" preview="$$20w500\1">$$20original\1</thumb>" dest="9"> <expression repeat="yes" noclean="1">"file_path":"([^"]*)</expression> </RegExp> - <RegExp input="$$9" output="<url function="ParseTMDBAllThumbs" cache="tmdb-images-$$8.json">http://api.themoviedb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="2"> - <expression>^$</expression> - </RegExp> <RegExp input="$$9" output="$$9" dest="2"> - <expression>(.+)</expression> + <expression clear="yes">(.+)</expression> + </RegExp> + <RegExp input="$$9" output="<url function="ParseTMDBAllThumbs" cache="tmdb-images-$$8.json">http://api.tmdb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="2"> + <expression>^$</expression> </RegExp> <expression noclean="1">(.+)</expression> </RegExp> @@ -509,11 +542,20 @@ <RegExp input="$$1" output="\1" dest="7"> <expression clear="yes" noclean="1">"posters":\[\{([^\]]*)</expression> </RegExp> - <RegExp input="$$7" output="<thumb aspect="poster" preview="http://cf2.imgobject.com/t/p/w500\1">http://cf2.imgobject.com/t/p/original\1</thumb>" dest="2"> + <RegExp input="$$7" output="<thumb aspect="poster" preview="$$20w500\1">$$20original\1</thumb>" dest="2"> <expression repeat="yes" noclean="1">"file_path":"([^"]*)</expression> </RegExp> <expression noclean="1">(.+)</expression> </RegExp> </ParseTMDBAllThumbs> + <ParseTMDBBaseImageURL clearbuffers="no" dest="4"> + <RegExp input="$$5" output="<details>$$20</details>" dest="4"> + <RegExp input="$$1" output="\1" dest="20"> + <expression>"images":\{"base_url":"([^"]*)"</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseTMDBBaseImageURL> + </scraperfunctions> |