diff options
author | Martijn Kaijser <mcm.kaijser@gmail.com> | 2017-12-10 09:41:11 +0100 |
---|---|---|
committer | Martijn Kaijser <mcm.kaijser@gmail.com> | 2017-12-10 09:41:11 +0100 |
commit | 165723ef45ea9e9395c27a0a27b02385bdeb83eb (patch) | |
tree | f5f24a079d7e40e2d011103e353c6fbb12d82331 /addons/metadata.themoviedb.org | |
parent | 46c9aa5da2a3a6bf7ecab2d55477080e676eadd7 (diff) |
[addons] sync scrapers with repo
Diffstat (limited to 'addons/metadata.themoviedb.org')
-rw-r--r-- | addons/metadata.themoviedb.org/addon.xml | 6 | ||||
-rw-r--r-- | addons/metadata.themoviedb.org/changelog.txt | 16 | ||||
-rw-r--r-- | addons/metadata.themoviedb.org/resources/settings.xml | 2 | ||||
-rw-r--r-- | addons/metadata.themoviedb.org/tmdb.xml | 43 |
4 files changed, 35 insertions, 32 deletions
diff --git a/addons/metadata.themoviedb.org/addon.xml b/addons/metadata.themoviedb.org/addon.xml index a45818e004..7a914e3819 100644 --- a/addons/metadata.themoviedb.org/addon.xml +++ b/addons/metadata.themoviedb.org/addon.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.themoviedb.org" name="The Movie Database" - version="4.0.1" + version="5.0.2" provider-name="Team Kodi"> <requires> <import addon="xbmc.metadata" version="2.1.0"/> - <import addon="metadata.common.imdb.com" version="2.7.8"/> - <import addon="metadata.common.themoviedb.org" version="2.13.1"/> + <import addon="metadata.common.imdb.com" version="2.9.2"/> + <import addon="metadata.common.themoviedb.org" version="2.17.6"/> <import addon="plugin.video.youtube" version="4.4.10" optional="true"/> </requires> <extension point="xbmc.metadata.scraper.movies" diff --git a/addons/metadata.themoviedb.org/changelog.txt b/addons/metadata.themoviedb.org/changelog.txt index 6e9b28ec22..35d33e76be 100644 --- a/addons/metadata.themoviedb.org/changelog.txt +++ b/addons/metadata.themoviedb.org/changelog.txt @@ -1,9 +1,21 @@ +[B]5.0.2[/B] +- changed: made tmdb uniqueid consistent with documentation + +[B]5.0.1[/B] +- changed: simplified ratings code + +[B]5.0.0[/B] +Version bump for Krypton + +[B]4.0.3[/B] +- changed: split zh-cn and zh-tw + [B]4.0.1[/B] --switched API queries to https +- switched API queries to https [B]4.0.0[/B] - added: multiple ratings and uniqueid support (requires Kodi v17) -thanks phate89 -- added: premiered date -thanks phate89 +- added: premiered date (requires Kodi v17) -thanks phate89 [B]3.9.4[/B] - Fixed after API layout changes diff --git a/addons/metadata.themoviedb.org/resources/settings.xml b/addons/metadata.themoviedb.org/resources/settings.xml index 2b67ec3725..6241d2701c 100644 --- a/addons/metadata.themoviedb.org/resources/settings.xml +++ b/addons/metadata.themoviedb.org/resources/settings.xml @@ -3,7 +3,7 @@ <setting label="30005" type="bool" id="keeporiginaltitle" default="false"/> <setting label="30000" type="bool" id="fanart" default="true"/> <setting label="30004" type="bool" id="trailer" default="true"/> - <setting label="30002" type="select" values="bg|cs|da|de|el|en|es|fa|fa-ir|fi|fr|he|hr|hu|it|ja|ko|nb|nl|no|pl|pt|pt-br|ro|ru|sk|sl|sr|sv|th|tr|uk|zh" id="language" default="en"/> + <setting label="30002" type="select" values="bg|cs|da|de|el|en|es|fa|fa-ir|fi|fr|he|hr|hu|it|ja|ko|nb|nl|no|pl|pt|pt-br|ro|ru|sk|sl|sr|sv|th|tr|uk|zh-cn|zh-tw" id="language" default="en"/> <setting label="30006" type="select" values="au|bg|cs|da|de|el|es|fi|fr|gb|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|th|tr|us|zh" id="tmdbcertcountry" default="us"/> <setting label="30003" type="labelenum" values="TMDb|IMDb" id="RatingS" default="TMDb"/> <setting label="30007" type="bool" id="imdbanyway" visible="eq(-1,0)" default="false"/> diff --git a/addons/metadata.themoviedb.org/tmdb.xml b/addons/metadata.themoviedb.org/tmdb.xml index bb793ed31f..5c6e8407d1 100644 --- a/addons/metadata.themoviedb.org/tmdb.xml +++ b/addons/metadata.themoviedb.org/tmdb.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <scraper framework="1.1" date="2012-01-16"> <CreateSearchUrl dest="3"> - <RegExp input="$$1" output="<url>https://api.tmdb.org/3/search/movie?api_key=6889f6089877fd092454d00edb44a84d&amp;query=\1&amp;year=$$4&amp;language=$INFO[language]</url>" dest="3"> + <RegExp input="$$1" output="<url>https://api.tmdb.org/3/search/movie?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;query=\1&amp;year=$$4&amp;language=$INFO[language]</url>" dest="3"> <RegExp input="$$2" output="\1" dest="4"> <expression clear="yes">(.+)</expression> </RegExp> @@ -9,34 +9,34 @@ </RegExp> </CreateSearchUrl> <NfoUrl dest="3"> - <RegExp input="$$1" output="<details><url>https://api.tmdb.org/3/movie/\2?api_key=6889f6089877fd092454d00edb44a84d&amp;language=$INFO[language]</url><id>\2</id></details>" dest="3"> + <RegExp input="$$1" output="<details><url>https://api.tmdb.org/3/movie/\2?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[language]</url><id>\2</id></details>" dest="3"> <expression clear="yes" noclean="1">(themoviedb.org/movie/)([0-9]*)</expression> </RegExp> - <RegExp input="$$1" output="<details><url cache="tmdb-$INFO[language]-tt\1.json">https://api.tmdb.org/3/movie/tt\1?api_key=6889f6089877fd092454d00edb44a84d&amp;language=$INFO[language]</url><id>tt\1</id></details>" dest="3"> + <RegExp input="$$1" output="<details><url cache="tmdb-$INFO[language]-tt\1.json">https://api.tmdb.org/3/movie/tt\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[language]</url><id>tt\1</id></details>" dest="3"> <expression>imdb....?/title/tt([0-9]+)</expression> </RegExp> - <RegExp input="$$1" output="<details><url cache="tmdb-$INFO[language]-tt\1.json">https://api.tmdb.org/3/movie/tt\1?api_key=6889f6089877fd092454d00edb44a84d&amp;language=$INFO[language]</url><id>tt\1</id></details>" dest="3"> + <RegExp input="$$1" output="<details><url cache="tmdb-$INFO[language]-tt\1.json">https://api.tmdb.org/3/movie/tt\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[language]</url><id>tt\1</id></details>" dest="3"> <expression>imdb....?/Title\?t{0,2}([0-9]+)</expression> </RegExp> </NfoUrl> <GetSearchResults dest="8"> <RegExp input="$$3" output="<results>\1</results>" dest="8"> - <RegExp input="$$1" output="<entity><title>\3</title><id>\2</id><year>\1</year><url cache="tmdb-$INFO[language]-\2.json">https://api.tmdb.org/3/movie/\2?api_key=6889f6089877fd092454d00edb44a84d&amp;language=$INFO[language]</url></entity>" dest="3"> + <RegExp input="$$1" output="<entity><title>\3</title><id>\2</id><year>\1</year><url cache="tmdb-$INFO[language]-\2.json">https://api.tmdb.org/3/movie/\2?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[language]</url></entity>" dest="3"> <expression repeat="yes">"release_date":"([0-9]+)-.*?"id":([0-9]*),"original_title":"[^"]*","original_language":"[^"]*","title":"([^"]*)"</expression> </RegExp> - <RegExp input="$$1" output="<entity><title>\3</title><id>\2</id><year>\1</year><url cache="tmdb-$INFO[language]-\2.json">https://api.tmdb.org/3/movie/\2?api_key=6889f6089877fd092454d00edb44a84d&amp;language=$INFO[language]</url></entity>" dest="3+"> + <RegExp input="$$1" output="<entity><title>\3</title><id>\2</id><year>\1</year><url cache="tmdb-$INFO[language]-\2.json">https://api.tmdb.org/3/movie/\2?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[language]</url></entity>" dest="3+"> <expression repeat="yes">"release_date":"([0-9]+)-.*?"id":([0-9]*),"original_title":"([^"]*)","original_language":"[^"]*"</expression> </RegExp> - <RegExp input="$$1" output="<entity><title>\2</title><id>\1</id><url cache="tmdb-$INFO[language]-\1.json">https://api.tmdb.org/3/movie/\1?api_key=6889f6089877fd092454d00edb44a84d&amp;language=$INFO[language]</url></entity>" dest="3+"> + <RegExp input="$$1" output="<entity><title>\2</title><id>\1</id><url cache="tmdb-$INFO[language]-\1.json">https://api.tmdb.org/3/movie/\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[language]</url></entity>" dest="3+"> <expression repeat="yes">"release_date":null.*?"id":([0-9]*),"original_title":"([^"]*)","original_language":"[^"]*"</expression> </RegExp> - <RegExp input="$$1" output="<entity><title>\2</title><id>\1</id><year>\3</year><url cache="tmdb-$INFO[language]-\1.json">https://api.tmdb.org/3/movie/\1?api_key=6889f6089877fd092454d00edb44a84d&amp;language=$INFO[language]</url></entity>" dest="3+"> + <RegExp input="$$1" output="<entity><title>\2</title><id>\1</id><year>\3</year><url cache="tmdb-$INFO[language]-\1.json">https://api.tmdb.org/3/movie/\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[language]</url></entity>" dest="3+"> <expression repeat="yes">"id":([0-9]*).*?title":"[^"]*".*?original_title":"([^"]*)".*?"release_date":"([0-9]+)-</expression> </RegExp> - <RegExp input="$$1" output="<entity><title>\2</title><id>\1</id><year>\3</year><url cache="tmdb-$INFO[language]-\1.json">https://api.tmdb.org/3/movie/\1?api_key=6889f6089877fd092454d00edb44a84d&amp;language=$INFO[language]</url></entity>" dest="3+"> + <RegExp input="$$1" output="<entity><title>\2</title><id>\1</id><year>\3</year><url cache="tmdb-$INFO[language]-\1.json">https://api.tmdb.org/3/movie/\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[language]</url></entity>" dest="3+"> <expression repeat="yes">"id":([0-9]*).*?title":"([^"]*)".*?original_title":"[^"]*".*?"release_date":"([0-9]+)-</expression> </RegExp> - <RegExp input="$$1" output="<entity><title>\2</title><id>\1</id><url cache="tmdb-$INFO[language]-\1.json">https://api.tmdb.org/3/movie/\1?api_key=6889f6089877fd092454d00edb44a84d&amp;language=$INFO[language]</url></entity>" dest="3+"> + <RegExp input="$$1" output="<entity><title>\2</title><id>\1</id><url cache="tmdb-$INFO[language]-\1.json">https://api.tmdb.org/3/movie/\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=$INFO[language]</url></entity>" dest="3+"> <expression repeat="yes">"id":([0-9]*).*?title":"([^"]*)".*?original_title":"[^"]*".*?"release_date":null</expression> </RegExp> <expression noclean="1" /> @@ -44,7 +44,7 @@ </GetSearchResults> <GetDetails dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> - <RegExp input="$$1" output="<uniqueid type="themoviedb" default="true">$$2</uniqueid>" dest="5"> + <RegExp input="$$1" output="<uniqueid type="tmdb" default="true">$$2</uniqueid>" dest="5"> <expression/> </RegExp> <RegExp input="$$1" output="\1" dest="11"> @@ -74,26 +74,17 @@ <RegExp input="$$1" output="\1" dest="10"> <expression clear="yes" noclean="1">"runtime":([0-9]+)</expression> </RegExp> - <RegExp input="$$10" output="<url function="ParseFallbackTMDBRuntime" cache="tmdb-en-$$2.json">https://api.tmdb.org/3/movie/$$2?api_key=6889f6089877fd092454d00edb44a84d&amp;language=en</url>" dest="5+"> + <RegExp input="$$10" output="<url function="ParseFallbackTMDBRuntime" cache="tmdb-en-$$2.json">https://api.tmdb.org/3/movie/$$2?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;language=en</url>" dest="5+"> <expression>^$</expression> </RegExp> <RegExp input="$$10" output="<runtime>\1</runtime>" dest="5+"> <expression>(.+)</expression> </RegExp> - <RegExp input="$INFO[RatingS]" output="$$6" dest="5+"> - <RegExp input="$$11" output="<chain function="GetIMDBRatingsByIdAsDef">\1</chain>" dest="6"> - <expression>(.+)</expression> - </RegExp> - <RegExp input="" output="<chain function="GetTMDBRatingsByIdChain">$$2</chain>" dest="6+"> - <expression/> - </RegExp> - <expression>IMDb</expression> - </RegExp> - <RegExp input="$INFO[RatingS]" output="<chain function="GetTMDBRatingsByIdAsDefChain">$$2</chain>$$7" dest="5+"> - <RegExp input="$11" conditional="imdbanyway" output="<chain function="GetIMDBRatingsById">$$11</chain>" dest="7"> - <expression>(.+)</expression> - </RegExp> - <expression>TMDb</expression> + <RegExp input="$$11|$INFO[RatingS]|default|$INFO[imdbanyway]" output="<chain function="GetIMDBRatingsById">$$11\1</chain>" dest="5+"> + <expression>tt[0-9]+\|(?:IMDb(\|default)|.*true$)</expression> + </RegExp> + <RegExp input="$INFO[RatingS]|default" output="<chain function="GetTMDBRatingsByIdChain">$$2\1</chain>" dest="5+"> + <expression>TMDb(\|default)|.*</expression> </RegExp> <RegExp input="$$2" output="<chain function="GetTMDBStudioByIdChain">$$2</chain>" dest="5+"> <expression /> |