aboutsummaryrefslogtreecommitdiff
path: root/addons/metadata.themoviedb.org
diff options
context:
space:
mode:
authorMartijn Kaijser <mcm.kaijser@gmail.com>2017-12-10 09:41:11 +0100
committerMartijn Kaijser <mcm.kaijser@gmail.com>2017-12-10 09:41:11 +0100
commit165723ef45ea9e9395c27a0a27b02385bdeb83eb (patch)
treef5f24a079d7e40e2d011103e353c6fbb12d82331 /addons/metadata.themoviedb.org
parent46c9aa5da2a3a6bf7ecab2d55477080e676eadd7 (diff)
[addons] sync scrapers with repo
Diffstat (limited to 'addons/metadata.themoviedb.org')
-rw-r--r--addons/metadata.themoviedb.org/addon.xml6
-rw-r--r--addons/metadata.themoviedb.org/changelog.txt16
-rw-r--r--addons/metadata.themoviedb.org/resources/settings.xml2
-rw-r--r--addons/metadata.themoviedb.org/tmdb.xml43
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="&lt;url&gt;https://api.tmdb.org/3/search/movie?api_key=6889f6089877fd092454d00edb44a84d&amp;amp;query=\1&amp;amp;year=$$4&amp;amp;language=$INFO[language]&lt;/url&gt;" dest="3">
+ <RegExp input="$$1" output="&lt;url&gt;https://api.tmdb.org/3/search/movie?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;amp;query=\1&amp;amp;year=$$4&amp;amp;language=$INFO[language]&lt;/url&gt;" 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="&lt;details&gt;&lt;url&gt;https://api.tmdb.org/3/movie/\2?api_key=6889f6089877fd092454d00edb44a84d&amp;amp;language=$INFO[language]&lt;/url&gt;&lt;id&gt;\2&lt;/id&gt;&lt;/details&gt;" dest="3">
+ <RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;https://api.tmdb.org/3/movie/\2?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;amp;language=$INFO[language]&lt;/url&gt;&lt;id&gt;\2&lt;/id&gt;&lt;/details&gt;" dest="3">
<expression clear="yes" noclean="1">(themoviedb.org/movie/)([0-9]*)</expression>
</RegExp>
- <RegExp input="$$1" output="&lt;details&gt;&lt;url cache=&quot;tmdb-$INFO[language]-tt\1.json&quot;&gt;https://api.tmdb.org/3/movie/tt\1?api_key=6889f6089877fd092454d00edb44a84d&amp;amp;language=$INFO[language]&lt;/url&gt;&lt;id&gt;tt\1&lt;/id&gt;&lt;/details&gt;" dest="3">
+ <RegExp input="$$1" output="&lt;details&gt;&lt;url cache=&quot;tmdb-$INFO[language]-tt\1.json&quot;&gt;https://api.tmdb.org/3/movie/tt\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;amp;language=$INFO[language]&lt;/url&gt;&lt;id&gt;tt\1&lt;/id&gt;&lt;/details&gt;" dest="3">
<expression>imdb....?/title/tt([0-9]+)</expression>
</RegExp>
- <RegExp input="$$1" output="&lt;details&gt;&lt;url cache=&quot;tmdb-$INFO[language]-tt\1.json&quot;&gt;https://api.tmdb.org/3/movie/tt\1?api_key=6889f6089877fd092454d00edb44a84d&amp;amp;language=$INFO[language]&lt;/url&gt;&lt;id&gt;tt\1&lt;/id&gt;&lt;/details&gt;" dest="3">
+ <RegExp input="$$1" output="&lt;details&gt;&lt;url cache=&quot;tmdb-$INFO[language]-tt\1.json&quot;&gt;https://api.tmdb.org/3/movie/tt\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;amp;language=$INFO[language]&lt;/url&gt;&lt;id&gt;tt\1&lt;/id&gt;&lt;/details&gt;" dest="3">
<expression>imdb....?/Title\?t{0,2}([0-9]+)</expression>
</RegExp>
</NfoUrl>
<GetSearchResults dest="8">
<RegExp input="$$3" output="&lt;results&gt;\1&lt;/results&gt;" dest="8">
- <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\3&lt;/title&gt;&lt;id&gt;\2&lt;/id&gt;&lt;year&gt;\1&lt;/year&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\2.json&quot;&gt;https://api.tmdb.org/3/movie/\2?api_key=6889f6089877fd092454d00edb44a84d&amp;amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3">
+ <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\3&lt;/title&gt;&lt;id&gt;\2&lt;/id&gt;&lt;year&gt;\1&lt;/year&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\2.json&quot;&gt;https://api.tmdb.org/3/movie/\2?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3">
<expression repeat="yes">&quot;release_date&quot;:&quot;([0-9]+)-.*?&quot;id&quot;:([0-9]*),&quot;original_title&quot;:&quot;[^&quot;]*&quot;,&quot;original_language&quot;:&quot;[^&quot;]*&quot;,&quot;title&quot;:&quot;([^&quot;]*)&quot;</expression>
</RegExp>
- <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\3&lt;/title&gt;&lt;id&gt;\2&lt;/id&gt;&lt;year&gt;\1&lt;/year&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\2.json&quot;&gt;https://api.tmdb.org/3/movie/\2?api_key=6889f6089877fd092454d00edb44a84d&amp;amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3+">
+ <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\3&lt;/title&gt;&lt;id&gt;\2&lt;/id&gt;&lt;year&gt;\1&lt;/year&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\2.json&quot;&gt;https://api.tmdb.org/3/movie/\2?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3+">
<expression repeat="yes">&quot;release_date&quot;:&quot;([0-9]+)-.*?&quot;id&quot;:([0-9]*),&quot;original_title&quot;:&quot;([^&quot;]*)&quot;,&quot;original_language&quot;:&quot;[^&quot;]*&quot;</expression>
</RegExp>
- <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;id&gt;\1&lt;/id&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;https://api.tmdb.org/3/movie/\1?api_key=6889f6089877fd092454d00edb44a84d&amp;amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3+">
+ <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;id&gt;\1&lt;/id&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;https://api.tmdb.org/3/movie/\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3+">
<expression repeat="yes">&quot;release_date&quot;:null.*?&quot;id&quot;:([0-9]*),&quot;original_title&quot;:&quot;([^&quot;]*)&quot;,&quot;original_language&quot;:&quot;[^&quot;]*&quot;</expression>
</RegExp>
- <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;id&gt;\1&lt;/id&gt;&lt;year&gt;\3&lt;/year&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;https://api.tmdb.org/3/movie/\1?api_key=6889f6089877fd092454d00edb44a84d&amp;amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3+">
+ <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;id&gt;\1&lt;/id&gt;&lt;year&gt;\3&lt;/year&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;https://api.tmdb.org/3/movie/\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3+">
<expression repeat="yes">&quot;id&quot;:([0-9]*).*?title&quot;:&quot;[^&quot;]*&quot;.*?original_title&quot;:&quot;([^&quot;]*)&quot;.*?&quot;release_date&quot;:&quot;([0-9]+)-</expression>
</RegExp>
- <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;id&gt;\1&lt;/id&gt;&lt;year&gt;\3&lt;/year&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;https://api.tmdb.org/3/movie/\1?api_key=6889f6089877fd092454d00edb44a84d&amp;amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3+">
+ <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;id&gt;\1&lt;/id&gt;&lt;year&gt;\3&lt;/year&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;https://api.tmdb.org/3/movie/\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3+">
<expression repeat="yes">&quot;id&quot;:([0-9]*).*?title&quot;:&quot;([^&quot;]*)&quot;.*?original_title&quot;:&quot;[^&quot;]*&quot;.*?&quot;release_date&quot;:&quot;([0-9]+)-</expression>
</RegExp>
- <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;id&gt;\1&lt;/id&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;https://api.tmdb.org/3/movie/\1?api_key=6889f6089877fd092454d00edb44a84d&amp;amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3+">
+ <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;id&gt;\1&lt;/id&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;https://api.tmdb.org/3/movie/\1?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3+">
<expression repeat="yes">&quot;id&quot;:([0-9]*).*?title&quot;:&quot;([^&quot;]*)&quot;.*?original_title&quot;:&quot;[^&quot;]*&quot;.*?&quot;release_date&quot;:null</expression>
</RegExp>
<expression noclean="1" />
@@ -44,7 +44,7 @@
</GetSearchResults>
<GetDetails dest="3">
<RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="3">
- <RegExp input="$$1" output="&lt;uniqueid type=&quot;themoviedb&quot; default=&quot;true&quot;&gt;$$2&lt;/uniqueid&gt;" dest="5">
+ <RegExp input="$$1" output="&lt;uniqueid type=&quot;tmdb&quot; default=&quot;true&quot;&gt;$$2&lt;/uniqueid&gt;" 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">&quot;runtime&quot;:([0-9]+)</expression>
</RegExp>
- <RegExp input="$$10" output="&lt;url function=&quot;ParseFallbackTMDBRuntime&quot; cache=&quot;tmdb-en-$$2.json&quot;&gt;https://api.tmdb.org/3/movie/$$2?api_key=6889f6089877fd092454d00edb44a84d&amp;amp;language=en&lt;/url&gt;" dest="5+">
+ <RegExp input="$$10" output="&lt;url function=&quot;ParseFallbackTMDBRuntime&quot; cache=&quot;tmdb-en-$$2.json&quot;&gt;https://api.tmdb.org/3/movie/$$2?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;amp;language=en&lt;/url&gt;" dest="5+">
<expression>^$</expression>
</RegExp>
<RegExp input="$$10" output="&lt;runtime&gt;\1&lt;/runtime&gt;" dest="5+">
<expression>(.+)</expression>
</RegExp>
- <RegExp input="$INFO[RatingS]" output="$$6" dest="5+">
- <RegExp input="$$11" output="&lt;chain function=&quot;GetIMDBRatingsByIdAsDef&quot;&gt;\1&lt;/chain&gt;" dest="6">
- <expression>(.+)</expression>
- </RegExp>
- <RegExp input="" output="&lt;chain function=&quot;GetTMDBRatingsByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="6+">
- <expression/>
- </RegExp>
- <expression>IMDb</expression>
- </RegExp>
- <RegExp input="$INFO[RatingS]" output="&lt;chain function=&quot;GetTMDBRatingsByIdAsDefChain&quot;&gt;$$2&lt;/chain&gt;$$7" dest="5+">
- <RegExp input="$11" conditional="imdbanyway" output="&lt;chain function=&quot;GetIMDBRatingsById&quot;&gt;$$11&lt;/chain&gt;" dest="7">
- <expression>(.+)</expression>
- </RegExp>
- <expression>TMDb</expression>
+ <RegExp input="$$11|$INFO[RatingS]|default|$INFO[imdbanyway]" output="&lt;chain function=&quot;GetIMDBRatingsById&quot;&gt;$$11\1&lt;/chain&gt;" dest="5+">
+ <expression>tt[0-9]+\|(?:IMDb(\|default)|.*true$)</expression>
+ </RegExp>
+ <RegExp input="$INFO[RatingS]|default" output="&lt;chain function=&quot;GetTMDBRatingsByIdChain&quot;&gt;$$2\1&lt;/chain&gt;" dest="5+">
+ <expression>TMDb(\|default)|.*</expression>
</RegExp>
<RegExp input="$$2" output="&lt;chain function=&quot;GetTMDBStudioByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
<expression />