sync with scraper git

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

diff --git a/addons/metadata.artists.allmusic.com/addon.xml b/addons/metadata.artists.allmusic.com/addon.xml
index eb40a09..2b4f9ab 100644 (file)
--- a/addons/metadata.artists.allmusic.com/addon.xml
+++ b/addons/metadata.artists.allmusic.com/addon.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.artists.allmusic.com"
        name="AllMusic"
-       version="1.0.6"
+       version="1.0.7"
        provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
     <import addon="metadata.common.last.fm" version="1.0"/>
     <import addon="metadata.common.allmusic.com" version="1.0"/>
-    <import addon="metadata.common.htbackdrops.com" version="1.0"/>
+    <import addon="metadata.common.htbackdrops.com" version="1.0.5"/>
   </requires>
   <extension point="xbmc.metadata.scraper.artists"
              language="en"

diff --git a/addons/metadata.artists.allmusic.com/allmusic.xml b/addons/metadata.artists.allmusic.com/allmusic.xml
index 8dc0126..4ad7674 100644 (file)
--- a/addons/metadata.artists.allmusic.com/allmusic.xml
+++ b/addons/metadata.artists.allmusic.com/allmusic.xml
@@ -23,12 +23,12 @@
        </GetArtistSearchResults>
        <GetArtistDetails dest="3">
                <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="3">
-                       <RegExp input="$$1" output="&lt;url cache=&quot;am-$$2-artist.html&quot; function=&quot;ParseAMGArtist&quot;&gt;http://www.allmusic.com/cg/amg.dll?p=amg&amp;amp;sql=\1&lt;/url&gt;" dest="5">
-                               <expression noclean="1">sql=([^&quot;]*)&quot;&gt;Biography</expression>
-                       </RegExp>
-                       <RegExp input="$$2" conditional="htbthumbs" output="&lt;chain function=&quot;GetHTBThumbs&quot;&gt;1&lt;/chain&gt;" dest="5+">
+                       <RegExp input="$$2" conditional="htbthumbs" output="&lt;chain function=&quot;GetHTBThumbs&quot;&gt;\1&lt;/chain&gt;" dest="5">
                                <expression/>
                        </RegExp>
+                       <RegExp input="$$1" output="&lt;url cache=&quot;am-$$2-artist.html&quot; function=&quot;ParseAMGArtist&quot;&gt;http://www.allmusic.com/cg/amg.dll?p=amg&amp;amp;sql=\1&lt;/url&gt;" dest="5+">
+                               <expression noclean="1">sql=([^&quot;]*)&quot;&gt;Biography</expression>
+                       </RegExp>
                        <RegExp input="$$2" conditional="lastfmartistthumbs" output="&lt;chain function=&quot;GetLastFMArtistThumbs&quot;&gt;\1&lt;/chain&gt;" dest="5+">
                                <expression/>
                        </RegExp>

diff --git a/addons/metadata.common.htbackdrops.com/addon.xml b/addons/metadata.common.htbackdrops.com/addon.xml
index 22bd8c3..dd8af20 100644 (file)
--- a/addons/metadata.common.htbackdrops.com/addon.xml
+++ b/addons/metadata.common.htbackdrops.com/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.common.htbackdrops.com"
        name="HTBackdrops"
-       version="1.0.4"
+       version="1.0.5"
        provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>

diff --git a/addons/metadata.common.htbackdrops.com/htbackdrops.xml b/addons/metadata.common.htbackdrops.com/htbackdrops.xml
index bd717a8..3c8f303 100644 (file)
--- a/addons/metadata.common.htbackdrops.com/htbackdrops.xml
+++ b/addons/metadata.common.htbackdrops.com/htbackdrops.xml
@@ -1,26 +1,26 @@
 <scraperfunctions>
        <GetHTBThumbs dest="5">
-               <RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseHTBThumbs&quot; post=&quot;yes&quot;&gt;http://www.htbackdrops.com/search.php?search_terms=all&amp;amp;search_keywords=\1&lt;/url&lt;/details&gt;" dest="5">
-                       <expression noclean="1"/>
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseHTBThumbs&quot; post=&quot;yes&quot;&gt;http://htbackdrops.com/api/7681a907c805e0670330c694e788e8e8/searchXML?keywords=\1&amp;default_operator=and&amp;aid=5&lt;/url&gt;/details&gt;" dest="5">
+                       <expression noclean="1" />
                </RegExp>
        </GetHTBThumbs>
        <ParseHTBThumbs dest="5">
                <RegExp input="$$13" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
-                       <RegExp input="$$1" output="&lt;thumb preview=&quot;http://www.htbackdrops.com/data/thumbnails/\2&quot;&gt;http://www.htbackdrops.com/data/media/\2&lt;/thumb&gt;" dest="13">
-                               <expression noclean="1" repeat="yes">&lt;td.*?mode=search(&amp;amp;sessionid=[^&quot;]*)?&quot;&gt;&lt;img src=&quot;./data/thumbnails/([^&quot;]+)&quot;.*?&lt;br&gt;Music Artist Thumbnails&lt;br&gt;.*?&lt;/td&gt;</expression>
+                       <RegExp input="$$1" output="&lt;thumb preview=&quot;http://www.htbackdrops.com/api/7681a907c805e0670330c694e788e8e8/download/\1/thumbnail&quot;&gt;http://www.htbackdrops.com/api/7681a907c805e0670330c694e788e8e8/download/\1/fullsize&lt;/thumb&gt;" dest="13">
+                               <expression repeat="yes" noclean="1">&lt;id&gt;([^&lt;]+)</expression>
                        </RegExp>
                        <expression noclean="1">(.+)</expression>
                </RegExp>
        </ParseHTBThumbs>
        <GetHTBFanart dest="5">
-               <RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseHTBFanart&quot; post=&quot;yes&quot;&gt;http://www.htbackdrops.com/search.php?search_terms=all&amp;amp;search_keywords=\1&lt;/url&gt;lt;/details&gt;" dest="5">
-                       <expression noclean="1"/>
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseHTBFanart&quot; post=&quot;yes&quot;&gt;http://htbackdrops.com/api/7681a907c805e0670330c694e788e8e8/searchXML?keywords=\1&amp;default_operator=and&amp;aid=1&lt;/url&gt;/details&gt;" dest="5">
+                       <expression noclean="1" />
                </RegExp>
        </GetHTBFanart>
        <ParseHTBFanart dest="5">
                <RegExp input="$$13" output="&lt;details&gt;&lt;fanart url=&quot;http://www.htbackdrops.com/&quot;&gt;\1&lt;/fanart&gt;&lt;/details&gt;" dest="5">
-                       <RegExp input="$$1" output="&lt;thumb preview=&quot;data/thumbnails/\2&quot;&gt;data/media/\2&lt;/thumb&gt;" dest="13">
-                               <expression noclean="1" repeat="yes">&lt;td.*?mode=search(&amp;amp;sessionid=[^&quot;]*)?&quot;&gt;&lt;img src=&quot;./data/thumbnails/([^&quot;]+)&quot;.*?&lt;br&gt;Music Artist Backdrops&lt;br&gt;.*?&lt;/td&gt;</expression>
+                       <RegExp input="$$1" output="&lt;thumb preview=&quot;api/7681a907c805e0670330c694e788e8e8/download/\1/thumbnail&quot;&gt;api/7681a907c805e0670330c694e788e8e8/download/\1/fullsize&lt;/thumb&gt;" dest="13">
+                               <expression repeat="yes" noclean="1">&lt;id&gt;([^&lt;]+)</expression>
                        </RegExp>
                        <expression noclean="1">(.+)</expression>
                </RegExp>