diff options
| author | Kolja Lampe <razzeee@gmail.com> | 2017-11-09 16:36:15 +0100 |
|---|---|---|
| committer | Kolja Lampe <razzeee@gmail.com> | 2017-11-09 16:36:15 +0100 |
| commit | 16701e2b5d6673b094fbdf700e435e3a7177f238 (patch) | |
| tree | a1b62491be3daca9e72c7379dd6b74850954c2bb /addons/metadata.themoviedb.org | |
| parent | 2a89e2d9babe5134fd9d6ef9cd9c4b0089ab4d23 (diff) | |
Sync scrapers
Diffstat (limited to 'addons/metadata.themoviedb.org')
7 files changed, 72 insertions, 39 deletions
diff --git a/addons/metadata.themoviedb.org/addon.xml b/addons/metadata.themoviedb.org/addon.xml index b44bb32284..a45818e004 100644 --- a/addons/metadata.themoviedb.org/addon.xml +++ b/addons/metadata.themoviedb.org/addon.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.themoviedb.org" name="The Movie Database" - version="3.9.5" + version="4.0.1" provider-name="Team Kodi"> <requires> <import addon="xbmc.metadata" version="2.1.0"/> diff --git a/addons/metadata.themoviedb.org/changelog.txt b/addons/metadata.themoviedb.org/changelog.txt index a179fae878..6e9b28ec22 100644 --- a/addons/metadata.themoviedb.org/changelog.txt +++ b/addons/metadata.themoviedb.org/changelog.txt @@ -1,3 +1,10 @@ +[B]4.0.1[/B] +-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 + [B]3.9.4[/B] - Fixed after API layout changes diff --git a/addons/metadata.themoviedb.org/resources/language/English (New Zealand)/strings.po b/addons/metadata.themoviedb.org/resources/language/English (New Zealand)/strings.po index 065c74f1a8..9cd97f6c36 100644 --- a/addons/metadata.themoviedb.org/resources/language/English (New Zealand)/strings.po +++ b/addons/metadata.themoviedb.org/resources/language/English (New Zealand)/strings.po @@ -9,37 +9,41 @@ msgstr "" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Kodi Translation Team\n" -"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/xbmc-addons/language/en_NZ/)\n" +"Language-Team: English (http://www.transifex.com/projects/p/xbmc-addons/language/en/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_NZ\n" +"Language: en\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgctxt "#30000" msgid "Enable Fanart" -msgstr "Enable Fanart" +msgstr "" msgctxt "#30001" msgid "Prefer Trailer from HD-Trailers.net" -msgstr "Prefer Trailer from HD-Trailers.net" +msgstr "" msgctxt "#30002" msgid "Preferred Language" -msgstr "Preferred Language" +msgstr "" msgctxt "#30003" -msgid "Get Rating from" -msgstr "Get Rating from" +msgid "Default Rating from" +msgstr "" msgctxt "#30004" msgid "Enable Trailer (YouTube)" -msgstr "Enable Trailer (YouTube)" +msgstr "" msgctxt "#30005" msgid "Keep Original Title" -msgstr "Keep Original Title" +msgstr "" msgctxt "#30006" msgid "Preferred Certification Country" -msgstr "Preferred Certification Country" +msgstr "" + +msgctxt "#30007" +msgid "Add also IMDb ratings" +msgstr "" diff --git a/addons/metadata.themoviedb.org/resources/language/English (US)/strings.po b/addons/metadata.themoviedb.org/resources/language/English (US)/strings.po index d6cd284953..9cd97f6c36 100644 --- a/addons/metadata.themoviedb.org/resources/language/English (US)/strings.po +++ b/addons/metadata.themoviedb.org/resources/language/English (US)/strings.po @@ -9,33 +9,41 @@ msgstr "" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Kodi Translation Team\n" -"Language-Team: English (US) (http://www.transifex.com/projects/p/xbmc-addons/language/en_US/)\n" +"Language-Team: English (http://www.transifex.com/projects/p/xbmc-addons/language/en/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_US\n" +"Language: en\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgctxt "#30000" msgid "Enable Fanart" -msgstr "Enable Fanart" +msgstr "" + +msgctxt "#30001" +msgid "Prefer Trailer from HD-Trailers.net" +msgstr "" msgctxt "#30002" msgid "Preferred Language" -msgstr "Preferred Language" +msgstr "" msgctxt "#30003" -msgid "Get Rating from" -msgstr "Get Rating from" +msgid "Default Rating from" +msgstr "" msgctxt "#30004" msgid "Enable Trailer (YouTube)" -msgstr "Enable Trailer (YouTube)" +msgstr "" msgctxt "#30005" msgid "Keep Original Title" -msgstr "Keep Original Title" +msgstr "" msgctxt "#30006" msgid "Preferred Certification Country" -msgstr "Preferred Certification Country" +msgstr "" + +msgctxt "#30007" +msgid "Add also IMDb ratings" +msgstr "" diff --git a/addons/metadata.themoviedb.org/resources/language/English/strings.po b/addons/metadata.themoviedb.org/resources/language/English/strings.po index af7124469d..9cd97f6c36 100644 --- a/addons/metadata.themoviedb.org/resources/language/English/strings.po +++ b/addons/metadata.themoviedb.org/resources/language/English/strings.po @@ -29,7 +29,7 @@ msgid "Preferred Language" msgstr "" msgctxt "#30003" -msgid "Get Rating from" +msgid "Default Rating from" msgstr "" msgctxt "#30004" @@ -43,3 +43,7 @@ msgstr "" msgctxt "#30006" msgid "Preferred Certification Country" msgstr "" + +msgctxt "#30007" +msgid "Add also IMDb ratings" +msgstr "" diff --git a/addons/metadata.themoviedb.org/resources/settings.xml b/addons/metadata.themoviedb.org/resources/settings.xml index e59a57950d..2b67ec3725 100644 --- a/addons/metadata.themoviedb.org/resources/settings.xml +++ b/addons/metadata.themoviedb.org/resources/settings.xml @@ -6,5 +6,6 @@ <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="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"/> <setting label="certprefix" type="text" id="certprefix" default="Rated " visible="false"/> </settings> diff --git a/addons/metadata.themoviedb.org/tmdb.xml b/addons/metadata.themoviedb.org/tmdb.xml index d01627671d..bb793ed31f 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>http://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=6889f6089877fd092454d00edb44a84d&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>http://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=6889f6089877fd092454d00edb44a84d&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">http://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=6889f6089877fd092454d00edb44a84d&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">http://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=6889f6089877fd092454d00edb44a84d&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">http://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=6889f6089877fd092454d00edb44a84d&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">http://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=6889f6089877fd092454d00edb44a84d&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">http://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=6889f6089877fd092454d00edb44a84d&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">http://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=6889f6089877fd092454d00edb44a84d&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">http://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=6889f6089877fd092454d00edb44a84d&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">http://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=6889f6089877fd092454d00edb44a84d&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,12 +44,15 @@ </GetSearchResults> <GetDetails dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> - <RegExp input="$$1" output="<id>\1</id>" dest="5"> - <expression noclean="1">"id":([0-9]*),"imdb</expression> + <RegExp input="$$1" output="<uniqueid type="themoviedb" default="true">$$2</uniqueid>" dest="5"> + <expression/> </RegExp> - <RegExp input="$$1" output="<id>\1</id>" dest="5+"> + <RegExp input="$$1" output="\1" dest="11"> <expression clear="yes" noclean="1">"id":[0-9]*,"imdb_id":"([^"]*)</expression> </RegExp> + <RegExp input="$$11" output="<uniqueid type="imdb">\1</uniqueid>" dest="5+"> + <expression>(.+)</expression> + </RegExp> <RegExp input="$$1" output="\1" dest="9"> <expression fixchars="1">"original_title":"([^"]*)</expression> </RegExp> @@ -71,19 +74,25 @@ <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">http://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=6889f6089877fd092454d00edb44a84d&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="<chain function="GetIMDBRatingById">$$6</chain>" dest="5+"> - <RegExp input="$$1" output="\1" dest="6"> - <expression noclean="1">"id":[0-9]*,"imdb_id":"([^"]*)</expression> + <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="GetTMDBRatingByIdChain">$$2</chain>" dest="5+"> + <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> <RegExp input="$$2" output="<chain function="GetTMDBStudioByIdChain">$$2</chain>" dest="5+"> |