diff options
Diffstat (limited to 'addons/metadata.common.themoviedb.org/tmdb.xml')
-rw-r--r-- | addons/metadata.common.themoviedb.org/tmdb.xml | 121 |
1 files changed, 65 insertions, 56 deletions
diff --git a/addons/metadata.common.themoviedb.org/tmdb.xml b/addons/metadata.common.themoviedb.org/tmdb.xml index 1429d41e01..484f10ce1f 100644 --- a/addons/metadata.common.themoviedb.org/tmdb.xml +++ b/addons/metadata.common.themoviedb.org/tmdb.xml @@ -9,7 +9,7 @@ <RegExp input="$$1" output="\1" dest="17"> <expression>.+::.+::(.+)?</expression> </RegExp> - <RegExp input="$$1" output="<url function="ParseTMDBCertifications" cache="tmdb-cert-\1.json">https://api.tmdb.org/3/movie/\1/releases?api_key=f090bb54758cabf231fb605d3e3e0468</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBCertifications" cache="tmdb-cert-\1.json">https://api.themoviedb.org/3/movie/\1/releases?api_key=f090bb54758cabf231fb605d3e3e0468</url>" dest="5"> <expression>(.+)::(.+)::(.+)?</expression> </RegExp> <expression noclean="1" /> @@ -32,11 +32,11 @@ <RegExp input="$$1" output="\1::\2" dest="16"> <expression>(.+)::(.+)</expression> </RegExp> - <RegExp input="$$1" output="<url function="ParseTMDBTitle" cache="tmdb-\2-\1.json">https://api.tmdb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=\2</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBTitle" cache="tmdb-\2-\1.json">https://api.themoviedb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=\2</url>" dest="5"> <expression>(.+)::(.+)</expression> </RegExp> <RegExp input="$$1" output="$$2" dest="5"> - <RegExp input="$$1" output="<url function="ParseTMDBTitle" cache="tmdb-en-\1.json">https://api.tmdb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=en</url>" dest="2"> + <RegExp input="$$1" output="<url function="ParseTMDBTitle" cache="tmdb-en-\1.json">https://api.themoviedb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=en</url>" dest="2"> <expression>(.+)::</expression> </RegExp> <expression>(.+)::Keep Original</expression> @@ -64,7 +64,7 @@ <RegExp input="$$1" output="\1" dest="8"> <expression encode="1">(.+)::.+</expression> </RegExp> - <RegExp input="$$1" output="<url function="ParseTMDBPlot" cache="tmdb-\2-\1.json">https://api.tmdb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=\2</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBPlot" cache="tmdb-\2-\1.json">https://api.themoviedb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=\2</url>" dest="5"> <expression>(.+)::(.+)</expression> </RegExp> <expression noclean="1" /> @@ -75,7 +75,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">https://api.tmdb.org/3/movie/$$8?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=en</url>" dest="2"> + <RegExp input="$$9" output="<url function="ParseFallbackTMDBPlot" cache="tmdb-en-$$8.json">https://api.themoviedb.org/3/movie/$$8?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=en</url>" dest="2"> <expression>^$</expression> </RegExp> <RegExp input="$$9" output="<plot>\1</plot>" dest="2"> @@ -98,7 +98,7 @@ <RegExp input="$$1" output="\1" dest="8"> <expression>(.+)::.+</expression> </RegExp> - <RegExp input="$$1" output="<url function="ParseTMDBTagline" cache="tmdb-\2-\1.json">https://api.tmdb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=\2</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBTagline" cache="tmdb-\2-\1.json">https://api.themoviedb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=\2</url>" dest="5"> <expression>(.+)::(.+)</expression> </RegExp> <expression noclean="1" /> @@ -109,7 +109,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">https://api.tmdb.org/3/movie/$$8?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=en</url>" dest="2"> + <RegExp input="$$9" output="<url function="ParseFallbackTMDBTagline" cache="tmdb-en-$$8.json">https://api.themoviedb.org/3/movie/$$8?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=en</url>" dest="2"> <expression>^$</expression> </RegExp> <RegExp input="$$9" output="<tagline>\1</tagline>" dest="2"> @@ -132,7 +132,7 @@ <RegExp input="$$1" output="\1" dest="8"> <expression clear="yes" noclean="1" /> </RegExp> - <RegExp input="$$8" output="<url function="ParseTMDBTags" >https://api.tmdb.org/3/movie/\1/keywords?api_key=f090bb54758cabf231fb605d3e3e0468</url>" dest="5"> + <RegExp input="$$8" output="<url function="ParseTMDBTags" >https://api.themoviedb.org/3/movie/\1/keywords?api_key=f090bb54758cabf231fb605d3e3e0468</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -155,7 +155,7 @@ <RegExp input="$$1" output="\2" dest="10"> <expression>(.+)::(.+)</expression> </RegExp> - <RegExp input="$$8" output="<url function="GetTMDBSetID" cache="tmdb-$$10-\1.json">https://api.tmdb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$$10</url>" dest="5"> + <RegExp input="$$8" output="<url function="GetTMDBSetID" cache="tmdb-$$10-\1.json">https://api.themoviedb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$$10</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -166,10 +166,10 @@ <RegExp input="$$1" output="\1" dest="9"> <expression clear="yes" noclean="1">"belongs_to_collection":\{"id":([0-9]+),"name":"([^"]*)</expression> </RegExp> - <RegExp input="$$9" output="<url function="ParseTMDBBaseImageURL" cache="tmdb-config.json">https://api.tmdb.org/3/configuration?api_key=f090bb54758cabf231fb605d3e3e0468</url>" dest="2"> + <RegExp input="$$9" output="<url function="ParseTMDBBaseImageURL" cache="tmdb-config.json">https://api.themoviedb.org/3/configuration?api_key=f090bb54758cabf231fb605d3e3e0468</url>" dest="2"> <expression>(.+)</expression> </RegExp> - <RegExp input="$$9" output="<url function="ParseTMDBSetOutline" cache="tmdbset-$$10-\1.json">https://api.tmdb.org/3/collection/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$$10&amp;append_to_response=images&amp;include_image_language=$$10,en,null</url>" dest="2+"> + <RegExp input="$$9" output="<url function="ParseTMDBSetOutline" cache="tmdbset-$$10-\1.json">https://api.themoviedb.org/3/collection/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$$10&amp;append_to_response=images&amp;include_image_language=$$10,en,null</url>" dest="2+"> <expression>(.+)</expression> </RegExp> <expression noclean="1" /> @@ -213,7 +213,7 @@ </RegExp> <expression noclean="1" /> </RegExp> - <RegExp input="$$9" output="<url function="ParseFallbackTMDBSetOutline" cache="tmdbset-en-$$6.json">https://api.tmdb.org/3/collection/$$6?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=en&amp;append_to_response=images&amp;include_image_language=$$10,en,null</url>" dest="2"> + <RegExp input="$$9" output="<url function="ParseFallbackTMDBSetOutline" cache="tmdbset-en-$$6.json">https://api.themoviedb.org/3/collection/$$6?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=en&amp;append_to_response=images&amp;include_image_language=$$10,en,null</url>" dest="2"> <expression>^$</expression> </RegExp> <expression noclean="1" /> @@ -251,10 +251,10 @@ <GetTMDBCastByIdChain dest="4"> <!-- Expected chaining format= tmdb_id--> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBBaseImageURL" cache="tmdb-config.json">https://api.tmdb.org/3/configuration?api_key=f090bb54758cabf231fb605d3e3e0468</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBBaseImageURL" cache="tmdb-config.json">https://api.themoviedb.org/3/configuration?api_key=f090bb54758cabf231fb605d3e3e0468</url>" dest="5"> <expression /> </RegExp> - <RegExp input="$$1" output="<url function="ParseTMDBCast" cache="tmdb-cast-\1.json">https://api.tmdb.org/3/movie/\1/casts?api_key=f090bb54758cabf231fb605d3e3e0468</url>" dest="5+"> + <RegExp input="$$1" output="<url function="ParseTMDBCast" cache="tmdb-cast-\1.json">https://api.themoviedb.org/3/movie/\1/casts?api_key=f090bb54758cabf231fb605d3e3e0468</url>" dest="5+"> <expression /> </RegExp> <expression noclean="1" /> @@ -265,11 +265,17 @@ <RegExp input="$$1" output="\1" dest="7"> <expression clear="yes" noclean="1">"cast":\[([^\]]*)</expression> </RegExp> - <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":"[^"]*","gender":[0-9]*,"id":[0-9]*,"name":"([^"]*)","order":([0-9]*),"profile_path":"([^"]*)"</expression> + <RegExp input="$$7" output="<actor><name>\2</name><role>\3</role><order>\4</order><thumb>$$20original\1</thumb></actor>" dest="2"> + <expression repeat="yes" fixchars="1,2">"known_for_department":"[^"]*","original_name":"[^"]*","popularity":[^"]*"profile_path":"([^"]*)","name":"([^"]*)","cast_id":[0-9]*,"character":"((?:[^"]|(?<=\\)")*)","credit_id":"[^"]*","order":([0-9]*)}</expression> </RegExp> - <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":"[^"]*","gender":[0-9]*,"id":[0-9]*,"name":"([^"]*)","order":([0-9]*),"profile_path":null</expression> + <RegExp input="$$7" output="<actor><name>\1</name><role>\2</role><order>\3</order></actor>" dest="2+"> + <expression repeat="yes" fixchars="1,2">"known_for_department":"[^"]*","original_name":"[^"]*","popularity":[^"]*"profile_path":null,"name":"([^"]*)","cast_id":[0-9]*,"character":"((?:[^"]|(?<=\\)")*)","credit_id":"[^"]*","order":([0-9]*)}</expression> + </RegExp> + <RegExp input="$$7" output="<actor><name>\1</name><role>\3</role><order>\4</order><thumb>$$20original\2</thumb></actor>" dest="2+"> + <expression repeat="yes" fixchars="1,2">"known_for_department":"[^"]*","name":"([^"]*)","original_name":"[^"]*","popularity":[^"]*"profile_path":"([^"]*)","cast_id":[0-9]*,"character":"((?:[^"]|(?<=\\)")*)","credit_id":"[^"]*","order":([0-9]*)}</expression> + </RegExp> + <RegExp input="$$7" output="<actor><name>\1</name><role>\2</role><order>\3</order></actor>" dest="2+"> + <expression repeat="yes" fixchars="1,2">"known_for_department":"[^"]*","name":"([^"]*)","original_name":"[^"]*","popularity":[^"]*"profile_path":null,"cast_id":[0-9]*,"character":"((?:[^"]|(?<=\\)")*)","credit_id":"[^"]*","order":([0-9]*)}</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -277,7 +283,7 @@ <GetTMDBDirectorsByIdChain dest="4"> <!-- Expected chaining format= tmdb_id--> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBDirectors" cache="tmdb-cast-\1.json">https://api.tmdb.org/3/movie/\1/casts?api_key=f090bb54758cabf231fb605d3e3e0468</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBDirectors" cache="tmdb-cast-\1.json">https://api.themoviedb.org/3/movie/\1/casts?api_key=f090bb54758cabf231fb605d3e3e0468</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -285,11 +291,8 @@ </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">"department":"Directing","gender":[0-9]*,"id":[0-9]*,"job":"Director","name":"([^"]*)"</expression> + <RegExp input="$$1" output="<director>\1</director>" dest="2"> + <expression repeat="yes" fixchars="1">"name":"([^"]*)"(?=[^\}]*?"Director")</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -297,7 +300,7 @@ <GetTMDBWitersByIdChain dest="4"> <!-- Expected chaining format= tmdb_id--> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBWriters" cache="tmdb-cast-\1.json">https://api.tmdb.org/3/movie/\1/casts?api_key=f090bb54758cabf231fb605d3e3e0468</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBWriters" cache="tmdb-cast-\1.json">https://api.themoviedb.org/3/movie/\1/casts?api_key=f090bb54758cabf231fb605d3e3e0468</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -305,11 +308,17 @@ </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 input="$$1" output="<credits>\1</credits>" dest="2"> + <expression repeat="yes" fixchars="1">"name":"([^"]*)"(?=[^\}]*?"Screenplay")</expression> + </RegExp> + <RegExp input="$$1" output="<credits>\1</credits>" dest="2+"> + <expression repeat="yes" fixchars="1">"name":"([^"]*)"(?=[^\}]*?"Writer")</expression> + </RegExp> + <RegExp input="$$1" output="<credits>\1</credits>" dest="2+"> + <expression repeat="yes" fixchars="1">"name":"([^"]*)"(?=[^\}]*?"Teleplay")</expression> </RegExp> - <RegExp input="$$7" output="<credits>\1</credits>" dest="2"> - <expression repeat="yes" fixchars="1">"department":"Writing","gender":[0-9]*,"id":[0-9]*,"job":"(?:Screenplay|Writer|Author)?","name":"([^"]*)"</expression> + <RegExp input="$$1" output="<credits>\1</credits>" dest="2+"> + <expression repeat="yes" fixchars="1">"name":"([^"]*)"(?=[^\}]*?"Novel")</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -317,7 +326,7 @@ <GetTMDBGenresByIdChain dest="4"> <!-- Expected chaining format= tmdb_id::language--> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBGenres" cache="tmdb-\2-\1.json">https://api.tmdb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=\2</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBGenres" cache="tmdb-\2-\1.json">https://api.themoviedb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=\2</url>" dest="5"> <expression>(.+)::(.+)</expression> </RegExp> <expression noclean="1" /> @@ -343,7 +352,7 @@ <RegExp input="$$1" output="\2" dest="11"> <expression>(.+)::([^\|]*)</expression> </RegExp> - <RegExp input="$$1" output="<url function="ParseTMDBRating" cache="tmdb-$$11-\1.json">https://api.tmdb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$$11</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBRating" cache="tmdb-$$11-\1.json">https://api.themoviedb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$$11</url>" dest="5"> <expression>^(.+)::</expression> </RegExp> <expression noclean="1" /> @@ -369,7 +378,7 @@ <RegExp input="$$1" output="\2" dest="11"> <expression>(.+)::([^\|]*)</expression> </RegExp> - <RegExp input="$$1" output="<url function="ParseTMDBRatings" cache="tmdb-$$11-\1.json">https://api.tmdb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$$11</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBRatings" cache="tmdb-$$11-\1.json">https://api.themoviedb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$$11</url>" dest="5"> <expression noclean="1">^((tt)?\d+)</expression> </RegExp> <RegExp input="$$1" output="default="true"" dest="3"> @@ -392,7 +401,7 @@ <GetTMDBStudioByIdChain dest="4"> <!-- Expected chaining format= tmdb_id::language_for_caching--> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBStudio" cache="tmdb-\2-\1.json">https://api.tmdb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=\2</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBStudio" cache="tmdb-\2-\1.json">https://api.themoviedb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=\2</url>" dest="5"> <expression>(.+)::(.+)</expression> </RegExp> <expression noclean="1" /> @@ -412,7 +421,7 @@ <GetTMDBCountryByIdChain dest="4"> <!-- Expected chaining format= tmdb_id::language_for_caching--> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBCountry" cache="tmdb-\2-\1.json">https://api.tmdb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=\2</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBCountry" cache="tmdb-\2-\1.json">https://api.themoviedb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=\2</url>" dest="5"> <expression>(.+)::(.+)</expression> </RegExp> <expression noclean="1" /> @@ -432,8 +441,8 @@ <GetTMDBTrailerByIdChain dest="4"> <!-- Expected chaining format= tmdb_id::language--> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBTrailer" cache="tmdb-trailer-\2-\1.json">https://api.tmdb.org/3/movie/\1/trailers?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=\2</url>" dest="5"> - <expression>(.+)::(.+)</expression> + <RegExp input="$$1" output="<url function="ParseTMDBTrailer" cache="tmdb-trailer-\2-\1.json">https://api.themoviedb.org/3/movie/\1/trailers?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=\2</url>" dest="5"> + <expression>(.+)::(..)</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -449,7 +458,7 @@ <RegExp input="$$7" output="<trailer>plugin://plugin.video.youtube/?action=play_video&amp;videoid=\1</trailer>" dest="9"> <expression noclean="1">"source":"([^"]*)","type":"Trailer"</expression> </RegExp> - <RegExp input="$$9" output="<url function="ParseTMDBEnTrailer" cache="tmdb-trailer-en-$$8.json">https://api.tmdb.org/3/movie/$$8/trailers?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=en</url>" dest="2"> + <RegExp input="$$9" output="<url function="ParseTMDBEnTrailer" cache="tmdb-trailer-en-$$8.json">https://api.themoviedb.org/3/movie/$$8/trailers?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=en</url>" dest="2"> <expression>^$</expression> </RegExp> <RegExp input="$$9" output="$$9" dest="2"> @@ -469,7 +478,7 @@ <RegExp input="$$7" output="<trailer>plugin://plugin.video.youtube/?action=play_video&amp;videoid=\1</trailer>" dest="9"> <expression noclean="1">"source":"([^"]*)","type":"Trailer"</expression> </RegExp> - <RegExp input="$$9" output="<url function="ParseTMDBAllTrailer" cache="tmdb-trailer-$$8.json">https://api.tmdb.org/3/movie/$$8/trailers?api_key=f090bb54758cabf231fb605d3e3e0468</url>" dest="2"> + <RegExp input="$$9" output="<url function="ParseTMDBAllTrailer" cache="tmdb-trailer-$$8.json">https://api.themoviedb.org/3/movie/$$8/trailers?api_key=f090bb54758cabf231fb605d3e3e0468</url>" dest="2"> <expression>^$</expression> </RegExp> <RegExp input="$$9" output="$$9" dest="2"> @@ -493,13 +502,13 @@ <GetTMDBFanartByIdChain dest="4"> <!-- Expected chaining format= tmdb_id::poster_language--> <RegExp input="$$5" output="<details>\1</details>" dest="4"> <RegExp input="$$1" output="\2" dest="11"> - <expression>(.+)::(.+)</expression> + <expression>(.+)::(..)</expression> </RegExp> - <RegExp input="$$1" output="<url function="ParseTMDBBaseImageURL" cache="tmdb-config.json">https://api.tmdb.org/3/configuration?api_key=f090bb54758cabf231fb605d3e3e0468</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBBaseImageURL" cache="tmdb-config.json">https://api.themoviedb.org/3/configuration?api_key=f090bb54758cabf231fb605d3e3e0468</url>" dest="5"> <expression /> </RegExp> - <RegExp input="$$1" output="<url function="ParseTMDBFanart" cache="tmdb-images-\1.json">https://api.tmdb.org/3/movie/\1/images?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$$11&amp;include_image_language=$$11,en,null</url>" dest="5+"> - <expression>(.+)::(.+)</expression> + <RegExp input="$$1" output="<url function="ParseTMDBFanart" cache="tmdb-images-\1.json">https://api.themoviedb.org/3/movie/\1/images?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$$11&amp;include_image_language=$$11,en,null</url>" dest="5+"> + <expression>(.+)::(..)</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -519,16 +528,16 @@ <GetTMDBLandscapeByIdChain clearbuffers="no" dest="4"> <!-- Expected chaining format= tmdb_id::language--> <RegExp input="$$5" output="<details>\1</details>" dest="4"> <RegExp input="$$1" output="\2" dest="11"> - <expression>(.+)::(.+)</expression> + <expression>(.+)::(..)</expression> </RegExp> <RegExp input="$$1" output="\1" dest="13"> - <expression>(.+)::(.+)</expression> + <expression>(.+)::(..)</expression> </RegExp> - <RegExp input="$$1" output="<url function="ParseTMDBBaseImageURL" cache="tmdb-config.json">https://api.tmdb.org/3/configuration?api_key=f090bb54758cabf231fb605d3e3e0468</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBBaseImageURL" cache="tmdb-config.json">https://api.themoviedb.org/3/configuration?api_key=f090bb54758cabf231fb605d3e3e0468</url>" dest="5"> <expression /> </RegExp> - <RegExp input="$$1" output="<url function="ParseTMDBLandscape" cache="tmdb-images-\1.json">https://api.tmdb.org/3/movie/\1/images?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$$11&amp;include_image_language=$$11,en,null</url>" dest="5+"> - <expression>(.+)::(.+)</expression> + <RegExp input="$$1" output="<url function="ParseTMDBLandscape" cache="tmdb-images-\1.json">https://api.themoviedb.org/3/movie/\1/images?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$$11&amp;include_image_language=$$11,en,null</url>" dest="5+"> + <expression>(.+)::(..)</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -554,16 +563,16 @@ <GetTMDBThumbsByIdChain clearbuffers="no" dest="4"> <!-- Expected chaining format= tmdb_id::language--> <RegExp input="$$5" output="<details>\1</details>" dest="4"> <RegExp input="$$1" output="\2" dest="11"> - <expression>(.+)::(.+)</expression> + <expression>(.+)::(..)</expression> </RegExp> <RegExp input="$$1" output="\1" dest="13"> - <expression>(.+)::(.+)</expression> + <expression>(.+)::(..)</expression> </RegExp> - <RegExp input="$$1" output="<url function="ParseTMDBBaseImageURL" cache="tmdb-config.json">https://api.tmdb.org/3/configuration?api_key=f090bb54758cabf231fb605d3e3e0468</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBBaseImageURL" cache="tmdb-config.json">https://api.themoviedb.org/3/configuration?api_key=f090bb54758cabf231fb605d3e3e0468</url>" dest="5"> <expression /> </RegExp> - <RegExp input="$$1" output="<url function="ParseTMDBThumbs" cache="tmdb-images-\1.json">https://api.tmdb.org/3/movie/\1/images?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$$11&amp;include_image_language=$$11,en,null</url>" dest="5+"> - <expression>(.+)::(.+)</expression> + <RegExp input="$$1" output="<url function="ParseTMDBThumbs" cache="tmdb-images-\1.json">https://api.themoviedb.org/3/movie/\1/images?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$$11&amp;include_image_language=$$11,en,null</url>" dest="5+"> + <expression>(.+)::(..)</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -588,7 +597,7 @@ <RegExp input="$$9" output="$$10" dest="2"> <expression>^$</expression> </RegExp> - <RegExp input="$$2" output="<url function="ParseFallbackTMDBThumbs">https://api.tmdb.org/3/movie/$$13/images?api_key=f090bb54758cabf231fb605d3e3e0468</url>" dest="2"> + <RegExp input="$$2" output="<url function="ParseFallbackTMDBThumbs">https://api.themoviedb.org/3/movie/$$13/images?api_key=f090bb54758cabf231fb605d3e3e0468</url>" dest="2"> <expression>^$</expression> </RegExp> <expression noclean="1" /> @@ -610,7 +619,7 @@ <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> + <expression>"images":\{.*?"secure_base_url":"([^"]*)"</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -621,11 +630,11 @@ <RegExp input="$$1" output="\2" dest="16"> <expression>(.+)::(.+)</expression> </RegExp> - <RegExp input="$$1" output="<url function="ParseTMDBPremiered" cache="tmdb-\2-\1.json">https://api.tmdb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=\2</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBPremiered" cache="tmdb-\2-\1.json">https://api.themoviedb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=\2</url>" dest="5"> <expression>(.+)::(.+)</expression> </RegExp> <RegExp input="$$16" output="$$2" dest="5"> - <RegExp input="$$1" output="<url function="ParseTMDBPremiered" cache="tmdb-$INFO[tmdbcertcountry]-\1.json">https://api.tmdb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$INFO[tmdbcertcountry]</url>" dest="2"> + <RegExp input="$$1" output="<url function="ParseTMDBPremiered" cache="tmdb-$INFO[tmdbcertcountry]-\1.json">https://api.themoviedb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$INFO[tmdbcertcountry]</url>" dest="2"> <expression/> </RegExp> <expression>Keep Original</expression> |