[Xbmc-addons] Scrapers branch, eden-pre, updated. c150bfc66983dd7612f2975300995e355b148cf1

Fri, 28 Oct 2011 14:34:51 -0700 

The branch, eden-pre has been updated
       via  c150bfc66983dd7612f2975300995e355b148cf1 (commit)
      from  583f3f8d45fffdcc46f3ca5d1abaa7b832b50e1b (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=c150bfc66983dd7612f2975300995e355b148cf1

commit c150bfc66983dd7612f2975300995e355b148cf1
Author: olympia <[email protected]>
Date:   Fri Oct 28 23:33:07 2011 +0200

    [metadata.artists.allmusic.com] fixed caching

diff --git a/metadata.artists.allmusic.com/addon.xml 
b/metadata.artists.allmusic.com/addon.xml
index 008eeff..427ce61 100644
--- a/metadata.artists.allmusic.com/addon.xml
+++ b/metadata.artists.allmusic.com/addon.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.artists.allmusic.com"
        name="AllMusic"
-       version="2.0.3"
+       version="2.0.4"
        provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
     <import addon="metadata.common.last.fm" version="1.1.0"/>
-    <import addon="metadata.common.allmusic.com" version="1.8.1"/>
+    <import addon="metadata.common.allmusic.com" version="1.8.2"/>
     <import addon="metadata.common.htbackdrops.com" version="1.0.7"/>
   </requires>
   <extension point="xbmc.metadata.scraper.artists"
diff --git a/metadata.artists.allmusic.com/allmusic.xml 
b/metadata.artists.allmusic.com/allmusic.xml
index e9506bc..d96ef26 100644
--- a/metadata.artists.allmusic.com/allmusic.xml
+++ b/metadata.artists.allmusic.com/allmusic.xml
@@ -12,25 +12,25 @@
        </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="9">
+                       <RegExp input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\1&lt;/title&gt;&lt;url 
cache=&quot;am-\1-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">
+                       <RegExp input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\1&lt;/title&gt;&lt;url 
cache=&quot;am-\1-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">
+                       <RegExp input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\1&lt;/title&gt;&lt;url 
cache=&quot;am-\1-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+">
+                       <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>
                        </RegExp>
                        <expression noclean="1"/>
@@ -38,22 +38,25 @@
        </GetArtistSearchResults>
        <GetArtistDetails dest="3">
                <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="3">
-                       <RegExp input="$$2" conditional="htbthumbs" 
output="&lt;chain function=&quot;GetHTBThumbs&quot;&gt;\1&lt;/chain&gt;" 
dest="5">
+                       <RegExp input="$$1" output="\1" dest="7">
+                               <expression noclean="1">&lt;meta 
name=&quot;title&quot; content=&quot;([^&quot;]*)</expression>
+                       </RegExp>
+                       <RegExp input="$$7" 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/artist/\1&lt;/url&gt;";
 dest="5+">
+                       <RegExp input="$$1" output="&lt;url 
cache=&quot;am-$$7-artist.html&quot; 
function=&quot;ParseAMGArtist&quot;&gt;http://www.allmusic.com/artist/\1&lt;/url&gt;";
 dest="5+">
                                
<expression>http://www.allmusic.com/artist/([^&amp;&quot;/]*)</expression>
                        </RegExp>
-                       <RegExp input="$$2" conditional="lastfmartistthumbs" 
output="&lt;chain 
function=&quot;GetLastFMArtistThumbsByName&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+                       <RegExp input="$$7" conditional="lastfmartistthumbs" 
output="&lt;chain 
function=&quot;GetLastFMArtistThumbsByName&quot;&gt;\1&lt;/chain&gt;" dest="5+">
                                <expression/>
                        </RegExp>
-                       <RegExp input="$$2" conditional="htbfanart" 
output="&lt;chain function=&quot;GetHTBFanart&quot;&gt;\1&lt;/chain&gt;" 
dest="5+">
+                       <RegExp input="$$7" conditional="htbfanart" 
output="&lt;chain function=&quot;GetHTBFanart&quot;&gt;\1&lt;/chain&gt;" 
dest="5+">
                                <expression/>
                        </RegExp>
-                       <RegExp input="$$1" output="&lt;url 
cache=&quot;am-$$2-biog.html&quot; 
function=&quot;GetAMGBiography&quot;&gt;http://www.allmusic.com/artist/\1/biography&lt;/url&gt;";
 dest="5+">
+                       <RegExp input="$$1" output="&lt;url 
cache=&quot;am-$$7-biog.html&quot; 
function=&quot;GetAMGBiography&quot;&gt;http://www.allmusic.com/artist/\1/biography&lt;/url&gt;";
 dest="5+">
                                <expression>&lt;a 
href=&quot;http://www.allmusic.com/artist/([^/]*)/biography"</expression>
                        </RegExp>
-                       <RegExp input="$$1" output="&lt;url 
cache=&quot;am-$$2-discog.html&quot; 
function=&quot;GetAMGDiscography&quot;&gt;http://www.allmusic.com/artist/\1/discography&lt;/url&gt;";
 dest="5+">
+                       <RegExp input="$$1" output="&lt;url 
cache=&quot;am-$$7-discog.html&quot; 
function=&quot;GetAMGDiscography&quot;&gt;http://www.allmusic.com/artist/\1/discography&lt;/url&gt;";
 dest="5+">
                                <expression>&lt;a 
href=&quot;http://www.allmusic.com/artist/([^/]*)/discography"</expression>
                        </RegExp>
                        <expression noclean="1"/>
diff --git a/metadata.common.allmusic.com/addon.xml 
b/metadata.common.allmusic.com/addon.xml
index 427f5fa..ed05261 100644
--- a/metadata.common.allmusic.com/addon.xml
+++ b/metadata.common.allmusic.com/addon.xml
@@ -1,35 +1,39 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="metadata.common.allmusic.com"
-       name="AllMusic"
-       version="1.8.1"
-       provider-name="Team XBMC">
-  <requires>
-    <import addon="xbmc.metadata" version="1.0"/>
-  </requires>
-  <extension point="xbmc.metadata.scraper.library"
-             library="allmusic.xml"/>
-  <extension point="xbmc.addon.metadata">
-    <platform>all</platform>
-    <minversion>20000</minversion>
-    <summary lang="en">AllMusic Music Scraper Library</summary>
-    <summary lang="de">Musik-Scraper für AllMusic.com</summary>
-    <summary lang="es">Descarga información de Allmusic</summary>
-    <summary lang="fr">Scraper AllMusic pour la musique</summary>
-    <summary lang="hu">AllMusic zenei adat leolvasó</summary>
-    <summary lang="nl">AllMusic-scraperfuncties</summary>
-    <summary lang="pl">Scraper muzyki AllMusic</summary>
-    <summary lang="pt">Scraper de música AllMusic</summary>
-    <summary lang="ru">Музыкальная Информация 
AllMusic</summary>
-    <summary lang="zh">AllMusic音乐刮削器代码库</summary>
-    <description lang="en">Download Music information from 
www.allmusic.com</description>
-    <description lang="de">Downloade Musik Informationen von 
www.allmusic.com</description>
-    <description lang="es">Descarga información musical de 
www.allmusic.com</description>
-    <description lang="fr">Télécharger les infos musicales depuis 
www.allmusic.com</description>
-    <description lang="hu">Zene információk letöltése a www.allmusic.com 
webhelyről</description>
-    <description lang="nl">Muziekinformatie ophalen van 
www.allmusic.com</description>
-    <description lang="pl">Pobieraj informacje o muzyce z 
www.allmusic.com</description>
-    <description lang="pt">Descarregar informação de música de 
www.allmusic.com</description>
-    <description lang="ru">Загружать информацию о 
Музыке с www.allmusic.com</description>
-    <description lang="zh">从www.allmusic.com下载音乐信息</description>
-  </extension>
-</addon>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

+<addon id="metadata.common.allmusic.com"

+       name="AllMusic"

+       version="1.8.2"

+       provider-name="Team XBMC">

+  <requires>

+    <import addon="xbmc.metadata" version="1.0"/>

+  </requires>

+  <extension point="xbmc.metadata.scraper.library"

+             library="allmusic.xml"/>

+  <extension point="xbmc.addon.metadata">

+    <platform>all</platform>

+    <minversion>20000</minversion>

+    <summary lang="en">AllMusic Music Scraper Library</summary>

+    <summary lang="de">Musik-Scraper für AllMusic.com</summary>

+    <summary lang="es">Scraper de música de AllMusic</summary>

+    <summary lang="fr">Scraper AllMusic pour la musique</summary>

+    <summary lang="hu">AllMusic zenei adat leolvasó</summary>

+    <summary lang="nl">AllMusic-scraperfuncties</summary>

+    <summary lang="pl">Scraper muzyki AllMusic</summary>

+    <summary lang="pt">Scraper de música AllMusic</summary>

+    <summary lang="ro">Bibliotecă catalog de muzică AllMusic</summary>

+    <summary lang="ru">Музыкальная Информация 
AllMusic</summary>

+    <summary lang="se">Skrapa för AllMusic.com</summary>

+    <summary lang="zh">AllMusic音乐刮削器代码库</summary>

+    <description lang="en">Download Music information from 
www.allmusic.com</description>

+    <description lang="de">Downloade Musik Informationen von 
www.allmusic.com</description>

+    <description lang="es">Descarga información musical de 
www.allmusic.com</description>

+    <description lang="fr">Télécharger les infos musicales depuis 
www.allmusic.com</description>

+    <description lang="hu">Zene információk letöltése a www.allmusic.com 
webhelyről</description>

+    <description lang="nl">Muziekinformatie ophalen van 
www.allmusic.com</description>

+    <description lang="pl">Pobieraj informacje o muzyce z 
www.allmusic.com</description>

+    <description lang="pt">Descarregar informação de música de 
www.allmusic.com</description>

+    <description lang="ro">Descărcați informații muzică de pe 
www.allmusic.com</description>

+    <description lang="ru">Загружать информацию о 
Музыке с www.allmusic.com</description>

+    <description lang="se">Ladda ner musikinformation från 
www.allmusic.com</description>

+    <description lang="zh">从www.allmusic.com下载音乐信息</description>

+  </extension>

+</addon>

diff --git a/metadata.common.allmusic.com/allmusic.xml 
b/metadata.common.allmusic.com/allmusic.xml
index adea10a..96ed8d0 100644
--- a/metadata.common.allmusic.com/allmusic.xml
+++ b/metadata.common.allmusic.com/allmusic.xml
@@ -1,144 +1,147 @@
-<scraperfunctions>
-       <GetAMGDiscography dest="5">
-               <RegExp input="$$2$$3" 
output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
-                       <RegExp input="$$1" 
output="&lt;album&gt;&lt;year&gt;\1&lt;/year&gt;&lt;title&gt;\2&lt;/title&gt;&lt;label&gt;\3&lt;/label&gt;&lt;/album&gt;"
 dest="2">
-                               <expression repeat="yes" clear="yes" 
noclean="1,3,4">&lt;td class=&quot;sorted 
cell&quot;&gt;([^&lt;]*)&lt;/td&gt;.*?&lt;td class=&quot;cell&quot;&gt;&lt;a 
href=&quot;[^&gt;]*&gt;([^&lt;]*)&lt;.*?&lt;td 
class=&quot;cell&quot;&gt;([^&lt;]*)&lt;</expression>
-                       </RegExp>
-                       <RegExp input="$$2" output="\1&amp;amp;\2" dest="3">
-                               <expression repeat="yes" 
noclean="1,2">(.*?)&amp;(.+)</expression>
-                       </RegExp>
-                       <RegExp input="$$3" output="" dest="2">
-                               <expression>(.+)</expression>
-                       </RegExp>
-                       <expression noclean="1" />
-               </RegExp>
-       </GetAMGDiscography>
-       <GetAMGBiography dest="5">
-               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
-                       <RegExp input="$$1" 
output="&lt;biography&gt;\1&lt;/biography&gt;" dest="2">
-                               <expression 
clear="yes">Biography&lt;/h2&gt;.*?&lt;/p&gt;(.*?)&lt;/p&gt;</expression>
-                       </RegExp>
-                       <expression noclean="1"/>
-               </RegExp>
-       </GetAMGBiography>
-       <GetAMGReview dest="5">
-               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
-                       <RegExp input="$$1" 
output="&lt;review&gt;\1&lt;/review&gt;" dest="2">
-                               <expression>&lt;h2 
class=&quot;title&quot;&gt;Review&lt;/h2&gt;.*?&lt;/p&gt;(.*?)&lt;/p&gt;</expression>
-                       </RegExp>
-                       <expression noclean="1" />
-               </RegExp>
-       </GetAMGReview>
-       <ParseAMGArtist dest="3">
-               <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="3">
-                       <RegExp input="$$1" 
output="&lt;name&gt;\1&lt;/name&gt;" dest="5">
-                               <expression noclean="1">&lt;meta 
name=&quot;title&quot; content=&quot;([^&quot;]*)</expression>
-                       </RegExp>
-                       <RegExp input="$$1" 
output="&lt;born&gt;\1&lt;/born&gt;" dest="5+">
-                               
<expression>&lt;h3&gt;Born[^&gt;]*&gt;[^&gt;]*&gt;(.*?)&lt;/p&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$1" 
output="&lt;died&gt;\1&lt;/died&gt;" dest="5+">
-                               
<expression>&lt;h3&gt;Died[^&gt;]*&gt;[^&gt;]*&gt;(.*?)&lt;/p&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$1" 
output="&lt;formed&gt;\1&lt;/formed&gt;" dest="5+">
-                               
<expression>&lt;h3&gt;Formed[^&gt;]*&gt;[^&gt;]*&gt;(.*?)&lt;/p&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$1" 
output="&lt;disbanded&gt;\1&lt;/disbanded&gt;" dest="5+">
-                               
<expression>&lt;h3&gt;Disbanded[^&gt;]*&gt;[^&gt;]*&gt;(.*?)&lt;/p&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$1" output="\1" dest="6">
-                               <expression noclean="1">&lt;h3&gt;Years 
Active&lt;/h3&gt;(.*?)&lt;/p&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$6" output="\1's/" dest="7+">
-                               <expression repeat="yes">&lt;span 
class=&quot;active&quot;&gt;([0-9]+)&lt;/span&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$7" 
output="&lt;yearsactive&gt;\1&lt;/yearsactive&gt;" dest="5+">
-                               <expression noclean="1">(.+)/</expression>
-                       </RegExp>
-                       <RegExp input="$$1" output="\1" dest="6">
-                               <expression 
noclean="1">&lt;h3&gt;Genres&lt;/h3&gt;(.*?)&lt;/div&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$6" 
output="&lt;genre&gt;\2&lt;/genre&gt;" dest="5+">
-                               <expression repeat="yes" noclean="1">&lt;a 
href=&quot;/explore/genre/[^&gt;]*&gt;(&lt;strong&gt;)?([^&lt;]*)</expression>
-                       </RegExp>
-                       <RegExp input="$$1" output="\1" dest="7">
-                               <expression 
noclean="1">&lt;h3&gt;Styles&lt;/h3&gt;(.*?)&lt;/div&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$7" 
output="&lt;style&gt;\1&lt;/style&gt;" dest="5+">
-                               <expression repeat="yes" 
noclean="1">&lt;li&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;/li&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$1" output="\1" dest="8">
-                               <expression 
noclean="1">&lt;h3&gt;Moods&lt;/h3&gt;(.*?)&lt;/div&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$8" 
output="&lt;mood&gt;\1&lt;/mood&gt;" dest="5+">
-                               <expression repeat="yes" 
noclean="1">&lt;li&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;/li&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$1" output="\1" dest="9">
-                               <expression 
noclean="1">&lt;h3&gt;Instruments&lt;/h3&gt;(.*?)&lt;/div&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$9" 
output="&lt;instruments&gt;\1&lt;/instruments&gt;" dest="5+">
-                               <expression repeat="yes" 
noclean="1">&lt;li&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;/li&gt;</expression>
-                       </RegExp>
-                       <RegExp conditional="allmusicartistthumbs" input="$$1" 
output="&lt;thumb&gt;\1&lt;/thumb&gt;" dest="5+">
-                               <expression noclean="1">&lt;img 
id=&quot;artist_image&quot; src=&quot;([^&quot;]*)&quot;</expression>
-                       </RegExp>
-                       <expression noclean="1" />
-               </RegExp>
-       </ParseAMGArtist>
-       <ParseAMGAlbum dest="3">
-               <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="3">
-                       <RegExp input="$$1" 
output="&lt;title&gt;\1&lt;/title&gt;" dest="5">
-                               <expression trim="1" noclean="1">&lt;meta 
name=&quot;title&quot; content=&quot;([^-]*)-[^&lt;]*&quot; /&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$1" 
output="&lt;artist&gt;\1&lt;/artist&gt;" dest="5+">
-                               <expression noclean="1">&lt;meta 
name=&quot;title&quot; content=&quot;[^-]*- ([^&lt;]*)&quot; /&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$1" 
output="&lt;rating&gt;\1&lt;/rating&gt;" dest="5+">
-                               <expression 
noclean="1">&lt;h3&gt;Rating&lt;/h3&gt;[^_]*_r([0-9^]*)</expression>
-                       </RegExp>
-                       <RegExp input="$$1" 
output="&lt;label&gt;\1&lt;/label&gt;" dest="5+">
-                               <expression 
noclean="1">&lt;h3&gt;Label&lt;/h3&gt;[^&gt;]*&gt;([^&lt;]*)</expression>
-                       </RegExp>
-                       <RegExp input="$$1" 
output="&lt;type&gt;\1&lt;/type&gt;" dest="5+">
-                               <expression 
noclean="1">&lt;h3&gt;Type&lt;/h3&gt;[^&gt;]*&gt;([^&lt;]*)</expression>
-                       </RegExp>
-                       <RegExp input="$$1" 
output="&lt;releasedate&gt;\1&lt;/releasedate&gt;" dest="5+">
-                               <expression noclean="1">&lt;h3&gt;Release 
Date&lt;/h3&gt;[^&gt;]*&gt;([^&lt;]*)</expression>
-                       </RegExp>
-                       <RegExp input="$$1" 
output="&lt;year&gt;\1&lt;/year&gt;" dest="5+">
-                               <expression noclean="1">&lt;span&gt;Release 
Date.*?([0-9]+)&lt;/</expression>
-                       </RegExp>
-                       <RegExp input="$$1" output="\1" dest="6">
-                               <expression 
noclean="1">&lt;h3&gt;Genre[s]?&lt;/h3&gt;(.*?)&lt;/div&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$6" 
output="&lt;genre&gt;\1&lt;/genre&gt;" dest="5+">
-                               <expression repeat="yes" trim="1" 
noclean="1">&lt;li&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;/li&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$1" output="\1" dest="7">
-                               <expression 
noclean="1">&lt;h3&gt;Style[s]?&lt;/h3&gt;(.*?)&lt;/div&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$7" 
output="&lt;style&gt;\1&lt;/style&gt;" dest="5+">
-                               <expression repeat="yes" trim="1" 
noclean="1">&lt;li&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;/li&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$1" output="\1" dest="8">
-                               <expression trim="1" 
noclean="1">&lt;h3&gt;Mood[s]?&lt;/h3&gt;(.*?)&lt;/div&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$8" 
output="&lt;mood&gt;\1&lt;/mood&gt;" dest="5+">
-                               <expression repeat="yes" 
noclean="1">&lt;li&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;/li&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$1" output="\1" dest="9">
-                               <expression 
noclean="1">&lt;h3&gt;Theme[s]?&lt;/h3&gt;(.*?)&lt;/div&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$9" 
output="&lt;theme&gt;\1&lt;/theme&gt;" dest="5+">
-                               <expression repeat="yes" 
noclean="1">&lt;li&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;/li&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$1" 
output="&lt;track&gt;&lt;position&gt;\1&lt;/position&gt;&lt;title&gt;\2&lt;/title&gt;&lt;duration&gt;\3&lt;/duration&gt;&lt;/track&gt;"
 dest="5+">
-                               <expression repeat="yes" 
noclean="1,2,3">&quot;cell&quot;&gt;([0-9]+)&lt;.*?&lt;td 
class=&quot;cell&quot;&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;/td&gt;.*?&lt;td 
class=&quot;cell&quot;&gt;([0-9]*:[0-9]*)&lt;/td&gt;</expression>
-                       </RegExp>
-                       <RegExp conditional="allmusicalbumthumbs" input="$$1" 
output="&lt;thumb&gt;http://image.allmusic.com/\1&lt;/thumb&gt;"; dest="5+">
-                               <expression 
noclean="1">http://image.allmusic.com/([^&quot;]*)&quot;</expression>
-                       </RegExp>
-                       <expression noclean="1" />
-               </RegExp>
-       </ParseAMGAlbum>
-</scraperfunctions>
+<scraperfunctions>

+       <GetAMGDiscography dest="5">

+               <RegExp input="$$2$$3" 
output="&lt;details&gt;\1&lt;/details&gt;" dest="5">

+                       <RegExp input="$$1" 
output="&lt;album&gt;&lt;year&gt;\1&lt;/year&gt;&lt;title&gt;\2&lt;/title&gt;&lt;label&gt;\3&lt;/label&gt;&lt;/album&gt;"
 dest="2">

+                               <expression repeat="yes" clear="yes" 
noclean="1,3,4">&lt;td class=&quot;sorted 
cell&quot;&gt;([^&lt;]*)&lt;/td&gt;.*?&lt;td class=&quot;cell&quot;&gt;&lt;a 
href=&quot;[^&gt;]*&gt;([^&lt;]*)&lt;.*?&lt;td 
class=&quot;cell&quot;&gt;([^&lt;]*)&lt;</expression>

+                       </RegExp>

+                       <RegExp input="$$2" output="\1&amp;amp;\2" dest="3">

+                               <expression repeat="yes" 
noclean="1,2">(.*?)&amp;(.+)</expression>

+                       </RegExp>

+                       <RegExp input="$$3" output="" dest="2">

+                               <expression>(.+)</expression>

+                       </RegExp>

+                       <expression noclean="1" />

+               </RegExp>

+       </GetAMGDiscography>

+       <GetAMGBiography dest="5">

+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">

+                       <RegExp input="$$1" 
output="&lt;biography&gt;\1&lt;/biography&gt;" dest="2">

+                               <expression 
clear="yes">Biography&lt;/h2&gt;.*?&lt;/p&gt;(.*?)&lt;/p&gt;</expression>

+                       </RegExp>

+                       <expression noclean="1"/>

+               </RegExp>

+       </GetAMGBiography>

+       <GetAMGReview dest="5">

+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">

+                       <RegExp input="$$1" 
output="&lt;review&gt;\1&lt;/review&gt;" dest="2">

+                               <expression>&lt;h2 
class=&quot;title&quot;&gt;Review&lt;/h2&gt;.*?&lt;/p&gt;(.*?)&lt;/p&gt;</expression>

+                       </RegExp>

+                       <expression noclean="1" />

+               </RegExp>

+       </GetAMGReview>

+       <ParseAMGArtist dest="3">

+               <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="3">

+                       <RegExp input="$$1" 
output="&lt;name&gt;\1&lt;/name&gt;" dest="5">

+                               <expression noclean="1">&lt;meta 
name=&quot;title&quot; content=&quot;([^&quot;]*)</expression>

+                       </RegExp>

+                       <RegExp input="$$1" 
output="&lt;born&gt;\1&lt;/born&gt;" dest="5+">

+                               
<expression>&lt;h3&gt;Born[^&gt;]*&gt;[^&gt;]*&gt;(.*?)&lt;/p&gt;</expression>

+                       </RegExp>

+                       <RegExp input="$$1" 
output="&lt;born&gt;\1&lt;/born&gt;" dest="5+">

+                               
<expression>&lt;h3&gt;Birth[^&gt;]*&gt;[^&gt;]*&gt;(.*?)&lt;/p&gt;</expression>

+                       </RegExp>

+                       <RegExp input="$$1" 
output="&lt;died&gt;\1&lt;/died&gt;" dest="5+">

+                               
<expression>&lt;h3&gt;Died[^&gt;]*&gt;[^&gt;]*&gt;(.*?)&lt;/p&gt;</expression>

+                       </RegExp>

+                       <RegExp input="$$1" 
output="&lt;formed&gt;\1&lt;/formed&gt;" dest="5+">

+                               
<expression>&lt;h3&gt;Formed[^&gt;]*&gt;[^&gt;]*&gt;(.*?)&lt;/p&gt;</expression>

+                       </RegExp>

+                       <RegExp input="$$1" 
output="&lt;disbanded&gt;\1&lt;/disbanded&gt;" dest="5+">

+                               
<expression>&lt;h3&gt;Disbanded[^&gt;]*&gt;[^&gt;]*&gt;(.*?)&lt;/p&gt;</expression>

+                       </RegExp>

+                       <RegExp input="$$1" output="\1" dest="6">

+                               <expression noclean="1">&lt;h3&gt;Years 
Active&lt;/h3&gt;(.*?)&lt;/p&gt;</expression>

+                       </RegExp>

+                       <RegExp input="$$6" output="\1's/" dest="7+">

+                               <expression repeat="yes">&lt;span 
class=&quot;active&quot;&gt;([0-9]+)&lt;/span&gt;</expression>

+                       </RegExp>

+                       <RegExp input="$$7" 
output="&lt;yearsactive&gt;\1&lt;/yearsactive&gt;" dest="5+">

+                               <expression noclean="1">(.+)/</expression>

+                       </RegExp>

+                       <RegExp input="$$1" output="\1" dest="6">

+                               <expression 
noclean="1">&lt;h3&gt;Genres&lt;/h3&gt;(.*?)&lt;/div&gt;</expression>

+                       </RegExp>

+                       <RegExp input="$$6" 
output="&lt;genre&gt;\2&lt;/genre&gt;" dest="5+">

+                               <expression repeat="yes" noclean="1">&lt;a 
href=&quot;/explore/genre/[^&gt;]*&gt;(&lt;strong&gt;)?([^&lt;]*)</expression>

+                       </RegExp>

+                       <RegExp input="$$1" output="\1" dest="7">

+                               <expression 
noclean="1">&lt;h3&gt;Styles&lt;/h3&gt;(.*?)&lt;/div&gt;</expression>

+                       </RegExp>

+                       <RegExp input="$$7" 
output="&lt;style&gt;\1&lt;/style&gt;" dest="5+">

+                               <expression repeat="yes" 
noclean="1">&lt;li&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;/li&gt;</expression>

+                       </RegExp>

+                       <RegExp input="$$1" output="\1" dest="8">

+                               <expression 
noclean="1">&lt;h3&gt;Moods&lt;/h3&gt;(.*?)&lt;/div&gt;</expression>

+                       </RegExp>

+                       <RegExp input="$$8" 
output="&lt;mood&gt;\1&lt;/mood&gt;" dest="5+">

+                               <expression repeat="yes" 
noclean="1">&lt;li&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;/li&gt;</expression>

+                       </RegExp>

+                       <RegExp input="$$1" output="\1" dest="9">

+                               <expression 
noclean="1">&lt;h3&gt;Instruments&lt;/h3&gt;(.*?)&lt;/div&gt;</expression>

+                       </RegExp>

+                       <RegExp input="$$9" 
output="&lt;instruments&gt;\1&lt;/instruments&gt;" dest="5+">

+                               <expression repeat="yes" 
noclean="1">&lt;li&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;/li&gt;</expression>

+                       </RegExp>

+                       <RegExp conditional="allmusicartistthumbs" input="$$1" 
output="&lt;thumb&gt;\1&lt;/thumb&gt;" dest="5+">

+                               <expression noclean="1">&lt;img 
id=&quot;artist_image&quot; src=&quot;([^&quot;]*)&quot;</expression>

+                       </RegExp>

+                       <expression noclean="1" />

+               </RegExp>

+       </ParseAMGArtist>

+       <ParseAMGAlbum dest="3">

+               <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="3">

+                       <RegExp input="$$1" 
output="&lt;title&gt;\1&lt;/title&gt;" dest="5">

+                               <expression trim="1" noclean="1">&lt;meta 
name=&quot;title&quot; content=&quot;([^-]*)-[^&lt;]*&quot; /&gt;</expression>

+                       </RegExp>

+                       <RegExp input="$$1" 
output="&lt;artist&gt;\1&lt;/artist&gt;" dest="5+">

+                               <expression noclean="1">&lt;meta 
name=&quot;title&quot; content=&quot;[^-]*- ([^&lt;]*)&quot; /&gt;</expression>

+                       </RegExp>

+                       <RegExp input="$$1" 
output="&lt;rating&gt;\1&lt;/rating&gt;" dest="5+">

+                               <expression 
noclean="1">&lt;h3&gt;Rating&lt;/h3&gt;[^_]*_r([0-9^]*)</expression>

+                       </RegExp>

+                       <RegExp input="$$1" 
output="&lt;label&gt;\1&lt;/label&gt;" dest="5+">

+                               <expression 
noclean="1">&lt;h3&gt;Label&lt;/h3&gt;[^&gt;]*&gt;([^&lt;]*)</expression>

+                       </RegExp>

+                       <RegExp input="$$1" 
output="&lt;type&gt;\1&lt;/type&gt;" dest="5+">

+                               <expression 
noclean="1">&lt;h3&gt;Type&lt;/h3&gt;[^&gt;]*&gt;([^&lt;]*)</expression>

+                       </RegExp>

+                       <RegExp input="$$1" 
output="&lt;releasedate&gt;\1&lt;/releasedate&gt;" dest="5+">

+                               <expression noclean="1">&lt;h3&gt;Release 
Date&lt;/h3&gt;[^&gt;]*&gt;([^&lt;]*)</expression>

+                       </RegExp>

+                       <RegExp input="$$1" 
output="&lt;year&gt;\1&lt;/year&gt;" dest="5+">

+                               <expression noclean="1">&lt;span&gt;Release 
Date.*?([0-9]+)&lt;/</expression>

+                       </RegExp>

+                       <RegExp input="$$1" output="\1" dest="6">

+                               <expression 
noclean="1">&lt;h3&gt;Genre[s]?&lt;/h3&gt;(.*?)&lt;/div&gt;</expression>

+                       </RegExp>

+                       <RegExp input="$$6" 
output="&lt;genre&gt;\1&lt;/genre&gt;" dest="5+">

+                               <expression repeat="yes" trim="1" 
noclean="1">&lt;li&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;/li&gt;</expression>

+                       </RegExp>

+                       <RegExp input="$$1" output="\1" dest="7">

+                               <expression 
noclean="1">&lt;h3&gt;Style[s]?&lt;/h3&gt;(.*?)&lt;/div&gt;</expression>

+                       </RegExp>

+                       <RegExp input="$$7" 
output="&lt;style&gt;\1&lt;/style&gt;" dest="5+">

+                               <expression repeat="yes" trim="1" 
noclean="1">&lt;li&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;/li&gt;</expression>

+                       </RegExp>

+                       <RegExp input="$$1" output="\1" dest="8">

+                               <expression trim="1" 
noclean="1">&lt;h3&gt;Mood[s]?&lt;/h3&gt;(.*?)&lt;/div&gt;</expression>

+                       </RegExp>

+                       <RegExp input="$$8" 
output="&lt;mood&gt;\1&lt;/mood&gt;" dest="5+">

+                               <expression repeat="yes" 
noclean="1">&lt;li&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;/li&gt;</expression>

+                       </RegExp>

+                       <RegExp input="$$1" output="\1" dest="9">

+                               <expression 
noclean="1">&lt;h3&gt;Theme[s]?&lt;/h3&gt;(.*?)&lt;/div&gt;</expression>

+                       </RegExp>

+                       <RegExp input="$$9" 
output="&lt;theme&gt;\1&lt;/theme&gt;" dest="5+">

+                               <expression repeat="yes" 
noclean="1">&lt;li&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;/li&gt;</expression>

+                       </RegExp>

+                       <RegExp input="$$1" 
output="&lt;track&gt;&lt;position&gt;\1&lt;/position&gt;&lt;title&gt;\2&lt;/title&gt;&lt;duration&gt;\3&lt;/duration&gt;&lt;/track&gt;"
 dest="5+">

+                               <expression repeat="yes" 
noclean="1,2,3">&quot;cell&quot;&gt;([0-9]+)&lt;.*?&lt;td 
class=&quot;cell&quot;&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;/td&gt;.*?&lt;td 
class=&quot;cell&quot;&gt;([0-9]*:[0-9]*)&lt;/td&gt;</expression>

+                       </RegExp>

+                       <RegExp conditional="allmusicalbumthumbs" input="$$1" 
output="&lt;thumb&gt;http://image.allmusic.com/\1&lt;/thumb&gt;"; dest="5+">

+                               <expression 
noclean="1">http://image.allmusic.com/([^&quot;]*)&quot;</expression>

+                       </RegExp>

+                       <expression noclean="1" />

+               </RegExp>

+       </ParseAMGAlbum>

+</scraperfunctions>


-----------------------------------------------------------------------

Summary of changes:
 metadata.artists.allmusic.com/addon.xml    |    4 +-
 metadata.artists.allmusic.com/allmusic.xml |   23 ++-
 metadata.common.allmusic.com/addon.xml     |   74 ++++----
 metadata.common.allmusic.com/allmusic.xml  |  291 ++++++++++++++--------------
 4 files changed, 201 insertions(+), 191 deletions(-)


hooks/post-receive
-- 
Scrapers


------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Cisco Self-Assessment and learn 
about Cisco certifications, training, and career opportunities. 
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to