sync with git

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@31616 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

diff --git a/addons/metadata.common.hdtrailers.net/addon.xml b/addons/metadata.common.hdtrailers.net/addon.xml
index 947a02d..adf7bad 100644 (file)
--- a/addons/metadata.common.hdtrailers.net/addon.xml
+++ b/addons/metadata.common.hdtrailers.net/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.common.hdtrailers.net"
        name="HD-Trailers common scraper functions"
-       version="1.0.1"
+       version="1.0.2"
        provider-name="Bence Nádas (olympia)">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>

diff --git a/addons/metadata.common.hdtrailers.net/hdtrailers.xml b/addons/metadata.common.hdtrailers.net/hdtrailers.xml
index 5adc113..1c1aadc 100644 (file)
--- a/addons/metadata.common.hdtrailers.net/hdtrailers.xml
+++ b/addons/metadata.common.hdtrailers.net/hdtrailers.xml
@@ -1,6 +1,6 @@
 <scraperfunctions>
        <GetHDTrailersnet480p dest="3">
-               <RegExp input="$$6" output="&lt;details&gt;&lt;url function=&quot;Parse480pTrailer&quot;&gt;http://www.hd-trailers.net/blog/?s=&quot;\1%20%28Theatrical%20Trailer%29%22&lt;/url&lt;/details&gt;" dest="3">
+               <RegExp input="$$6" output="&lt;details&gt;&lt;url function=&quot;Parse480pTrailer&quot;&gt;http://www.hd-trailers.net/blog/?s=&quot;\1%20%28Theatrical%20Trailer%29%22&lt;/url&gt;&lt;/details&gt;" dest="3">
                        <RegExp input="$$1" output="\1" dest="6">
                                <expression noclean="1" fixchars="1" trim="1" encode="1">(.*)</expression>
                        </RegExp>
@@ -8,7 +8,7 @@
                </RegExp>
        </GetHDTrailersnet480p>
        <GetHDTrailersnet720p dest="3">
-               <RegExp input="$$6" output="&lt;details&gt;&lt;url function=&quot;Parse720pTrailer&quot;&gt;http://www.hd-trailers.net/blog/?s=&quot;\1%20%28Theatrical%20Trailer%29%22&lt;/url&lt;/details&gt;" dest="3">
+               <RegExp input="$$6" output="&lt;details&gt;&lt;url function=&quot;Parse720pTrailer&quot;&gt;http://www.hd-trailers.net/blog/?s=&quot;\1%20%28Theatrical%20Trailer%29%22&lt;/url&gt;&lt;/details&gt;" dest="3">
                        <RegExp input="$$1" output="\1" dest="6">
                                <expression noclean="1" fixchars="1" trim="1" encode="1">(.*)</expression>
                        </RegExp>
@@ -16,7 +16,7 @@
                </RegExp>
        </GetHDTrailersnet720p>
        <GetHDTrailersnet1080p dest="3">
-               <RegExp input="$$6" output="&lt;details&gt;&lt;url function=&quot;Parse1080pTrailer&quot;&gt;http://www.hd-trailers.net/blog/?s=&quot;\1%20%28Theatrical%20Trailer%29%22&lt;/url&lt;/details&gt;" dest="3">
+               <RegExp input="$$6" output="&lt;details&gt;&lt;url function=&quot;Parse1080pTrailer&quot;&gt;http://www.hd-trailers.net/blog/?s=&quot;\1%20%28Theatrical%20Trailer%29%22&lt;/url&gt;&lt;/details&gt;" dest="3">
                        <RegExp input="$$1" output="\1" dest="6">
                                <expression noclean="1" fixchars="1" trim="1" encode="1">(.*)</expression>
                        </RegExp>

diff --git a/addons/metadata.themoviedb.org/addon.xml b/addons/metadata.themoviedb.org/addon.xml
index 4149571..39bdfe1 100644 (file)
--- 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 MovieDB"
-       version="1.0.6"
+       version="1.0.8"
        provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
     <import addon="metadata.common.themoviedb.org" version="1.0.3"/>
-    <import addon="metadata.common.hdtrailers.net" version="1.0.1"/>
+    <import addon="metadata.common.hdtrailers.net" version="1.0.2"/>
   </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 fbdd6e3..8ebf3fd 100644 (file)
--- a/addons/metadata.themoviedb.org/changelog.txt
+++ b/addons/metadata.themoviedb.org/changelog.txt
@@ -1,3 +1,9 @@
+[B]1.0.8[/B]
+- changed hdtrailers.net version dependency
+
+[B]1.0.7[/B]
+- final fix for nfourl scraping issue
+
 [B]1.0.6[/B]
 - fixed nfourl scraping issue
 

diff --git a/addons/metadata.themoviedb.org/tmdb.xml b/addons/metadata.themoviedb.org/tmdb.xml
index 7e403fa..1b36120 100644 (file)
--- a/addons/metadata.themoviedb.org/tmdb.xml
+++ b/addons/metadata.themoviedb.org/tmdb.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.1" date="2010-02-24">
+<scraper framework="1.1" date="2010-07-04">
        <CreateSearchUrl dest="3">
                <RegExp input="$$1" output="&lt;url&gt;http://api.themoviedb.org/2.1/Movie.search/en/xml/57983e31fb435df4df77afb854740ea9/\1&lt;/url&gt;" dest="3">
                        <RegExp input="$$2" output="%20(\1)" dest="4">
@@ -20,7 +20,7 @@
                </RegExp>
        </NfoUrl>
        <GetTMDBId dest="3">
-               <RegExp input="$$1" output="&lt;details&gt;&lt;url cache=&quot;tmdb-\1.xml&quot;&gt;http://api.themoviedb.org/2.1/Movie.getInfo/en/xml/57983e31fb435df4df77afb854740ea9/\1&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;&lt;/details&gt;" dest="3+">
+               <RegExp input="$$1" output="&lt;url cache=&quot;tmdb-\1.xml&quot;&gt;http://api.themoviedb.org/2.1/Movie.getInfo/en/xml/57983e31fb435df4df77afb854740ea9/\1&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;" dest="3+">
                        <expression>&lt;id&gt;([0-9]*)&lt;/id&gt;</expression>
                </RegExp>
        </GetTMDBId>