The branch, eden has been updated
       via  35fd4974d7740a474cc0feacc6cb4d7c52555fc8 (commit)
      from  d22739e8132046345b8d7dd6a68b33fad2170f91 (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=35fd4974d7740a474cc0feacc6cb4d7c52555fc8

commit 35fd4974d7740a474cc0feacc6cb4d7c52555fc8
Author: olympia <[email protected]>
Date:   Wed Apr 18 17:41:09 2012 +0200

    [metadata.themoviedb.org] updated to version 3.2.0

diff --git a/metadata.common.themoviedb.org/addon.xml 
b/metadata.common.themoviedb.org/addon.xml
index b04329d..0a6dee4 100644
--- a/metadata.common.themoviedb.org/addon.xml
+++ b/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 MovieDB common scraper functions"
-       version="2.1.5"
+       version="2.1.6"
        provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.common.themoviedb.org/tmdb.xml 
b/metadata.common.themoviedb.org/tmdb.xml
index d8e85bf..6712767 100644
--- a/metadata.common.themoviedb.org/tmdb.xml
+++ b/metadata.common.themoviedb.org/tmdb.xml
@@ -2,7 +2,7 @@
 
        <GetTMDBCertificationsByIdChain dest="4">
                <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="4">
-                       <RegExp input="$$1" output="&lt;url 
function=&quot;ParseTMDBCertifications&quot; 
cache=&quot;tmdb-cert-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1/releases?api_key=57983e31fb435df4df77afb854740ea9&lt;/url&gt;";
 dest="5">
+                       <RegExp input="$$1" output="&lt;url 
function=&quot;ParseTMDBCertifications&quot; 
cache=&quot;tmdb-cert-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1/releases?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[tmdbcertcountry]&lt;/url&gt;";
 dest="5">
                                <expression />
                        </RegExp>
                        <expression noclean="1" />
@@ -10,8 +10,8 @@
        </GetTMDBCertificationsByIdChain>
        <ParseTMDBCertifications dest="5">
                <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
-                       <RegExp input="$$1" output="&lt;mpaa&gt;Rated 
\1&lt;/mpaa&gt;" dest="2">
-                               <expression 
fixchars="1">&quot;US&quot;,&quot;certification&quot;:&quot;([^&quot;]*)</expression>
+                       <RegExp input="$$1" 
output="&lt;mpaa&gt;$INFO[certprefix]\1&lt;/mpaa&gt;" dest="2">
+                               <expression 
fixchars="1">&quot;$INFO[tmdbcertcountry]&quot;,&quot;certification&quot;:&quot;([^&quot;]*)</expression>
                        </RegExp>
                        <expression noclean="1" />
                </RegExp>
@@ -19,7 +19,7 @@
 
        <GetTMDBTitleByIdChain dest="4">
                <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="4">
-                       <RegExp input="$$1" output="&lt;url 
function=&quot;ParseTMDBTitle&quot; 
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;";
 dest="5">
+                       <RegExp input="$$1" output="&lt;url 
function=&quot;ParseTMDBTitle&quot; 
cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[language]&lt;/url&gt;";
 dest="5">
                                <expression />
                        </RegExp>
                        <expression noclean="1" />
@@ -27,7 +27,7 @@
        </GetTMDBTitleByIdChain>
        <GetTMDBLangTitleByIdChain dest="4">
                <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="4">
-                       <RegExp input="$$1" output="&lt;url 
function=&quot;ParseTMDBTitle&quot; 
cache=&quot;tmdb-$INFO[tmdbtitlelanguage]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbtitlelanguage]&lt;/url&gt;";
 dest="5">
+                       <RegExp input="$$1" output="&lt;url 
function=&quot;ParseTMDBTitle&quot; 
cache=&quot;tmdb-$INFO[tmdbtitlelanguage]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[tmdbtitlelanguage]&lt;/url&gt;";
 dest="5">
                                <expression />
                        </RegExp>
                        <expression noclean="1" />
@@ -47,7 +47,7 @@
                        <RegExp input="$$1" output="\1" dest="8">
                                <expression clear="yes" noclean="1" />
                        </RegExp>
-                       <RegExp input="$$8" output="&lt;url 
function=&quot;ParseTMDBPlot&quot; 
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;";
 dest="5">
+                       <RegExp input="$$8" output="&lt;url 
function=&quot;ParseTMDBPlot&quot; 
cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[language]&lt;/url&gt;";
 dest="5">
                                <expression />
                        </RegExp>
                        <expression noclean="1" />
@@ -58,7 +58,7 @@
                        <RegExp input="$$1" output="\1" dest="8">
                                <expression clear="yes" noclean="1" />
                        </RegExp>
-                       <RegExp input="$$8" output="&lt;url 
function=&quot;ParseTMDBPlot&quot; 
cache=&quot;tmdb-$INFO[tmdbplotlanguage]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbplotlanguage]&lt;/url&gt;";
 dest="5">
+                       <RegExp input="$$8" output="&lt;url 
function=&quot;ParseTMDBPlot&quot; 
cache=&quot;tmdb-$INFO[tmdbplotlanguage]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[tmdbplotlanguage]&lt;/url&gt;";
 dest="5">
                                <expression />
                        </RegExp>
                        <expression noclean="1" />
@@ -69,7 +69,7 @@
                        <RegExp input="$$1" output="\1" dest="9">
                                <expression clear="yes" 
fixchars="1">&quot;overview&quot;:&quot;(.*?)&quot;,&quot;</expression>
                        </RegExp>
-                       <RegExp input="$$9" output="&lt;url 
function=&quot;ParseFallbackTMDBPlot&quot; 
cache=&quot;tmdb-en-$$8.json&quot;&gt;http://api.themoviedb.org/3/movie/$$8?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en&lt;/url&gt;";
 dest="2">
+                       <RegExp input="$$9" output="&lt;url 
function=&quot;ParseFallbackTMDBPlot&quot; 
cache=&quot;tmdb-en-$$8.json&quot;&gt;http://api.themoviedb.org/3/movie/$$8?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=en&lt;/url&gt;";
 dest="2">
                                <expression>^$</expression>
                        </RegExp>
                        <RegExp input="$$9" 
output="&lt;plot&gt;\1&lt;/plot&gt;" dest="2">
@@ -89,7 +89,7 @@
 
        <GetTMDBSetByIdChain dest="4">
                <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="4">
-                       <RegExp input="$$1" output="&lt;url 
function=&quot;ParseTMDBSet&quot; 
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;";
 dest="5">
+                       <RegExp input="$$1" output="&lt;url 
function=&quot;ParseTMDBSet&quot; 
cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[language]&lt;/url&gt;";
 dest="5">
                                <expression />
                        </RegExp>
                        <expression noclean="1" />
@@ -169,7 +169,7 @@
 
        <GetTMDBGenresByIdChain dest="4">
                <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="4">
-                       <RegExp input="$$1" output="&lt;url 
function=&quot;ParseTMDBGenres&quot; 
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;";
 dest="5">
+                       <RegExp input="$$1" output="&lt;url 
function=&quot;ParseTMDBGenres&quot; 
cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[language]&lt;/url&gt;";
 dest="5">
                                <expression />
                        </RegExp>
                        <expression noclean="1" />
@@ -189,7 +189,7 @@
 
        <GetTMDBRatingByIdChain dest="4">
                <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="4">
-                       <RegExp input="$$1" output="&lt;url 
function=&quot;ParseTMDBRating&quot; 
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;";
 dest="5">
+                       <RegExp input="$$1" output="&lt;url 
function=&quot;ParseTMDBRating&quot; 
cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[language]&lt;/url&gt;";
 dest="5">
                                <expression />
                        </RegExp>
                        <expression noclean="1" />
@@ -220,7 +220,7 @@
                        <RegExp input="$$1" output="\1" dest="7">
                                <expression clear="yes" 
noclean="1">&quot;youtube&quot;:\[{([^\]]*)</expression>
                        </RegExp>
-                       <RegExp input="$$7" 
output="&lt;trailer&gt;plugin://plugin.video.youtube/?action=play_video&amp;videoid=\1&lt;/trailer&gt;"
 dest="2">
+                       <RegExp input="$$7" 
output="&lt;trailer&gt;plugin://plugin.video.youtube/?action=play_video&amp;amp;videoid=\1&lt;/trailer&gt;"
 dest="2">
                                <expression 
noclean="1">&quot;source&quot;:&quot;([^&quot;]*)</expression>
                        </RegExp>
                        <expression noclean="1">(.+)</expression>
@@ -257,7 +257,7 @@
 
        <GetTMDBThumbsByIdChain dest="4">
                <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="4">
-                       <RegExp input="$$1" output="&lt;url 
function=&quot;ParseTMDBThumbs&quot; 
cache=&quot;tmdb-images-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;";
 dest="5">
+                       <RegExp input="$$1" output="&lt;url 
function=&quot;ParseTMDBThumbs&quot; 
cache=&quot;tmdb-images-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[language]&lt;/url&gt;";
 dest="5">
                                <expression />
                        </RegExp>
                        <expression noclean="1" />
@@ -265,7 +265,7 @@
        </GetTMDBThumbsByIdChain>
        <GetTMDBLangThumbsByIdChain dest="4">
                <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="4">
-                       <RegExp input="$$1" output="&lt;url 
function=&quot;ParseTMDBThumbs&quot; 
cache=&quot;tmdb-images-$INFO[tmdbthumblanguage]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbthumblanguage]&lt;/url&gt;";
 dest="5">
+                       <RegExp input="$$1" output="&lt;url 
function=&quot;ParseTMDBThumbs&quot; 
cache=&quot;tmdb-images-$INFO[tmdbthumblanguage]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[tmdbthumblanguage]&lt;/url&gt;";
 dest="5">
                                <expression />
                        </RegExp>
                        <expression noclean="1" />
@@ -273,7 +273,7 @@
        </GetTMDBLangThumbsByIdChain>
        <GetTMDBThumbsById dest="4">
                <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="4">
-                       <RegExp input="$$1" output="&lt;url 
function=&quot;ParseTMDBThumbs&quot; 
cache=&quot;tmdb-images-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;";
 dest="5">
+                       <RegExp input="$$1" output="&lt;url 
function=&quot;ParseTMDBThumbs&quot; 
cache=&quot;tmdb-images-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[language]&lt;/url&gt;";
 dest="5">
                                <expression />
                        </RegExp>
                        <expression noclean="1" />
diff --git a/metadata.themoviedb.org/addon.xml 
b/metadata.themoviedb.org/addon.xml
index 6cfecc7..4221aef 100644
--- a/metadata.themoviedb.org/addon.xml
+++ b/metadata.themoviedb.org/addon.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.themoviedb.org"
        name="The MovieDB"
-       version="3.1.0"
+       version="3.2.0"
        provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
-    <import addon="metadata.common.themoviedb.org" version="2.1.5"/>
+    <import addon="metadata.common.themoviedb.org" version="2.1.6"/>
     <import addon="metadata.common.hdtrailers.net" version="1.0.7"/>
     <import addon="metadata.common.imdb.com" version="2.1.9"/>
     <import addon="plugin.video.youtube" version="2.9.1" optional="true"/>
diff --git a/metadata.themoviedb.org/changelog.txt 
b/metadata.themoviedb.org/changelog.txt
index 9a51136..0d6d492 100644
--- a/metadata.themoviedb.org/changelog.txt
+++ b/metadata.themoviedb.org/changelog.txt
@@ -1,3 +1,8 @@
+[B]3.2.0[/B]
+- fixed: keep Originaltitle
+- fixed: &'s needs double escaping
+- added: option to scrape certification from selected country
+
 [B]3.1.0[/B]
 - updated: factored out title scraping to common library
 
diff --git a/metadata.themoviedb.org/resources/language/English/strings.xml 
b/metadata.themoviedb.org/resources/language/English/strings.xml
index d61eda0..cad3393 100644
--- a/metadata.themoviedb.org/resources/language/English/strings.xml
+++ b/metadata.themoviedb.org/resources/language/English/strings.xml
@@ -3,7 +3,8 @@
     <string id="30000">Enable Fanart</string>
     <string id="30004">Enable Trailer (YouTube)</string>
     <string id="30001">Prefer Trailer from HD-Trailers.net</string>
-    <string id="30002">Preferred language</string>
-    <string id="30003">Get rating from</string>
+    <string id="30002">Preferred Language</string>
+    <string id="30003">Get Rating from</string>
     <string id="30005">Keep Original Title</string>
+    <string id="30006">Preferred Certification Country</string>
 </strings>
diff --git a/metadata.themoviedb.org/resources/language/Hungarian/strings.xml 
b/metadata.themoviedb.org/resources/language/Hungarian/strings.xml
index d5e3f07..054e5a1 100644
--- a/metadata.themoviedb.org/resources/language/Hungarian/strings.xml
+++ b/metadata.themoviedb.org/resources/language/Hungarian/strings.xml
@@ -6,4 +6,5 @@
     <string id="30002">Preferált nyelv</string>
     <string id="30003">Értékelés letöltése innen</string>
     <string id="30005">Eredeti filmcím megtartása</string>
+    <string id="30006">Preferált korhatár-besorolás innen</string>
 </strings>
diff --git a/metadata.themoviedb.org/resources/settings.xml 
b/metadata.themoviedb.org/resources/settings.xml
index d711325..9f92a8e 100644
--- a/metadata.themoviedb.org/resources/settings.xml
+++ b/metadata.themoviedb.org/resources/settings.xml
@@ -5,5 +5,7 @@
     <setting label="30004" type="bool" id="trailer" default="true"/>
     <setting label="30001" type="labelenum" values="No|480p|720p|1080p" 
id="TrailerQ" default="No"/>
     <setting label="30002" type="labelenum" 
values="da|fi|nl|de|it|es|fr|pl|hu|el|tr|ru|he|ja|pt|zh|cs|sl|hr|ko|en|sv|no" 
id="language" default="en"/>
+    <setting label="30006" type="labelenum" 
values="da|fi|nl|de|it|es|fr|pl|hu|el|tr|ru|he|ja|pt|zh|cs|sl|hr|ko|us|gb|sv|no"
 id="tmdbcertcountry" default="us"/>
     <setting label="30003" type="labelenum" values="TMDb|IMDb" id="RatingS" 
default="TMDb"/>
+    <setting label="certprefix" type="text" id="certprefix" default="Rated " 
visible="false"/>
 </settings>
diff --git a/metadata.themoviedb.org/tmdb.xml b/metadata.themoviedb.org/tmdb.xml
index 45445be..c8df5a5 100644
--- a/metadata.themoviedb.org/tmdb.xml
+++ b/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;http://api.themoviedb.org/3/search/movie?api_key=57983e31fb435df4df77afb854740ea9&amp;query=\1$$4&amp;language=$INFO[language]&lt;/url&gt;";
 dest="3">
+               <RegExp input="$$1" 
output="&lt;url&gt;http://api.themoviedb.org/3/search/movie?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;query=\1$$4&amp;amp;language=$INFO[language]&lt;/url&gt;";
 dest="3">
                        <RegExp input="$$2" output="+\1" dest="4">
                                <expression clear="yes">(.+)</expression>
                        </RegExp>
@@ -9,25 +9,25 @@
                </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;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;http://api.themoviedb.org/3/movie/\2?api_key=57983e31fb435df4df77afb854740ea9&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&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">
+               <RegExp input="$$1" 
output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/tt\1?api_key=57983e31fb435df4df77afb854740ea9&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&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">
+               <RegExp input="$$1" 
output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/tt\1?api_key=57983e31fb435df4df77afb854740ea9&amp;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>
        <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;\4&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">
+                       <RegExp input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\4&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;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]+)-.*?&quot;title&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;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&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;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;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+">
+                       <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;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" />
@@ -47,7 +47,7 @@
                        <RegExp conditional="keeporiginaltitle" input="$$9" 
output="&lt;title&gt;\1&lt;/title&gt;" dest="5+">
                                <expression/>
                        </RegExp>
-                       <RegExp input="$$2" output="&lt;chain 
function=&quot;GetTMDBTitleByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
+                       <RegExp conditional="!keeporiginaltitle" input="$$2" 
output="&lt;chain 
function=&quot;GetTMDBTitleByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
                                <expression />
                        </RegExp>
                        <RegExp input="$$9" 
output="&lt;originaltitle&gt;\1&lt;/originaltitle&gt;" dest="5+">
@@ -59,7 +59,7 @@
                        <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;http://api.themoviedb.org/3/movie/$$2?api_key=57983e31fb435df4df77afb854740ea9&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;http://api.themoviedb.org/3/movie/$$2?api_key=57983e31fb435df4df77afb854740ea9&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+">
@@ -68,7 +68,7 @@
                        <RegExp input="$$1" output="\1" dest="10">
                                <expression clear="yes" 
fixchars="1">&quot;tagline&quot;:&quot;([^&quot;]*)</expression>
                        </RegExp>
-                       <RegExp input="$$10" output="&lt;url 
function=&quot;ParseFallbackTMDBTagline&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+">
+                       <RegExp input="$$10" output="&lt;url 
function=&quot;ParseFallbackTMDBTagline&quot; 
cache=&quot;tmdb-en-$$2.json&quot;&gt;http://api.themoviedb.org/3/movie/$$2?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=en&lt;/url&gt;";
 dest="5+">
                                <expression>^$</expression>
                        </RegExp>
                        <RegExp input="$$10" 
output="&lt;tagline&gt;\1&lt;/tagline&gt;" dest="5+">

-----------------------------------------------------------------------

Summary of changes:
 metadata.common.themoviedb.org/addon.xml           |    2 +-
 metadata.common.themoviedb.org/tmdb.xml            |   30 ++++++++++----------
 metadata.themoviedb.org/addon.xml                  |    4 +-
 metadata.themoviedb.org/changelog.txt              |    5 +++
 .../resources/language/English/strings.xml         |    5 ++-
 .../resources/language/Hungarian/strings.xml       |    1 +
 metadata.themoviedb.org/resources/settings.xml     |    2 +
 metadata.themoviedb.org/tmdb.xml                   |   20 ++++++------
 8 files changed, 39 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
Scrapers

------------------------------------------------------------------------------
Better than sec? Nothing is better than sec when it comes to
monitoring Big Data applications. Try Boundary one-second 
resolution app monitoring today. Free.
http://p.sf.net/sfu/Boundary-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to