sync with scrapers git

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

2 files changed, 6 insertions, 6 deletions

diff --git a/addons/metadata.albums.allmusic.com/addon.xml b/addons/metadata.albums.allmusic.com/addon.xml
index abc705ac57..313b27f069 100644
--- a/addons/metadata.albums.allmusic.com/addon.xml
+++ b/addons/metadata.albums.allmusic.com/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.albums.allmusic.com"
        name="AllMusic"
-       version="1.8.1"
+       version="2.0.1"
        provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
diff --git a/addons/metadata.albums.allmusic.com/allmusic.xml b/addons/metadata.albums.allmusic.com/allmusic.xml
index 03f7470bc6..1e86b27435 100644
--- a/addons/metadata.albums.allmusic.com/allmusic.xml
+++ b/addons/metadata.albums.allmusic.com/allmusic.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scraper framework="1.1" date="2010-10-16">
 	<NfoUrl dest="3">
-		<RegExp input="$$1" output="&lt;url&gt;http://www.\1&lt;/url&gt;" dest="3">
-			<expression>(allmusic.com/cg/.*)</expression>
+		<RegExp input="$$1" output="&lt;url&gt;http://www.\1/review&lt;/url&gt;" dest="3">
+			<expression>(allmusic.com/album/.*)</expression>
 		</RegExp>
 	</NfoUrl>
 	<CreateAlbumSearchUrl dest="3">
@@ -27,16 +27,16 @@
 				<expression noclean="1">&lt;h1 class=&quot;title&quot;&gt;([^&lt;]*)&lt;/h1&gt;</expression>
 			</RegExp>
 			<RegExp input="$$1" output="\1" dest="3">
-				<expression noclean="1">allmusic.com/artist/[^&quot;]*&quot;&gt;([^&lt;]*)&lt;/a&gt;&lt;/div&gt;</expression>
+				<expression noclean="1">&lt;a href=&quot;http://www.allmusic.com/album/([^&quot;]*)&quot;&gt;Overview&lt;</expression>
 			</RegExp>
 			<RegExp conditional="lastfmalbumthumbs" input="$$1" output="&lt;chain function=&quot;GetLastFMAlbumThumbs&quot;&gt;\1::\2&lt;/chain&gt;" dest="5+">
 				<expression trim="1,2" encode="1,2">&lt;meta name=&quot;title&quot; content=&quot;([^-]*)- ([^&lt;]*)&quot; /&gt;</expression>
 			</RegExp>
 			<RegExp input="$$1" output="&lt;url cache=&quot;am-$$3-$$2-album.html&quot; function=&quot;ParseAMGAlbum&quot;&gt;http://www.allmusic.com/album/\1/review&lt;/url&gt;" dest="5+">
-				<expression noclean="1">allmusic.com/artist/([^&quot;]*)&quot;&gt;[^&lt;]*&lt;/a&gt;&lt;/div&gt;</expression>
+				<expression noclean="1">&lt;a href=&quot;http://www.allmusic.com/album/([^&quot;]*)&quot;&gt;Overview&lt;</expression>
 			</RegExp>
 			<RegExp input="$$1" output="&lt;url cache=&quot;am-$$3-$$2-album.html&quot; function=&quot;GetAMGReview&quot;&gt;http://www.allmusic.com/album/\1/review&lt;/url&gt;" dest="5+">
-				<expression noclean="1">allmusic.com/artist/([^&quot;]*)&quot;&gt;[^&lt;]*&lt;/a&gt;&lt;/div&gt;</expression>
+				<expression noclean="1">&lt;a href=&quot;http://www.allmusic.com/album/([^&quot;]*)&quot;&gt;Overview&lt;</expression>
 			</RegExp>
 			<expression noclean="1" />
 		</RegExp>