sync: tmdb with addons repo

3 files changed, 35 insertions, 34 deletions

diff --git a/addons/metadata.themoviedb.org/addon.xml b/addons/metadata.themoviedb.org/addon.xml
index add0461534..3b2d65ca76 100644
--- a/addons/metadata.themoviedb.org/addon.xml
+++ b/addons/metadata.themoviedb.org/addon.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.themoviedb.org"
        name="The MovieDB"
-       version="3.0.2"
+       version="3.0.9"
        provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
-    <import addon="metadata.common.themoviedb.org" version="2.1.0"/>
+    <import addon="metadata.common.themoviedb.org" version="2.1.2"/>
     <import addon="metadata.common.hdtrailers.net" version="1.0.7"/>
-    <import addon="metadata.common.imdb.com" version="2.1.5"/>
-    <import addon="plugin.video.youtube" version="2.1.0" optional="true"/>
+    <import addon="metadata.common.imdb.com" version="2.1.9"/>
+    <import addon="plugin.video.youtube" version="2.1.4" optional="true"/>
   </requires>
   <extension point="xbmc.metadata.scraper.movies"
              language="en"
diff --git a/addons/metadata.themoviedb.org/changelog.txt b/addons/metadata.themoviedb.org/changelog.txt
index ad99a7687c..1386211adc 100644
--- a/addons/metadata.themoviedb.org/changelog.txt
+++ b/addons/metadata.themoviedb.org/changelog.txt
@@ -1,3 +1,24 @@
+[B]3.0.9[/B]
+- fixed: missing language parameter name in NfoUrl
+
+[B]3.0.8[/B]
+- fixed: movies without release date won't find
+
+[B]3.0.7[/B]
+- fixed: keep originaltitle; IMDb ID; remove TMDb title fallback, because it became obsolate
+
+[B]3.0.6[/B]
+- updated chinese translation
+
+[B]3.0.5[/B]
+- reverted latest change
+
+[B]3.0.4[/B]
+- added: option to not scrape sets
+
+[B]3.0.3[/B]
+- fixed: plot outline includes trash on some movies
+
 [B]3.0.2[/B]
 - fixed: imdb IDs not properly handled
 
diff --git a/addons/metadata.themoviedb.org/tmdb.xml b/addons/metadata.themoviedb.org/tmdb.xml
index ae478630d3..a60cf39580 100644
--- a/addons/metadata.themoviedb.org/tmdb.xml
+++ b/addons/metadata.themoviedb.org/tmdb.xml
@@ -9,13 +9,13 @@
 		</RegExp>
 	</CreateSearchUrl>
 	<NfoUrl dest="3">
-		<RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/\2?api_key=57983e31fb435df4df77afb854740ea9&amp;$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;http://api.themoviedb.org/3/movie/\2?api_key=57983e31fb435df4df77afb854740ea9&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&gt;http://api.themoviedb.org/3/movie/tt\1?api_key=57983e31fb435df4df77afb854740ea9&amp;$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&gt;http://api.themoviedb.org/3/movie/tt\1?api_key=57983e31fb435df4df77afb854740ea9&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&gt;http://api.themoviedb.org/3/movie/tt\1?api_key=57983e31fb435df4df77afb854740ea9&amp;$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&gt;http://api.themoviedb.org/3/movie/tt\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;id&gt;tt\1&lt;/id&gt;&lt;/details&gt;" dest="3">
 			<expression>imdb....?/Title\?([0-9]*)</expression>
 		</RegExp>
 	</NfoUrl>
@@ -27,6 +27,9 @@
 			<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;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3+">
 				<expression repeat="yes">&quot;id&quot;:([0-9]*),&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;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3+">
+				<expression repeat="yes">&quot;id&quot;:([0-9]*),&quot;original_title&quot;:&quot;([^&quot;]*)&quot;,&quot;release_date&quot;:null</expression>
+			</RegExp>
 			<expression noclean="1" />
 		</RegExp>
 	</GetSearchResults>
@@ -35,24 +38,18 @@
 			<RegExp input="$$1" output="&lt;id&gt;\1&lt;/id&gt;" dest="5">
 				<expression noclean="1">&quot;id&quot;:([0-9]*),&quot;imdb</expression>
 			</RegExp>
-			<RegExp input="$$1" output="&lt;id&gt;tt\1&lt;/id&gt;" dest="5+">
+			<RegExp input="$$1" output="&lt;id&gt;\1&lt;/id&gt;" dest="5+">
 				<expression clear="yes" noclean="1">&quot;id&quot;:[0-9]*,&quot;imdb_id&quot;:&quot;([^&quot;]*)</expression>
 			</RegExp>
 			<RegExp input="$$1" output="\1" dest="9">
 				<expression fixchars="1">&quot;original_title&quot;:&quot;([^&quot;]*)</expression>
 			</RegExp>
-			<RegExp input="$$1" output="\1" dest="10">
-				<expression fixchars="1">&quot;title&quot;:&quot;([^&quot;]*)</expression>
-			</RegExp>
-			<RegExp input="$$10" output="&lt;url function=&quot;ParseFallbackTMDBTitle&quot; cache=&quot;tmdb-en-$$2.json&quot;&gt;http://api.themoviedb.org/3/movie/$$2?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en&lt;/url&gt;" dest="5+">
-				<expression>^$</expression>
-			</RegExp>
-			<RegExp input="$$10" output="&lt;title&gt;\1&lt;/title&gt;" dest="5+">
-				<expression>(.+)</expression>
-			</RegExp>
 			<RegExp conditional="keeporiginaltitle" input="$$9" output="&lt;title&gt;\1&lt;/title&gt;" dest="5+">
 				<expression/>
 			</RegExp>
+			<RegExp input="$$1" output="&lt;title&gt;\1&lt;/title&gt;" dest="5+">
+				<expression fixchars="1">&quot;title&quot;:&quot;([^&quot;]*)</expression>
+			</RegExp>
 			<RegExp input="$$9" output="&lt;originaltitle&gt;\1&lt;/originaltitle&gt;" dest="5+">
 				<expression/>
 			</RegExp>
@@ -149,23 +146,6 @@
 			<expression noclean="1" />
 		</RegExp>
 	</GetDetails>
-	<ParseFallbackTMDBTitle dest="5">
-		<RegExp input="$$10" output="&lt;details&gt;&lt;title&gt;\1&lt;/title&gt;&lt;/details&gt;" dest="5">
-			<RegExp input="$$1" output="\1" dest="11">
-				<expression clear="yes" fixchars="1">&quot;original_title&quot;:&quot;([^&quot;]*)</expression>
-			</RegExp>
-			<RegExp input="$$11" output="\1" dest="10">
-				<expression>(.+)</expression>
-			</RegExp>
-			<RegExp input="$$1" output="\1" dest="11">
-				<expression fixchars="1">&quot;title&quot;:&quot;([^&quot;]*)</expression>
-			</RegExp>
-			<RegExp input="$$11" output="\1" dest="10">
-				<expression>(.+)</expression>
-			</RegExp>
-			<expression noclean="1" />
-		</RegExp>
-	</ParseFallbackTMDBTitle>
 	<ParseFallbackTMDBRuntime dest="5">
 		<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
 			<RegExp input="$$1" output="&lt;runtime&gt;\1&lt;/runtime&gt;" dest="2">