sync with scrapers git

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

diff --git a/addons/metadata.artists.allmusic.com/addon.xml b/addons/metadata.artists.allmusic.com/addon.xml
index 73cae08..7e2b034 100644 (file)
--- a/addons/metadata.artists.allmusic.com/addon.xml
+++ b/addons/metadata.artists.allmusic.com/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.artists.allmusic.com"
        name="AllMusic"
-       version="2.0.0"
+       version="2.0.2"
        provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>

diff --git a/addons/metadata.artists.allmusic.com/allmusic.xml b/addons/metadata.artists.allmusic.com/allmusic.xml
index bba49f9..eb26034 100644 (file)
--- a/addons/metadata.artists.allmusic.com/allmusic.xml
+++ b/addons/metadata.artists.allmusic.com/allmusic.xml
@@ -12,8 +12,23 @@
        </CreateArtistSearchUrl>
        <GetArtistSearchResults dest="8">
                <RegExp input="$$5" output="&lt;results&gt;\1&lt;/results&gt;" dest="8">
-                       <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\1&lt;/title&gt;&lt;url cache=&quot;am-$$2-artist.html&quot;&gt;http://www.allmusic.com/artist/\2&lt;/url&gt;&lt;/entity&gt;" dest="5">
-                               <expression repeat="yes" noclean="1">&lt;meta name=&quot;title&quot; content=&quot;([^&quot;]*)&quot;.*?&lt;a href="http://www.allmusic.com/artist/([^/]*)/discography&quot;</expression>
+                       <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\1&lt;/title&gt;&lt;url cache=&quot;am-$$2-artist.html&quot;&gt;http://www.allmusic.com/artist/\2&lt;/url&gt;&lt;/entity&gt;" dest="9">
+                               <expression noclean="1">&lt;meta name=&quot;title&quot; content=&quot;([^&quot;]*)&quot;.*?&lt;a href="http://www.allmusic.com/artist/([^/]*)/credits&quot;</expression>
+                       </RegExp>
+                       <RegExp input="$$9" output="\1" dest="5">
+                               <expression noclean="1">(.+)</expression>
+                       </RegExp>
+                       <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\1&lt;/title&gt;&lt;url cache=&quot;am-$$2-artist.html&quot;&gt;http://www.allmusic.com/artist/\2&lt;/url&gt;&lt;/entity&gt;" dest="9">
+                               <expression noclean="1">&lt;meta name=&quot;title&quot; content=&quot;([^&quot;]*)&quot;.*?&lt;a href="http://www.allmusic.com/artist/([^/]*)/biography&quot;</expression>
+                       </RegExp>
+                       <RegExp input="$$9" output="\1" dest="5">
+                               <expression noclean="1">(.+)</expression>
+                       </RegExp>
+                       <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\1&lt;/title&gt;&lt;url cache=&quot;am-$$2-artist.html&quot;&gt;http://www.allmusic.com/artist/\2&lt;/url&gt;&lt;/entity&gt;" dest="9">
+                               <expression noclean="1">&lt;meta name=&quot;title&quot; content=&quot;([^&quot;]*)&quot;.*?&lt;a href="http://www.allmusic.com/artist/([^/]*)/discography&quot;</expression>
+                       </RegExp>
+                       <RegExp input="$$9" output="\1" dest="5">
+                               <expression noclean="1">(.+)</expression>
                        </RegExp>
                        <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;genre&gt;\3&lt;/genre&gt;&lt;year&gt;\4&lt;/year&gt;&lt;url cache=&quot;am-$$2-artist.html&quot;&gt;http://www.allmusic.com/artist/\1&lt;/url&gt;&lt;/entity&gt;" dest="5+">
                                <expression repeat="yes" noclean="1,2">&lt;td&gt;&lt;a href=&quot;http://www.allmusic.com/artist/([^&quot;]*)&quot;&gt;([^&lt;]*)&lt;/a&gt;&lt;/td&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/td&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/td&gt;</expression>