diff options
| author | Rechi <Rechi@users.noreply.github.com> | 2018-09-08 18:00:00 +0200 |
|---|---|---|
| committer | Rechi <Rechi@users.noreply.github.com> | 2018-09-08 18:00:00 +0200 |
| commit | e396ef3d2f5eb8c1d6d0a6c597e2e0affb30f3c5 (patch) | |
| tree | 6a42659b6c48b8a5bfdf4e4dc89897d559cee350 /addons/metadata.common.themoviedb.org | |
| parent | 6baf09e182c66e916b0ebdf31c330d0bc0cf2725 (diff) | |
[addons] sync 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 | 403 |
2 files changed, 201 insertions, 204 deletions
diff --git a/addons/metadata.common.themoviedb.org/addon.xml b/addons/metadata.common.themoviedb.org/addon.xml index 0f5b905349..8000a309f4 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.17.6" + version="3.1.7" provider-name="Team Kodi"> <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 ed637830c8..722fa466b4 100644 --- a/addons/metadata.common.themoviedb.org/tmdb.xml +++ b/addons/metadata.common.themoviedb.org/tmdb.xml @@ -1,88 +1,81 @@ <?xml version="1.0" encoding="UTF-8"?> <scraperfunctions> - <GetTMDBCertificationsByIdChain dest="4"> + <GetTMDBCertificationsByIdChain clearbuffers="no" dest="4"> <!-- Expected chaining format= tmdb_id::certification_country::certification_prefix--> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBCertifications" cache="tmdb-cert-\1.json">https://api.tmdb.org/3/movie/\1/releases?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[tmdbcertcountry]</url>" dest="5"> - <expression /> + <RegExp input="$$1" output="\1" dest="16"> + <expression>.+::(.+)::(.+)?</expression> + </RegExp> + <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=45ab4cebe57ae11c2ee50c87005ddfe8</url>" dest="5"> + <expression>(.+)::(.+)::(.+)?</expression> </RegExp> <expression noclean="1" /> </RegExp> </GetTMDBCertificationsByIdChain> <ParseTMDBCertifications dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> - <RegExp input="$$1" output="<mpaa>$INFO[certprefix]\1</mpaa>" dest="2"> - <expression fixchars="1">certification":"([^"]*)","[^"]*":"$INFO[tmdbcertcountry]"(.*?),"</expression> + <RegExp input="$$1" output="\1" dest="15"> + <expression fixchars="1">certification":"([^"]*)","[^"]*":"$$16"(.*?),"</expression> + </RegExp> + <RegExp input="$$15" output="<mpaa>$$17 \1</mpaa>" dest="2"> + <expression>(.+)</expression> </RegExp> <expression noclean="1" /> </RegExp> </ParseTMDBCertifications> - <GetTMDBTitleByIdChain dest="4"> + <GetTMDBTitleByIdChain clearbuffers="no" dest="4"> <!-- Expected chaining format= tmdb_id::language--> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBTitle" cache="tmdb-$INFO[language]-\1.json">https://api.tmdb.org/3/movie/\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[language]</url>" dest="5"> - <expression /> + <RegExp input="$$1" output="\1::\2" dest="16"> + <expression>(.+)::(.+)</expression> </RegExp> - <expression noclean="1" /> - </RegExp> - </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">https://api.tmdb.org/3/movie/\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[tmdbtitlelanguage]</url>" dest="5"> - <expression /> + <RegExp input="$$1" output="<url function="ParseTMDBTitle" cache="tmdb-\2-\1.json">https://api.tmdb.org/3/movie/\1?api_key=45ab4cebe57ae11c2ee50c87005ddfe8&amp;language=\2</url>" dest="5"> + <expression>(.+)::(.+)</expression> </RegExp> - <RegExp input="$INFO[tmdbtitlelanguage]" output="$$2" dest="5"> - <RegExp input="$$1" output="<url function="ParseTMDBTitle" cache="tmdb-$INFO[tmdbsearchlanguage]-\1.json">https://api.tmdb.org/3/movie/\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[tmdbsearchlanguage]</url>" dest="2"> - <expression/> + <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=45ab4cebe57ae11c2ee50c87005ddfe8&amp;language=en</url>" dest="2"> + <expression>(.+)::</expression> </RegExp> - <expression>Keep Original</expression> + <expression>(.+)::Keep Original</expression> </RegExp> <expression noclean="1"/> </RegExp> - </GetTMDBLangTitleByIdChain> + </GetTMDBTitleByIdChain> <ParseTMDBTitle dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<title>\1</title>" dest="2"> <expression fixchars="1">"title":"([^"]*)</expression> </RegExp> - <RegExp input="$INFO[tmdbtitlelanguage]" output="$$3" dest="2"> + <RegExp input="$$16" output="$$3" dest="2"> <RegExp input="$$1" output="<title>\1</title>" dest="3"> <expression fixchars="1">"original_title":"([^"]*)</expression> </RegExp> - <expression>Keep Original</expression> + <expression>(.+)::Keep Original</expression> </RegExp> <expression noclean="1" /> </RegExp> </ParseTMDBTitle> - <GetTMDBPlotByIdChain clearbuffers="no" dest="4"> + <GetTMDBPlotByIdChain clearbuffers="no" dest="4"> <!-- Expected chaining format= tmdb_id::language--> <RegExp input="$$5" output="<details>\1</details>" dest="4"> <RegExp input="$$1" output="\1" dest="8"> - <expression clear="yes" noclean="1" /> + <expression encode="1">(.+)::.+</expression> </RegExp> - <RegExp input="$$8" output="<url function="ParseTMDBPlot" cache="tmdb-$INFO[language]-\1.json">https://api.tmdb.org/3/movie/\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[language]</url>" dest="5"> - <expression /> + <RegExp input="$$1" output="<url function="ParseTMDBPlot" cache="tmdb-\2-\1.json">https://api.tmdb.org/3/movie/\1?api_key=45ab4cebe57ae11c2ee50c87005ddfe8&amp;language=\2</url>" dest="5"> + <expression>(.+)::(.+)</expression> </RegExp> <expression noclean="1" /> </RegExp> </GetTMDBPlotByIdChain> - <GetTMDBLangPlotByIdChain 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="ParseTMDBPlot" cache="tmdb-$INFO[tmdbplotlanguage]-\1.json">https://api.tmdb.org/3/movie/\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[tmdbplotlanguage]</url>" dest="5"> - <expression /> - </RegExp> - <expression noclean="1" /> - </RegExp> - </GetTMDBLangPlotByIdChain> <ParseTMDBPlot dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <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=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=en</url>" dest="2"> + <RegExp input="$$9" output="<url function="ParseFallbackTMDBPlot" cache="tmdb-en-$$8.json">https://api.tmdb.org/3/movie/$$8?api_key=45ab4cebe57ae11c2ee50c87005ddfe8&amp;language=en</url>" dest="2"> <expression>^$</expression> </RegExp> <RegExp input="$$9" output="<plot>\1</plot>" dest="2"> @@ -100,34 +93,23 @@ </RegExp> </ParseFallbackTMDBPlot> - <GetTMDBTaglineByIdChain clearbuffers="no" dest="4"> + <GetTMDBTaglineByIdChain clearbuffers="no" dest="4"> <!-- Expected chaining format= tmdb_id::language--> <RegExp input="$$5" output="<details>\1</details>" dest="4"> <RegExp input="$$1" output="\1" dest="8"> - <expression clear="yes" noclean="1" /> + <expression>(.+)::.+</expression> </RegExp> - <RegExp input="$$8" output="<url function="ParseTMDBTagline" cache="tmdb-$INFO[language]-\1.json">https://api.tmdb.org/3/movie/\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[language]</url>" dest="5"> - <expression /> + <RegExp input="$$1" output="<url function="ParseTMDBTagline" cache="tmdb-\2-\1.json">https://api.tmdb.org/3/movie/\1?api_key=45ab4cebe57ae11c2ee50c87005ddfe8&amp;language=\2</url>" dest="5"> + <expression>(.+)::(.+)</expression> </RegExp> <expression noclean="1" /> </RegExp> </GetTMDBTaglineByIdChain> - <GetTMDBLangTaglineByIdChain 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="ParseTMDBTagline" cache="tmdb-$INFO[tmdbtaglinelanguage]-\1.json">https://api.tmdb.org/3/movie/\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[tmdbtaglinelanguage]</url>" dest="5"> - <expression /> - </RegExp> - <expression noclean="1" /> - </RegExp> - </GetTMDBLangTaglineByIdChain> <ParseTMDBTagline dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="\1" dest="9"> - <expression clear="yes" fixchars="1">"tagline":"([^"]*)</expression> + <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=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=en</url>" dest="2"> + <RegExp input="$$9" output="<url function="ParseFallbackTMDBTagline" cache="tmdb-en-$$8.json">https://api.tmdb.org/3/movie/$$8?api_key=45ab4cebe57ae11c2ee50c87005ddfe8&amp;language=en</url>" dest="2"> <expression>^$</expression> </RegExp> <RegExp input="$$9" output="<tagline>\1</tagline>" dest="2"> @@ -139,18 +121,18 @@ <ParseFallbackTMDBTagline dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<tagline>\1</tagline>" dest="2"> - <expression clear="yes" fixchars="1">"tagline":"([^"]*)</expression> + <expression clear="yes" fixchars="1">"tagline":"(.*?)","</expression> </RegExp> <expression noclean="1" /> </RegExp> </ParseFallbackTMDBTagline> - <GetTMDBTagsByIdChain clearbuffers="no" dest="4"> + <GetTMDBTagsByIdChain clearbuffers="no" dest="4"> <!-- Expected chaining format= tmdb_id--> <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" >https://api.tmdb.org/3/movie/\1/keywords?api_key=ecbc86c92da237cb9faff6d3ddc4be6d</url>" dest="5"> + <RegExp input="$$8" output="<url function="ParseTMDBTags" >https://api.tmdb.org/3/movie/\1/keywords?api_key=45ab4cebe57ae11c2ee50c87005ddfe8</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -165,57 +147,114 @@ </RegExp> </ParseTMDBTags> - <GetTMDBSetByIdChain clearbuffers="no" dest="4"> + <GetTMDBSetByIdChain clearbuffers="no" dest="4"> <!-- Expected chaining format= tmdb_id::language--> <RegExp input="$$5" output="<details>\1</details>" dest="4"> <RegExp input="$$1" output="\1" dest="8"> - <expression clear="yes" noclean="1" /> + <expression>(.+)::(.+)</expression> + </RegExp> + <RegExp input="$$1" output="\2" dest="10"> + <expression>(.+)::(.+)</expression> </RegExp> - <RegExp input="$$8" output="<url function="ParseTMDBSet" cache="tmdb-$INFO[language]-\1.json">https://api.tmdb.org/3/movie/\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[language]</url>" dest="5"> + <RegExp input="$$8" output="<url function="GetTMDBSetID" cache="tmdb-$$10-\1.json">https://api.tmdb.org/3/movie/\1?api_key=45ab4cebe57ae11c2ee50c87005ddfe8&amp;language=$$10</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> </RegExp> </GetTMDBSetByIdChain> - <GetTMDBLangSetByIdChain 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" /> + <GetTMDBSetID dest="5" clearbuffers="no"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="\1" dest="9"> + <expression clear="yes" noclean="1">"belongs_to_collection":\{"id":([0-9]+),"name":"([^"]*)</expression> </RegExp> - <RegExp input="$$8" output="<url function="ParseTMDBSet" cache="tmdb-$INFO[tmdbsetlanguage]-\1.json">https://api.tmdb.org/3/movie/\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[tmdbsetlanguage]</url>" dest="5"> - <expression /> + <RegExp input="$$9" output="<url function="ParseTMDBBaseImageURL" cache="tmdb-config.json">https://api.tmdb.org/3/configuration?api_key=45ab4cebe57ae11c2ee50c87005ddfe8</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=45ab4cebe57ae11c2ee50c87005ddfe8&amp;language=$$10&amp;append_to_response=images&amp;include_image_language=$$10,en,null</url>" dest="2+"> + <expression>(.+)</expression> </RegExp> <expression noclean="1" /> </RegExp> - </GetTMDBLangSetByIdChain> - <ParseTMDBSet dest="5"> + </GetTMDBSetID> + <ParseTMDBSetOutline dest="5" clearbuffers="no"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> - <RegExp input="$$1" output="\1" dest="9"> - <expression clear="yes" noclean="1">"belongs_to_collection":\{"id":[0-9]+,"name":"([^"]*)</expression> + <RegExp input="$$4" output="<set>\1</set>$$13$$14" dest="2"> + <RegExp input="$$1" output="\1" dest="11"> + <expression noclean="1">"id":[0-9]+,"name":"([^"]*)</expression> + </RegExp> + <RegExp input="$$11" output="<name>\1</name>" dest="4"> + <expression>(.+)</expression> + </RegExp> + <RegExp input="$$1" output="\1" dest="6"> + <expression noclean="1">"id":([0-9]+)</expression> + </RegExp> + <RegExp input="$$1" output="\1" dest="9"> + <expression fixchars="1">"id":[0-9]+,"name":"[^"]*","overview":"(.*?)","</expression> + </RegExp> + <RegExp input="$$9" output="<overview>\1</overview>" dest="4+"> + <expression>(.+)</expression> + </RegExp> + <RegExp input="$$1" output="\1" dest="7"> + <expression clear="yes" noclean="1">"posters":\[\{([^\]]*)</expression> + </RegExp> + <RegExp input="$$7" output="<thumb aspect="set" preview="$$20w500\1">$$20original\1</thumb>" dest="13"> + <expression repeat="yes" clear="yes" noclean="1">"file_path":"([^"]*)[^:]*:[^:]*:"$$10</expression> + </RegExp> + <RegExp input="$$7" output="<thumb aspect="set" preview="$$20w500\1">$$20original\1</thumb>" dest="13+"> + <expression repeat="yes" noclean="1">"file_path":"([^"]*)[^:]*:[^:]*:"en</expression> + </RegExp> + <RegExp input="$$7" output="<thumb aspect="set" preview="$$20w500\1">$$20original\1</thumb>" dest="13+"> + <expression repeat="yes" noclean="1">"file_path":"([^"]*)[^:]*:[^:]*:null</expression> + </RegExp> + <RegExp input="$$1" output="\1" dest="7"> + <expression clear="yes" noclean="1">"backdrops":\[\{([^\]]*)</expression> + </RegExp> + <RegExp input="$$7" output="<thumb aspect="setfanart" preview="$$20w500\1">$$20original\1</thumb>" dest="14"> + <expression clear="yes" repeat="yes" noclean="1">"file_path":"([^"]*)</expression> + </RegExp> + <expression noclean="1" /> </RegExp> - <RegExp input="$$9" output="<url function="ParseFallbackTMDBSet" cache="tmdb-en-$$8.json">https://api.tmdb.org/3/movie/$$8?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=en</url>" dest="2"> + <RegExp input="$$9" output="<url function="ParseFallbackTMDBSetOutline" cache="tmdbset-en-$$6.json">https://api.tmdb.org/3/collection/$$6?api_key=45ab4cebe57ae11c2ee50c87005ddfe8&amp;language=en&amp;append_to_response=images&amp;include_image_language=$$10,en,null</url>" dest="2"> <expression>^$</expression> </RegExp> - <RegExp input="$$9" output="<set>\1</set>" dest="2"> - <expression>(.+)</expression> - </RegExp> <expression noclean="1" /> </RegExp> - </ParseTMDBSet> - <ParseFallbackTMDBSet dest="5"> - <RegExp input="$$2" output="<details>\1</details>" dest="5"> - <RegExp input="$$1" output="<set>\1</set>" dest="2"> - <expression noclean="1">"belongs_to_collection":\{"id":[0-9]+,"name":"([^"]*)</expression> + </ParseTMDBSetOutline> + <ParseFallbackTMDBSetOutline dest="5"> + <RegExp input="$$2" output="<details><set>\1</set>$$13$$14</details>" dest="5"> + <RegExp input="$$11" output="<name>\1</name>" dest="2"> + <expression>(.+)</expression> </RegExp> + <RegExp input="$$1" output="<overview>\1</overview>" dest="2+"> + <expression noclean="1">"id":[0-9]+,"name":"[^"]*","overview":"(.*?)","</expression> + </RegExp> + <RegExp input="$$1" output="\1" dest="7"> + <expression clear="yes" noclean="1">"posters":\[\{([^\]]*)</expression> + </RegExp> + <RegExp input="$$7" output="<thumb aspect="set" preview="$$20w500\1">$$20original\1</thumb>" dest="13"> + <expression repeat="yes" clear="yes" noclean="1">"file_path":"([^"]*)[^:]*:[^:]*:"$$10</expression> + </RegExp> + <RegExp input="$$7" output="<thumb aspect="set" preview="$$20w500\1">$$20original\1</thumb>" dest="13+"> + <expression repeat="yes" noclean="1">"file_path":"([^"]*)[^:]*:[^:]*:"en</expression> + </RegExp> + <RegExp input="$$7" output="<thumb aspect="set" preview="$$20w500\1">$$20original\1</thumb>" dest="13+"> + <expression repeat="yes" noclean="1">"file_path":"([^"]*)[^:]*:[^:]*:null</expression> + </RegExp> + <RegExp input="$$1" output="\1" dest="7"> + <expression clear="yes" noclean="1">"backdrops":\[\{([^\]]*)</expression> + </RegExp> + <RegExp input="$$7" output="<thumb aspect="setfanart" preview="$$20w500\1">$$20original\1</thumb>" dest="14"> + <expression clear="yes" repeat="yes" noclean="1">"file_path":"([^"]*)</expression> + </RegExp> <expression noclean="1" /> </RegExp> - </ParseFallbackTMDBSet> + </ParseFallbackTMDBSetOutline> - <GetTMDBCastByIdChain dest="4"> + <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=ecbc86c92da237cb9faff6d3ddc4be6d</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBBaseImageURL" cache="tmdb-config.json">https://api.tmdb.org/3/configuration?api_key=45ab4cebe57ae11c2ee50c87005ddfe8</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=ecbc86c92da237cb9faff6d3ddc4be6d</url>" dest="5+"> + <RegExp input="$$1" output="<url function="ParseTMDBCast" cache="tmdb-cast-\1.json">https://api.tmdb.org/3/movie/\1/casts?api_key=45ab4cebe57ae11c2ee50c87005ddfe8</url>" dest="5+"> <expression /> </RegExp> <expression noclean="1" /> @@ -236,9 +275,9 @@ </RegExp> </ParseTMDBCast> - <GetTMDBDirectorsByIdChain dest="4"> + <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=ecbc86c92da237cb9faff6d3ddc4be6d</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBDirectors" cache="tmdb-cast-\1.json">https://api.tmdb.org/3/movie/\1/casts?api_key=45ab4cebe57ae11c2ee50c87005ddfe8</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -256,9 +295,9 @@ </RegExp> </ParseTMDBDirectors> - <GetTMDBWitersByIdChain dest="4"> + <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=ecbc86c92da237cb9faff6d3ddc4be6d</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBWriters" cache="tmdb-cast-\1.json">https://api.tmdb.org/3/movie/\1/casts?api_key=45ab4cebe57ae11c2ee50c87005ddfe8</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -276,22 +315,14 @@ </RegExp> </ParseTMDBWriters> - <GetTMDBGenresByIdChain dest="4"> + <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-$INFO[language]-\1.json">https://api.tmdb.org/3/movie/\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[language]</url>" dest="5"> - <expression /> + <RegExp input="$$1" output="<url function="ParseTMDBGenres" cache="tmdb-\2-\1.json">https://api.tmdb.org/3/movie/\1?api_key=45ab4cebe57ae11c2ee50c87005ddfe8&amp;language=\2</url>" dest="5"> + <expression>(.+)::(.+)</expression> </RegExp> <expression noclean="1" /> </RegExp> </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">https://api.tmdb.org/3/movie/\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[tmdbgenreslanguage]</url>" dest="5"> - <expression /> - </RegExp> - <expression noclean="1" /> - </RegExp> - </GetTMDBLangGenresByIdChain> <ParseTMDBGenres dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="\1" dest="7"> @@ -306,8 +337,14 @@ <GetTMDBRatingByIdChain dest="4"> <!-- Compatibility function for Pre-Krypton versions--> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBRating" cache="tmdb-$INFO[language]-\1.json">https://api.tmdb.org/3/movie/\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[language]</url>" dest="5"> - <expression /> + <RegExp input="$$1" output="\2" dest="11"> + <expression>(.+)::(..)</expression> + </RegExp> + <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=45ab4cebe57ae11c2ee50c87005ddfe8&amp;language=$$11</url>" dest="5"> + <expression>^(.+)::</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -324,9 +361,15 @@ </RegExp> </ParseTMDBRating> - <GetTMDBRatingsByIdChain dest="4" clearbuffers="no"> + <GetTMDBRatingsByIdChain dest="4" clearbuffers="no"> <!-- Expected chaining format= tmdb_id::language_for_caching--> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBRatings" cache="tmdb-$INFO[language]-\1.json">https://api.tmdb.org/3/movie/\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[language]</url>" dest="5"> + <RegExp input="$$1" output="\2" dest="11"> + <expression>(.+)::(..)</expression> + </RegExp> + <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=45ab4cebe57ae11c2ee50c87005ddfe8&amp;language=$$11</url>" dest="5"> <expression noclean="1">^((tt)?\d+)</expression> </RegExp> <RegExp input="$$1" output="default="true"" dest="3"> @@ -347,10 +390,10 @@ </RegExp> </ParseTMDBRatings> - <GetTMDBStudioByIdChain dest="4"> + <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-en-\1.json">https://api.tmdb.org/3/movie/\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=en</url>" dest="5"> - <expression /> + <RegExp input="$$1" output="<url function="ParseTMDBStudio" cache="tmdb-\2-\1.json">https://api.tmdb.org/3/movie/\1?api_key=45ab4cebe57ae11c2ee50c87005ddfe8&amp;language=\2</url>" dest="5"> + <expression>(.+)::(.+)</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -367,10 +410,10 @@ </RegExp> </ParseTMDBStudio> - <GetTMDBCountryByIdChain dest="4"> + <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-en-\1.json">https://api.tmdb.org/3/movie/\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=en</url>" dest="5"> - <expression /> + <RegExp input="$$1" output="<url function="ParseTMDBCountry" cache="tmdb-\2-\1.json">https://api.tmdb.org/3/movie/\1?api_key=45ab4cebe57ae11c2ee50c87005ddfe8&amp;language=\2</url>" dest="5"> + <expression>(.+)::(.+)</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -387,22 +430,14 @@ </RegExp> </ParseTMDBCountry> - <GetTMDBTrailerByIdChain dest="4"> + <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-$INFO[language]-\1.json">https://api.tmdb.org/3/movie/\1/trailers?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[language]</url>" dest="5"> - <expression /> + <RegExp input="$$1" output="<url function="ParseTMDBTrailer" cache="tmdb-trailer-\2-\1.json">https://api.tmdb.org/3/movie/\1/trailers?api_key=45ab4cebe57ae11c2ee50c87005ddfe8&amp;language=\2</url>" dest="5"> + <expression>(.+)::(.+)</expression> </RegExp> <expression noclean="1" /> </RegExp> </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">https://api.tmdb.org/3/movie/\1/trailers?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[tmdbtrailerlanguage]</url>" dest="5"> - <expression /> - </RegExp> - <expression noclean="1" /> - </RegExp> - </GetTMDBLangTrailerByIdChain> <ParseTMDBTrailer dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="\1" dest="8"> @@ -414,7 +449,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">https://api.tmdb.org/3/movie/$$8/trailers?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=en</url>" dest="2"> + <RegExp input="$$9" output="<url function="ParseTMDBEnTrailer" cache="tmdb-trailer-en-$$8.json">https://api.tmdb.org/3/movie/$$8/trailers?api_key=45ab4cebe57ae11c2ee50c87005ddfe8&amp;language=en</url>" dest="2"> <expression>^$</expression> </RegExp> <RegExp input="$$9" output="$$9" dest="2"> @@ -434,7 +469,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">https://api.tmdb.org/3/movie/$$8/trailers?api_key=ecbc86c92da237cb9faff6d3ddc4be6d</url>" dest="5"> + <RegExp input="$$9" output="<url function="ParseTMDBAllTrailer" cache="tmdb-trailer-$$8.json">https://api.tmdb.org/3/movie/$$8/trailers?api_key=45ab4cebe57ae11c2ee50c87005ddfe8</url>" dest="2"> <expression>^$</expression> </RegExp> <RegExp input="$$9" output="$$9" dest="2"> @@ -455,14 +490,17 @@ </RegExp> </ParseTMDBAllTrailer> - <GetTMDBFanartByIdChain dest="4"> + <GetTMDBFanartByIdChain dest="4"> <!-- Expected chaining format= tmdb_id::poster_language--> <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=ecbc86c92da237cb9faff6d3ddc4be6d</url>" dest="5"> - <expression /> + <RegExp input="$$1" output="\2" dest="11"> + <expression>(.+)::(.+)</expression> </RegExp> - <RegExp input="$$1" output="<url function="ParseTMDBFanart" cache="tmdb-images-\1.json">https://api.tmdb.org/3/movie/\1/images?api_key=ecbc86c92da237cb9faff6d3ddc4be6d</url>" dest="5+"> + <RegExp input="$$1" output="<url function="ParseTMDBBaseImageURL" cache="tmdb-config.json">https://api.tmdb.org/3/configuration?api_key=45ab4cebe57ae11c2ee50c87005ddfe8</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=45ab4cebe57ae11c2ee50c87005ddfe8&amp;language=$$11&amp;include_image_language=$$11,en,null</url>" dest="5+"> + <expression>(.+)::(.+)</expression> + </RegExp> <expression noclean="1" /> </RegExp> </GetTMDBFanartByIdChain> @@ -478,116 +516,66 @@ </RegExp> </ParseTMDBFanart> - <GetTMDBThumbsByIdChain dest="4"> + <GetTMDBThumbsByIdChain clearbuffers="no" dest="4"> <!-- Expected chaining format= tmdb_id::language--> <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=ecbc86c92da237cb9faff6d3ddc4be6d</url>" dest="5"> - <expression /> + <RegExp input="$$1" output="\2" dest="11"> + <expression>(.+)::(.+)</expression> </RegExp> - <RegExp input="$$1" output="<url function="ParseTMDBThumbs" cache="tmdb-images-$INFO[language]-\1.json">https://api.tmdb.org/3/movie/\1/images?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[language]</url>" dest="5+"> - <expression /> + <RegExp input="$$1" output="\1" dest="13"> + <expression>(.+)::(.+)</expression> </RegExp> - <expression noclean="1" /> - </RegExp> - </GetTMDBThumbsByIdChain> - <GetTMDBLangThumbsByIdChain dest="4"> - <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=ecbc86c92da237cb9faff6d3ddc4be6d</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBBaseImageURL" cache="tmdb-config.json">https://api.tmdb.org/3/configuration?api_key=45ab4cebe57ae11c2ee50c87005ddfe8</url>" dest="5"> <expression /> </RegExp> - <RegExp input="$$1" output="<url function="ParseTMDBLangThumbs" cache="tmdb-images-$INFO[tmdbthumblanguage]-\1.json">https://api.tmdb.org/3/movie/\1/images?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[tmdbthumblanguage]</url>" dest="5+"> - <expression /> + <RegExp input="$$1" output="<url function="ParseTMDBThumbs" cache="tmdb-images-\1.json">https://api.tmdb.org/3/movie/\1/images?api_key=45ab4cebe57ae11c2ee50c87005ddfe8&amp;language=$$11&amp;include_image_language=$$11,en,null</url>" dest="5+"> + <expression>(.+)::(.+)</expression> </RegExp> <expression noclean="1" /> </RegExp> - </GetTMDBLangThumbsByIdChain> + </GetTMDBThumbsByIdChain> <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> - </RegExp> <RegExp input="$$1" output="\1" dest="7"> <expression clear="yes" noclean="1">"posters":\[\{([^\]]*)</expression> </RegExp> <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> + <expression repeat="yes" clear="yes" noclean="1">"file_path":"([^"]*)[^:]*:[^:]*:"$$11</expression> </RegExp> - <RegExp input="$$9" output="$$9" dest="2"> - <expression clear="yes">(.+)</expression> + <RegExp input="$$7" output="<thumb aspect="poster" preview="$$20w500\1">$$20original\1</thumb>" dest="9+"> + <expression repeat="yes" noclean="1">"file_path":"([^"]*)[^:]*:[^:]*:"en</expression> </RegExp> - <RegExp input="$$9" output="$$12" dest="2+"> - <RegExp input="$INFO[language]" output="<url function="ParseTMDBAllThumbs" cache="tmdb-images-$$8.json">https://api.tmdb.org/3/movie/$$8/images?api_key=ecbc86c92da237cb9faff6d3ddc4be6d</url>" dest="12"> - <expression>en</expression> - </RegExp> - <expression>^$</expression> - </RegExp> - <RegExp input="$INFO[language]" output="<url function="ParseTMDBEnThumbs" cache="tmdb-images-en-$$8.json">https://api.tmdb.org/3/movie/$$8/images?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=en</url>" dest="2+"> - <expression>^((?!en).)*$</expression> - </RegExp> - <expression noclean="1">(.+)</expression> - </RegExp> - </ParseTMDBThumbs> - <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> - </RegExp> - <RegExp input="$$1" output="\1" dest="7"> - <expression clear="yes" noclean="1">"posters":\[\{([^\]]*)</expression> - </RegExp> - <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 input="$$7" output="<thumb aspect="poster" preview="$$20w500\1">$$20original\1</thumb>" dest="10"> + <expression repeat="yes" clear="yes" noclean="1">"file_path":"([^"]*)[^:]*:[^:]*:null</expression> </RegExp> <RegExp input="$$9" output="$$9" dest="2"> - <expression clear="yes">(.+)</expression> + <expression>(.+)</expression> </RegExp> - <RegExp input="$$9" output="$$12" dest="2+"> - <RegExp input="$INFO[tmdbthumblanguage]" output="<url function="ParseTMDBAllThumbs" cache="tmdb-images-$$8.json">https://api.tmdb.org/3/movie/$$8/images?api_key=ecbc86c92da237cb9faff6d3ddc4be6d</url>" dest="12"> - <expression>en</expression> - </RegExp> + <RegExp input="$$9" output="$$10" dest="2"> <expression>^$</expression> </RegExp> - <RegExp input="$INFO[tmdbthumblanguage]" output="<url function="ParseTMDBEnThumbs" cache="tmdb-images-en-$$8.json">https://api.tmdb.org/3/movie/$$8/images?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=en</url>" dest="2+"> - <expression>^((?!en).)*$</expression> - </RegExp> - <expression noclean="1">(.+)</expression> - </RegExp> - </ParseTMDBLangThumbs> - <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> - </RegExp> - <RegExp input="$$1" output="\1" dest="7"> - <expression clear="yes" noclean="1">"posters":\[\{([^\]]*)</expression> - </RegExp> - <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="$$9" dest="2"> - <expression clear="yes">(.+)</expression> - </RegExp> - <RegExp input="$$9" output="<url function="ParseTMDBAllThumbs" cache="tmdb-images-$$8.json">https://api.tmdb.org/3/movie/$$8/images?api_key=ecbc86c92da237cb9faff6d3ddc4be6d</url>" dest="2"> + <RegExp input="$$2" output="<url function="ParseFallbackTMDBThumbs">https://api.tmdb.org/3/movie/$$13/images?api_key=45ab4cebe57ae11c2ee50c87005ddfe8</url>" dest="2"> <expression>^$</expression> </RegExp> - <expression noclean="1">(.+)</expression> + <expression noclean="1" /> </RegExp> - </ParseTMDBEnThumbs> - <ParseTMDBAllThumbs dest="5"> + </ParseTMDBThumbs> + + <ParseFallbackTMDBThumbs dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="\1" dest="7"> <expression clear="yes" noclean="1">"posters":\[\{([^\]]*)</expression> </RegExp> <RegExp input="$$7" output="<thumb aspect="poster" preview="$$20w500\1">$$20original\1</thumb>" dest="2"> - <expression repeat="yes" noclean="1">"file_path":"([^"]*)</expression> + <expression repeat="yes" noclean="1">"file_path":"([^"]*)[^:]*:[^:]*:"[^"]*</expression> </RegExp> - <expression noclean="1">(.+)</expression> + <expression noclean="1" /> </RegExp> - </ParseTMDBAllThumbs> + </ParseFallbackTMDBThumbs> <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":\{"base_url":"([^"]*)"</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -595,8 +583,17 @@ <GetTMDBPremieredByIdChain dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBPremiered" cache="tmdb-$INFO[tmdbtitlelanguage]-\1.json">https://api.tmdb.org/3/movie/\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[tmdbtitlelanguage]</url>" dest="5"> - <expression /> + <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=45ab4cebe57ae11c2ee50c87005ddfe8&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=45ab4cebe57ae11c2ee50c87005ddfe8&amp;language=$INFO[tmdbcertcountry]</url>" dest="2"> + <expression/> + </RegExp> + <expression>Keep Original</expression> </RegExp> <expression noclean="1" /> </RegExp> |