sync: lastfm with addons repo

diff --git a/addons/metadata.common.last.fm/addon.xml b/addons/metadata.common.last.fm/addon.xml
index c51fecf..ac77954 100644 (file)
--- a/addons/metadata.common.last.fm/addon.xml
+++ b/addons/metadata.common.last.fm/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.common.last.fm"
        name="Last.FM"
-       version="1.0.4"
+       version="1.1.0"
        provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
@@ -24,7 +24,7 @@
     <summary lang="zh">LastFM刮削器代码库</summary>
     <description lang="en">Download Music information from www.last.fm</description>
     <description lang="de">Downloade Musik informationen von www.last.fm</description>
-    <description lang="es">Descarga información musical de www.last.fm</description>
+    <description lang="es">Descargar información musical de www.last.fm</description>
     <description lang="fr">Télécharge les infos musicales depuis www.last.fm</description>
     <description lang="hu">Zene információk letöltése a www.last.fm webhelyről</description>
     <description lang="nl">Muziekinfo ophalen van LastFM</description>

diff --git a/addons/metadata.common.last.fm/lastfm.xml b/addons/metadata.common.last.fm/lastfm.xml
index c31e640..6bd19c6 100644 (file)
--- a/addons/metadata.common.last.fm/lastfm.xml
+++ b/addons/metadata.common.last.fm/lastfm.xml
@@ -12,17 +12,22 @@
                        <expression noclean="1"/>
                </RegExp>
        </ParseLastFMDiscography>
-       <GetLastFMArtistThumbs dest="5">
-               <RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseLastFMArtistThumbs&quot;&gt;http://ws.audioscrobbler.com/2.0/?method=artist.getimages&amp;amp;artist=\1&amp;amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lt;/url&gt;&lt;/details&gt;" dest="5">
-                       <expression noclean="1"/>
+       <GetLastFMArtistThumbsByID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseLastFMArtistThumbs&quot;&gt;http://ws.audioscrobbler.com/2.0/?method=artist.getimages&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lt;/url&gt;&lt;/details&gt;" dest="5">
+                       <expression noclean="1" />
+               </RegExp>
+       </GetLastFMArtistThumbsByID>
+       <GetLastFMArtistThumbsByName dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseLastFMArtistThumbs&quot;&gt;http://ws.audioscrobbler.com/2.0/?method=artist.getimages&amp;artist=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lt;/url&gt;&lt;/details&gt;" dest="5">
+                       <expression noclean="1" />
                </RegExp>
-       </GetLastFMArtistThumbs>
+       </GetLastFMArtistThumbsByName>
        <ParseLastFMArtistThumbs dest="5">
-               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
-                       <RegExp input="$$1" output="&lt;thumb&gt;\1&lt;/thumb&gt;" dest="2">
-                               <expression noclean="1" repeat="yes">&lt;size name=&quot;original&quot;[^&gt;]*&gt;([^&lt;]*)&lt;/size&gt;</expression>
+               <RegExp input="$$6" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
+                       <RegExp input="$$1" output="&lt;thumb preview=&quot;\2&quot;&gt;\1&lt;/thumb&gt;" dest="6">
+                               <expression repeat="yes" noclean="1">&lt;size name="original"[^&gt;]*&gt;([^&lt;]*)&lt;[^&lt;]*&lt;size name="large"[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
                        </RegExp>
-                       <expression noclean="1"></expression>
+                       <expression noclean="1">(.+)</expression>
                </RegExp>
        </ParseLastFMArtistThumbs>
        <GetLastFMAlbumThumbs dest="5">
@@ -40,5 +45,5 @@
                        </RegExp>
                        <expression noclean="1"></expression>
                </RegExp>
-       </ParseLastFMAlbumThumbs>       
+       </ParseLastFMAlbumThumbs>
 </scraperfunctions>