sync with git

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

3 files changed, 24 insertions, 26 deletions

diff --git a/addons/metadata.albums.allmusic.com/addon.xml b/addons/metadata.albums.allmusic.com/addon.xml
index ce18a666c5..abc705ac57 100644
--- a/addons/metadata.albums.allmusic.com/addon.xml
+++ b/addons/metadata.albums.allmusic.com/addon.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.albums.allmusic.com"
        name="AllMusic"
-       version="1.0.10"
+       version="1.8.1"
        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.3"/>
+    <import addon="metadata.common.allmusic.com" version="1.8.1"/>
     <import addon="metadata.common.htbackdrops.com" version="1.0.7"/>
   </requires>
   <extension point="xbmc.metadata.scraper.albums"
@@ -18,6 +18,7 @@
     <summary lang="es">Scraper de Álbums de AllMusic</summary>
     <summary lang="fr">Scraper d'albums musicaux AllMusic</summary>
     <summary lang="hu">AllMusic.com album információk</summary>
+    <summary lang="nl">AllMusic-albuminfo</summary>
     <summary lang="pl">Informacje o albumach z AllMusic</summary>
     <summary lang="pt">Scraper de músicas AllMusic</summary>
     <summary lang="ru">Информация об альбоме из AllMusic</summary>
@@ -41,10 +42,10 @@ Tous les styles et tous les genres y sont représentés, allant du plus commerci
     <description lang="hu">Az AllMusic.com használata a médiatáradatok feltöltésére. Ez a webhely 1995-ben a zenerajongók szenvedélyének kiszolgálására jött létre.
 Az AMG szerkesztői csapata a szakértő közreműködőkkel együtt (mind zenei fanatikus a maga nemében), az allmusic-ot a legátfogóbb zenei információforrássá tették a világon.
 Minden létező stílus és zenei irányzat feldolgozásra kerül itt. Kezdve a legpopulárisabbtól a legismeretlenebbig. Mi kritikát mondunk a lemezekről és előadókról, az operától a garázs rock-on át a hagyományos country zenéig. Ez biztosítja, hogy bármely stílus rajongói napra készek legyenek a kedvenc előadóikkal, ugyanakkor az új hangzások is eljussanak hozzájuk.</description>
-    <description lang="nl">Gebruik AllMusic.com om de metadata van jouw collectie op te halen.
-  De AllMusic website is ontstaan in 1995 als webstek voor echte muziekfans.
-The AMG redactie, samen met honderden bijdragende experen (allen muziekfans in hun eigen gebied), hebben van allmusic het meest complete muziek naslagwerk gemaakt op deze planeet.
-Alle genres en stijlen worden gedekt, gaande van de meest commerciele tot de meest alternatieve. We bekritiseren albums en artiesten in hun eigen genre, van opera tot garagerock tot traditionele country. Dit maakt dat fans van elke muziekstijl bij ons terecht kunnen voor de laatste informatie rond hun favoriete artiesten of om nieuwe muziek te leren ontdekken.</description>
+    <description lang="nl">AllMusic.com gebruiken om de metadata van uw collectie op te halen.
+De AllMusic-website werd in 1995 opgericht om muziekfans een online thuis te bieden.
+De AMG-redactie heeft van AllMusic het meest complete muzieknaslagwerk gemaakt op deze planeet, mede dankzij de bijdragen van honderden experts. Het is hun missie om de hoogstaande inhoud te blijven aanbieden die muziekliefhebbers en professionals ondertussen van AMG verwachten.
+Alle genres en stijlen - of het nu de meest commerciële of de meest obscure zijn - krijgen hier een plaatsje. We bespreken albums en artiesten in de context van hun eigen genre, van opera over garagerock tot traditionele country. Hierdoor kunnen fans van elke muziekstijl bij ons terecht voor de laatste informatie over hun favoriete artiesten, of om nieuwe muziek te leren ontdekken.</description>
     <description lang="pl">Używa AllMusic.com do pobierania informacji o albumach z Twojej muzycznej biblioteki.</description>
     <description lang="pt">Use o AllMusic.com para obter a informação da sua Biblioteca de música. O site allmusic foi criado em 1995 para alimentar a paixão dos fans de música.
 O pessoal da redacção da AMG, em conjunto com centenas de especialistas (todos fanáticos por música à sua maneira), tornaram o allmusic o mais completo site de referência musical do planeta. Continuam dedicados a criar e manter o conhecimento, espírito e conteúdos que fans de música e profissionais da indústria se habituaram a obter da AMG.
diff --git a/addons/metadata.albums.allmusic.com/allmusic.xml b/addons/metadata.albums.allmusic.com/allmusic.xml
index 7a64a15fe2..03f7470bc6 100644
--- a/addons/metadata.albums.allmusic.com/allmusic.xml
+++ b/addons/metadata.albums.allmusic.com/allmusic.xml
@@ -1,25 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.1" date="2009-09-30">
+<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>
 	</NfoUrl>
 	<CreateAlbumSearchUrl dest="3">
-		<RegExp input="$$1" output="&lt;url post=&quot;yes&quot;&gt;http://www.allmusic.com/cg/amg.dll?P=amg&amp;amp;SQL=\1&amp;amp;OPT1=2&lt;/url&gt;" dest="3">
-			<expression/>
+		<RegExp input="$$1" output="&lt;url&gt;http://www.allmusic.com/search/album/\1&lt;/url&gt;" dest="3">
+			<expression />
 		</RegExp>
 	</CreateAlbumSearchUrl>
 	<GetAlbumSearchResults 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;/entity&gt;" dest="5">
-				<expression repeat="yes" noclean="1">&lt;TITLE&gt;allmusic[ (]+ ([^&gt;]*) &gt; Overview</expression>
+			<RegExp input="$$1" output="&lt;entity&gt;&lt;year&gt;\4&lt;/year&gt;&lt;artist&gt;\3&lt;/artist&gt;&lt;title&gt;\2&lt;/title&gt;&lt;url cache=&quot;am-\3-\2-album.html&quot;&gt;http://www.allmusic.com/album/\1/review&lt;/url&gt;&lt;/entity&gt;" dest="5">
+				<expression repeat="yes" noclean="1,2,3">&lt;td class=&quot;text-center&quot;&gt;[^&lt;]*&lt;a href.*?www.allmusic.com/album/([^&quot;]*)&quot;&gt;([^&lt;]*).*?&lt;td&gt;([^&lt;]*)&lt;/td&gt;.*?&lt;td&gt;.*?&lt;td&gt;([^&lt;]*)</expression>
 			</RegExp>
-			<RegExp input="$$1" output="&lt;entity&gt;&lt;year&gt;\1&lt;/year&gt;&lt;artist&gt;\2&lt;/artist&gt;&lt;title&gt;\4&lt;/title&gt;&lt;url cache=&quot;am-\2-\4-album.html&quot;&gt;http://www.allmusic.com/cg/amg.dll?p=amg&amp;amp;SQL=\3&lt;/url&gt;&lt;/entity&gt;" dest="5+">
-				<expression repeat="yes" noclean="1,2,3">&gt;([0-9]+)?[^&gt;]*&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/TD&gt;&lt;td class="cell-img.*?sql=([0-9:a-z]*)"&gt;(.*?)&lt;.</expression>
-			</RegExp>
-			<RegExp input="$$1" output="&lt;entity&gt;&lt;year&gt;\1&lt;/year&gt;&lt;artist&gt;\2&lt;/artist&gt;&lt;title&gt;\4&lt;/title&gt;&lt;url cache=&quot;am-\2-\4-album.html&quot;&gt;http://www.allmusic.com/cg/amg.dll?p=amg&amp;amp;SQL=\3&lt;/url&gt;&lt;/entity&gt;" dest="5+">
-				<expression repeat="yes" noclean="1,2,3">&gt;([0-9]+)?&lt;/.*?&gt;([a-zA-Z0-9].*?)&lt;.*?sql=([0-9:a-z]*)"&gt;(.*?)&lt;.</expression>
+			<RegExp input="$$1" output="&lt;entity&gt;&lt;year&gt;\4&lt;/year&gt;&lt;artist&gt;\3&lt;/artist&gt;&lt;title&gt;\2&lt;/title&gt;&lt;url cache=&quot;am-\3-\2-album.html&quot;&gt;http://www.allmusic.com/album/\1/review&lt;/url&gt;&lt;/entity&gt;" dest="5+">
+				<expression repeat="yes" noclean="1,2,3">&lt;td class=&quot;text-center&quot;&gt;[^&lt;]*&lt;/td&gt;.*?www.allmusic.com/album/([^&quot;]*)&quot;&gt;([^&lt;]*).*?&lt;td&gt;([^&lt;]*)&lt;/td&gt;.*?&lt;td&gt;.*?&lt;td&gt;([^&lt;]*)</expression>
 			</RegExp>
 			<expression noclean="1" />
 		</RegExp>
@@ -27,21 +24,21 @@
 	<GetAlbumDetails dest="3">
 		<RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="3">
 			<RegExp input="$$1" output="\1" dest="2">
-				<expression noclean="1">&lt;TITLE&gt;allmusic[ (]+ ([^&gt;]*) &gt; Overview</expression>
+				<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">&lt;span&gt;Artist&lt;/span&gt;[^;]*[^&gt;]*&gt;[^&gt;]*&gt;([^&lt;]*)</expression>
+				<expression noclean="1">allmusic.com/artist/[^&quot;]*&quot;&gt;([^&lt;]*)&lt;/a&gt;&lt;/div&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/cg/amg.dll?p=amg&amp;amp;sql=\1&lt;/url&gt;" dest="5+">
-				<expression noclean="1">sql=([^&quot;]*)&quot;&gt;Overview</expression>
+			<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;GetAMGReview&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;Review</expression>
+			<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>
 			</RegExp>
-			<RegExp input="$$1" conditional="lastfmalbumthumbs" output="&lt;chain function=&quot;GetLastFMAlbumThumbs&quot;&gt;\1::\2&lt;/chain&gt;" dest="5+">
-				<expression trim="1,2" encode="1,2">&lt;span class=&quot;title&quot;&gt;[ ]*([^&lt;]*)&lt;/span&gt;.*&lt;a href=&quot;[^&quot;]+&quot; class=&quot;subtitle&quot;&gt;[ ]*([^&lt;]*)&lt;/a&gt;</expression>
+			<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>
 			</RegExp>
-			<expression noclean="1"/>
+			<expression noclean="1" />
 		</RegExp>
 	</GetAlbumDetails>
 </scraper>
diff --git a/addons/metadata.albums.allmusic.com/resources/settings.xml b/addons/metadata.albums.allmusic.com/resources/settings.xml
index 89eb2274a2..3071c6d2bf 100644
--- a/addons/metadata.albums.allmusic.com/resources/settings.xml
+++ b/addons/metadata.albums.allmusic.com/resources/settings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <settings>
     <setting label="30000" type="bool" id="allmusicalbumthumbs" default="true"/>
-    <setting label="30001" type="bool" id="lastfmalbumthumbs" default="false"/>
+    <setting label="30001" type="bool" id="lastfmalbumthumbs" default="true"/>
 </settings>