[Xbmc-addons] Scrapers branch, eden, updated. d4b3925f31fd648ca7b09ff3483eccfdf1511ba5

Thu, 24 May 2012 02:06:29 -0700 

The branch, eden has been updated
       via  d4b3925f31fd648ca7b09ff3483eccfdf1511ba5 (commit)
      from  5cb6b741f31271a84ece1ab98a33934c8acf95fe (commit)

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

commit d4b3925f31fd648ca7b09ff3483eccfdf1511ba5
Author: olympia <[email protected]>
Date:   Thu May 24 11:05:09 2012 +0200

    Update allmusic scrapers (move functions to the common scraper library)

diff --git a/metadata.albums.allmusic.com/addon.xml 
b/metadata.albums.allmusic.com/addon.xml
index dea6306..151394e 100644
--- a/metadata.albums.allmusic.com/addon.xml
+++ b/metadata.albums.allmusic.com/addon.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.albums.allmusic.com"
        name="AllMusic"
-       version="2.0.1"
+       version="2.1.0"
        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.htbackdrops.com" version="1.0.7"/>
+    <import addon="metadata.common.last.fm" version="1.2.0"/>
+    <import addon="metadata.common.allmusic.com" version="2.0.0"/>
+    <import addon="metadata.common.htbackdrops.com" version="1.1.0"/>
   </requires>
   <extension point="xbmc.metadata.scraper.albums"
              language="en"
diff --git a/metadata.albums.allmusic.com/allmusic.xml 
b/metadata.albums.allmusic.com/allmusic.xml
index 1e86b27..63b1896 100644
--- a/metadata.albums.allmusic.com/allmusic.xml
+++ b/metadata.albums.allmusic.com/allmusic.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.1" date="2010-10-16">
+<scraper framework="1.1" date="2012-05-24">
        <NfoUrl dest="3">
                <RegExp input="$$1" 
output="&lt;url&gt;http://www.\1/review&lt;/url&gt;"; dest="3">
                        <expression>(allmusic.com/album/.*)</expression>
@@ -29,14 +29,50 @@
                        <RegExp input="$$1" output="\1" dest="3">
                                <expression noclean="1">&lt;a 
href=&quot;http://www.allmusic.com/album/([^&quot;]*)&quot;&gt;Overview&lt;</expression>
                        </RegExp>
+                       <RegExp input="$$3" output="&lt;chain 
function=&quot;GetAMGAlbumTitleByAMGID&quot;&gt;\1&lt;/chain&gt;" dest="5">
+                               <expression noclean="1">(.+)</expression>
+                       </RegExp>
+                       <RegExp input="$$3" output="&lt;chain 
function=&quot;GetAMGAlbumArtistByAMGID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+                               <expression noclean="1">(.+)</expression>
+                       </RegExp>
+                       <RegExp input="$$3" output="&lt;chain 
function=&quot;GetAMGFakeAlbumReviewByAMGID&quot;&gt;\1&lt;/chain&gt;" 
dest="5+">
+                               <expression noclean="1">(.+)</expression>
+                       </RegExp>
+                       <RegExp input="$$3" output="&lt;chain 
function=&quot;GetAMGAlbumRatingByAMGID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+                               <expression noclean="1">(.+)</expression>
+                       </RegExp>
+                       <RegExp input="$$3" output="&lt;chain 
function=&quot;GetAMGAlbumLabelByAMGID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+                               <expression noclean="1">(.+)</expression>
+                       </RegExp>
+                       <RegExp input="$$3" output="&lt;chain 
function=&quot;GetAMGAlbumTypeByAMGID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+                               <expression noclean="1">(.+)</expression>
+                       </RegExp>
+                       <RegExp input="$$3" output="&lt;chain 
function=&quot;GetAMGAlbumDateByAMGID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+                               <expression noclean="1">(.+)</expression>
+                       </RegExp>
+                       <RegExp input="$$3" output="&lt;chain 
function=&quot;GetAMGAlbumGenresByAMGID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+                               <expression noclean="1">(.+)</expression>
+                       </RegExp>
+                       <RegExp input="$$3" output="&lt;chain 
function=&quot;GetAMGAlbumStylesByAMGID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+                               <expression noclean="1">(.+)</expression>
+                       </RegExp>
+                       <RegExp input="$$3" output="&lt;chain 
function=&quot;GetAMGAlbumMoodsByAMGID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+                               <expression noclean="1">(.+)</expression>
+                       </RegExp>
+                       <RegExp input="$$3" output="&lt;chain 
function=&quot;GetAMGAlbumThemesByAMGID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+                               <expression noclean="1">(.+)</expression>
+                       </RegExp>
+                       <RegExp input="$$3" output="&lt;chain 
function=&quot;GetAMGAlbumTracksByAMGID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+                               <expression noclean="1">(.+)</expression>
+                       </RegExp>
+                       <RegExp input="$$3" output="&lt;chain 
function=&quot;GetAMGAlbumTitleByAMGID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+                               <expression noclean="1">(.+)</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">&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">&lt;a 
href=&quot;http://www.allmusic.com/album/([^&quot;]*)&quot;&gt;Overview&lt;</expression>
+                       <RegExp conditional="allmusicalbumthumbs" input="$$3" 
output="&lt;chain 
function=&quot;GetAMGAlbumThumbsByAMGID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+                               <expression noclean="1">(.+)</expression>
                        </RegExp>
                        <expression noclean="1" />
                </RegExp>
diff --git a/metadata.artists.allmusic.com/addon.xml 
b/metadata.artists.allmusic.com/addon.xml
index 41e7af2..7433fe0 100644
--- a/metadata.artists.allmusic.com/addon.xml
+++ b/metadata.artists.allmusic.com/addon.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.artists.allmusic.com"
        name="AllMusic"
-       version="2.0.7"
+       version="2.1.0"
        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.2"/>
-    <import addon="metadata.common.htbackdrops.com" version="1.0.7"/>
+    <import addon="metadata.common.last.fm" version="1.2.0"/>
+    <import addon="metadata.common.allmusic.com" version="2.0.0"/>
+    <import addon="metadata.common.htbackdrops.com" version="1.1.0"/>
   </requires>
   <extension point="xbmc.metadata.scraper.artists"
              language="en"
diff --git a/metadata.artists.allmusic.com/allmusic.xml 
b/metadata.artists.allmusic.com/allmusic.xml
index 7ea01cc..4353ac1 100644
--- a/metadata.artists.allmusic.com/allmusic.xml
+++ b/metadata.artists.allmusic.com/allmusic.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.1" date="2010-10-16">
+<scraper framework="1.1" date="2012-05-24">
        <NfoUrl dest="3">
                <RegExp input="$$1" 
output="&lt;url&gt;http://www.\1&lt;/url&gt;"; dest="3">
                        <expression>(allmusic.com/artist/.*)</expression>
@@ -44,22 +44,40 @@
                        <RegExp input="$$1" output="\1" dest="8">
                                
<expression>http://www.allmusic.com/artist/([^&amp;&quot;/]*)/</expression>
                        </RegExp>
-                       <RegExp input="$$7" conditional="htbthumbs" 
output="&lt;chain function=&quot;GetHTBThumbs&quot;&gt;\1&lt;/chain&gt;" 
dest="5">
-                               <expression/>
+                       <RegExp input="$$8" output="&lt;chain 
function=&quot;GetAMGFakeBiographyByAMGID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+                               <expression noclean="1">(.+)</expression>
                        </RegExp>
-                       <RegExp input="$$2" conditional="lastfmartistthumbs" 
output="&lt;chain 
function=&quot;GetLastFMArtistThumbsByName&quot;&gt;\1&lt;/chain&gt;" dest="5+">
-                               <expression/>
+                       <RegExp input="$$8" output="&lt;chain 
function=&quot;GetAMGDiscographyByAMGID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+                               <expression noclean="1">(.+)</expression>
                        </RegExp>
-                       <RegExp input="$$8" output="&lt;url 
cache=&quot;am-\1-artist.html&quot; 
function=&quot;ParseAMGArtist&quot;&gt;http://www.allmusic.com/artist/\1&lt;/url&gt;";
 dest="5+">
-                               <expression/>
+                       <RegExp input="$$8" output="&lt;chain 
function=&quot;GetAMGArtistLifeSpanByAMGID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+                               <expression noclean="1">(.+)</expression>
                        </RegExp>
-                       <RegExp input="$$7" conditional="htbfanart" 
output="&lt;chain function=&quot;GetHTBFanart&quot;&gt;\1&lt;/chain&gt;" 
dest="5+">
+                       <RegExp input="$$8" output="&lt;chain 
function=&quot;GetAMGArtistYearsActiveByAMGID&quot;&gt;\1&lt;/chain&gt;" 
dest="5+">
+                               <expression noclean="1">(.+)</expression>
+                       </RegExp>
+                       <RegExp input="$$8" output="&lt;chain 
function=&quot;GetAMGArtistGenresByAMGID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+                               <expression noclean="1">(.+)</expression>
+                       </RegExp>
+                       <RegExp input="$$8" output="&lt;chain 
function=&quot;GetAMGArtistStylesByAMGID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+                               <expression noclean="1">(.+)</expression>
+                       </RegExp>
+                       <RegExp input="$$8" output="&lt;chain 
function=&quot;GetAMGArtistMoodsByAMGID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+                               <expression noclean="1">(.+)</expression>
+                       </RegExp>
+                       <RegExp input="$$8" output="&lt;chain 
function=&quot;GetAMGArtistInstrumentsByAMGID&quot;&gt;\1&lt;/chain&gt;" 
dest="5+">
+                               <expression noclean="1">(.+)</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="$$8" output="&lt;url 
cache=&quot;am-\1-biog.html&quot; 
function=&quot;GetAMGBiography&quot;&gt;http://www.allmusic.com/artist/\1/biography&lt;/url&gt;";
 dest="5+">
+                       <RegExp input="$$2" conditional="lastfmartistthumbs" 
output="&lt;chain 
function=&quot;GetLastFMArtistThumbsByName&quot;&gt;\1&lt;/chain&gt;" dest="5+">
                                <expression/>
                        </RegExp>
-                       <RegExp input="$$8" output="&lt;url 
cache=&quot;am-\1-discog.html&quot; 
function=&quot;GetAMGDiscography&quot;&gt;http://www.allmusic.com/artist/\1/discography&lt;/url&gt;";
 dest="5+">
+                       <RegExp input="$$8" conditional="allmusicartistthumbs" 
output="&lt;chain 
function=&quot;GetAMGArtistThumbsByAMGID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+                               <expression noclean="1">(.+)</expression>
+                       </RegExp>
+                       <RegExp input="$$7" conditional="htbfanart" 
output="&lt;chain function=&quot;GetHTBFanart&quot;&gt;\1&lt;/chain&gt;" 
dest="5+">
                                <expression/>
                        </RegExp>
                        <expression noclean="1"/>
diff --git a/metadata.common.allmusic.com/addon.xml 
b/metadata.common.allmusic.com/addon.xml
index 0fc8372..f42799b 100644
--- a/metadata.common.allmusic.com/addon.xml
+++ b/metadata.common.allmusic.com/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.common.allmusic.com"
        name="AllMusic"
-        version="1.9.0"
+        version="2.0.0"
        provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.common.allmusic.com/allmusic.xml 
b/metadata.common.allmusic.com/allmusic.xml
index dec3959..59c734a 100644
--- a/metadata.common.allmusic.com/allmusic.xml
+++ b/metadata.common.allmusic.com/allmusic.xml
@@ -1,4 +1,409 @@
 <scraperfunctions>
+       <GetAMGDiscographyByAMGID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
cache=&quot;am-\1-discog.html&quot; 
function=&quot;ParseAMGDiscography&quot;&gt;http://www.allmusic.com/artist/\1/discography&lt;/url&gt;";
 dest="5">
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetAMGDiscographyByAMGID>
+       <ParseAMGDiscography 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>
+       </ParseAMGDiscography>
+
+       <GetAMGFakeBiographyByAMGID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
cache=&quot;am-\1-biog.html&quot; 
function=&quot;ParseAMGFakeBiography&quot;&gt;http://www.allmusic.com/artist/\1/biography&lt;/url&gt;";
 dest="5">
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetAMGFakeBiographyByAMGID>
+       <ParseAMGFakeBiography dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
+                       <RegExp input="$$1" output="&lt;biography&gt;Fetching 
artist biography from allmusic.com is not possible due to copyright 
reasons.&lt;/biography&gt;" dest="2">
+                               <expression 
clear="yes">Biography&lt;/h2&gt;.*?&lt;/p&gt;(.*?)&lt;/p&gt;</expression>
+                       </RegExp>
+                       <expression noclean="1"/>
+               </RegExp>
+       </ParseAMGFakeBiography>
+
+       <GetAMGBiographyByAMGID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
cache=&quot;am-\1-biog.html&quot; 
function=&quot;ParseAMGBiography&quot;&gt;http://www.allmusic.com/artist/\1/biography&lt;/url&gt;";
 dest="5">
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetAMGBiographyByAMGID>
+       <ParseAMGBiography 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>
+       </ParseAMGBiography>
+
+       <GetAMGArtistNameByAMGID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
cache=&quot;am-\1-artist.html&quot; 
function=&quot;ParseAMGArtistName&quot;&gt;http://www.allmusic.com/artist/\1&lt;/url&gt;";
 dest="5">
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetAMGArtistNameByAMGID>
+       <ParseAMGArtistName dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
+                       <RegExp input="$$1" 
output="&lt;name&gt;\1&lt;/name&gt;" dest="2">
+                               <expression noclean="1">&lt;meta 
name=&quot;title&quot; content=&quot;([^&quot;]*)</expression>
+                       </RegExp>
+                       <expression noclean="1"/>
+               </RegExp>
+       </ParseAMGArtistName>
+
+       <GetAMGArtistLifeSpanByAMGID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
cache=&quot;am-\1-artist.html&quot; 
function=&quot;ParseAMGArtistLifeSpan&quot;&gt;http://www.allmusic.com/artist/\1&lt;/url&gt;";
 dest="5">
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetAMGArtistLifeSpanByAMGID>
+       <ParseAMGArtistLifeSpan dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
+                       <RegExp input="$$1" 
output="&lt;born&gt;\1&lt;/born&gt;" dest="2">
+                               
<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="2">
+                               
<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="2">
+                               
<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="2">
+                               
<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="2">
+                               
<expression>&lt;h3&gt;Disbanded[^&gt;]*&gt;[^&gt;]*&gt;(.*?)&lt;/p&gt;</expression>
+                       </RegExp>
+                       <expression noclean="1"/>
+               </RegExp>
+       </ParseAMGArtistLifeSpan>
+
+       <GetAMGArtistYearsActiveByAMGID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
cache=&quot;am-\1-artist.html&quot; 
function=&quot;ParseAMGArtistYearsActive&quot;&gt;http://www.allmusic.com/artist/\1&lt;/url&gt;";
 dest="5">
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetAMGArtistYearsActiveByAMGID>
+       <ParseAMGArtistYearsActive dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
+                       <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="2">
+                               <expression noclean="1">(.+)/</expression>
+                       </RegExp>
+                       <expression noclean="1"/>
+               </RegExp>
+       </ParseAMGArtistYearsActive>
+
+       <GetAMGArtistGenresByAMGID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
cache=&quot;am-\1-artist.html&quot; 
function=&quot;ParseAMGArtistGenres&quot;&gt;http://www.allmusic.com/artist/\1&lt;/url&gt;";
 dest="5">
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetAMGArtistGenresByAMGID>
+       <ParseAMGArtistGenres dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
+                       <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="2">
+                               <expression repeat="yes" noclean="1">&lt;a 
href=&quot;/explore/genre/[^&gt;]*&gt;(&lt;strong&gt;)?([^&lt;]*)</expression>
+                       </RegExp>
+                       <expression noclean="1"/>
+               </RegExp>
+       </ParseAMGArtistGenres>
+
+       <GetAMGArtistStylesByAMGID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
cache=&quot;am-\1-artist.html&quot; 
function=&quot;ParseAMGArtistStyles&quot;&gt;http://www.allmusic.com/artist/\1&lt;/url&gt;";
 dest="5">
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetAMGArtistStylesByAMGID>
+       <ParseAMGArtistStyles dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
+                       <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="2">
+                               <expression repeat="yes" 
noclean="1">&lt;li&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;/li&gt;</expression>
+                       </RegExp>
+                       <expression noclean="1"/>
+               </RegExp>
+       </ParseAMGArtistStyles>
+
+       <GetAMGArtistMoodsByAMGID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
cache=&quot;am-\1-artist.html&quot; 
function=&quot;ParseAMGArtistMoods&quot;&gt;http://www.allmusic.com/artist/\1&lt;/url&gt;";
 dest="5">
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetAMGArtistMoodsByAMGID>
+       <ParseAMGArtistMoods dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
+                       <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="2">
+                               <expression repeat="yes" 
noclean="1">&lt;li&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;/li&gt;</expression>
+                       </RegExp>
+                       <expression noclean="1"/>
+               </RegExp>
+       </ParseAMGArtistMoods>
+
+       <GetAMGArtistInstrumentsByAMGID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
cache=&quot;am-\1-artist.html&quot; 
function=&quot;ParseAMGArtistInstruments&quot;&gt;http://www.allmusic.com/artist/\1&lt;/url&gt;";
 dest="5">
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetAMGArtistInstrumentsByAMGID>
+       <ParseAMGArtistInstruments dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
+                       <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="2">
+                               <expression repeat="yes" 
noclean="1">&lt;li&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;/li&gt;</expression>
+                       </RegExp>
+                       <expression noclean="1"/>
+               </RegExp>
+       </ParseAMGArtistInstruments>
+
+       <GetAMGArtistThumbsByAMGID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
cache=&quot;am-\1-artist.html&quot; 
function=&quot;ParseAMGArtistThumbs&quot;&gt;http://www.allmusic.com/artist/\1&lt;/url&gt;";
 dest="5">
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetAMGArtistThumbsByAMGID>
+       <ParseAMGArtistThumbs 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">&lt;img 
id=&quot;artist_image&quot; src=&quot;([^&quot;]*)&quot;</expression>
+                       </RegExp>
+                       <expression noclean="1"/>
+               </RegExp>
+       </ParseAMGArtistThumbs>
+
+
+       <GetAMGFakeAlbumReviewByAMGID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
cache=&quot;am-\1-album.html&quot; 
function=&quot;ParseAMGFakeAlbumReview&quot;&gt;http://www.allmusic.com/album/\1/review&lt;/url&gt;";
 dest="5">
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetAMGFakeAlbumReviewByAMGID>
+       <ParseAMGFakeAlbumReview dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
+                       <RegExp input="$$1" output="&lt;review&gt;Fetching 
album review from allmusic.com is not possible due to copyright 
reasons.&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>
+       </ParseAMGFakeAlbumReview>
+
+       <GetAMGAlbumReviewByAMGID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
cache=&quot;am-\1-album.html&quot; 
function=&quot;ParseAMGAlbumReview&quot;&gt;http://www.allmusic.com/album/\1/review&lt;/url&gt;";
 dest="5">
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetAMGAlbumReviewByAMGID>
+       <ParseAMGAlbumReview 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>
+       </ParseAMGAlbumReview>
+
+       <GetAMGAlbumTitleByAMGID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
cache=&quot;am-\1-album.html&quot; 
function=&quot;ParseAMGAlbumTitle&quot;&gt;http://www.allmusic.com/album/\1/review&lt;/url&gt;";
 dest="5">
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetAMGAlbumTitleByAMGID>
+       <ParseAMGAlbumTitle dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
+                       <RegExp input="$$1" 
output="&lt;title&gt;\1&lt;/title&gt;" dest="2">
+                               <expression trim="1" noclean="1">&lt;meta 
name=&quot;title&quot; content=&quot;([^-]*)-[^&lt;]*&quot; /&gt;</expression>
+                       </RegExp>
+                       <expression noclean="1" />
+               </RegExp>
+       </ParseAMGAlbumTitle>
+
+       <GetAMGAlbumArtistByAMGID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
cache=&quot;am-\1-album.html&quot; 
function=&quot;ParseAMGAlbumArtist&quot;&gt;http://www.allmusic.com/album/\1/review&lt;/url&gt;";
 dest="5">
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetAMGAlbumArtistByAMGID>
+       <ParseAMGAlbumArtist dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
+                       <RegExp input="$$1" 
output="&lt;artist&gt;\1&lt;/artist&gt;" dest="2">
+                               <expression noclean="1">&lt;meta 
name=&quot;title&quot; content=&quot;[^-]*- ([^&lt;]*)&quot; /&gt;</expression>
+                       </RegExp>
+                       <expression noclean="1" />
+               </RegExp>
+       </ParseAMGAlbumArtist>
+
+       <GetAMGAlbumRatingByAMGID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
cache=&quot;am-\1-album.html&quot; 
function=&quot;ParseAMGAlbumRating&quot;&gt;http://www.allmusic.com/album/\1/review&lt;/url&gt;";
 dest="5">
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetAMGAlbumRatingByAMGID>
+       <ParseAMGAlbumRating dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
+                       <RegExp input="$$1" 
output="&lt;rating&gt;\1&lt;/rating&gt;" dest="2">
+                               <expression 
noclean="1">&lt;h3&gt;Rating&lt;/h3&gt;[^_]*_r([0-9^]*)</expression>
+                       </RegExp>
+                       <expression noclean="1" />
+               </RegExp>
+       </ParseAMGAlbumRating>
+
+       <GetAMGAlbumLabelByAMGID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
cache=&quot;am-\1-album.html&quot; 
function=&quot;ParseAMGAlbumLabel&quot;&gt;http://www.allmusic.com/album/\1/review&lt;/url&gt;";
 dest="5">
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetAMGAlbumLabelByAMGID>
+       <ParseAMGAlbumLabel dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
+                       <RegExp input="$$1" 
output="&lt;label&gt;\1&lt;/label&gt;" dest="2">
+                               <expression 
noclean="1">&lt;h3&gt;Label&lt;/h3&gt;[^&gt;]*&gt;([^&lt;]*)</expression>
+                       </RegExp>
+                       <expression noclean="1" />
+               </RegExp>
+       </ParseAMGAlbumLabel>
+
+       <GetAMGAlbumTypeByAMGID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
cache=&quot;am-\1-album.html&quot; 
function=&quot;ParseAMGAlbumType&quot;&gt;http://www.allmusic.com/album/\1/review&lt;/url&gt;";
 dest="5">
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetAMGAlbumTypeByAMGID>
+       <ParseAMGAlbumType dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
+                       <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>
+                       <expression noclean="1" />
+               </RegExp>
+       </ParseAMGAlbumType>
+
+       <GetAMGAlbumDateByAMGID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
cache=&quot;am-\1-album.html&quot; 
function=&quot;ParseAMGAlbumDate&quot;&gt;http://www.allmusic.com/album/\1/review&lt;/url&gt;";
 dest="5">
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetAMGAlbumDateByAMGID>
+       <ParseAMGAlbumDate dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
+                       <RegExp input="$$1" 
output="&lt;releasedate&gt;\1&lt;/releasedate&gt;" dest="2">
+                               <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="2+">
+                               <expression noclean="1">&lt;span&gt;Release 
Date.*?([0-9]+)&lt;/</expression>
+                       </RegExp>
+                       <expression noclean="1" />
+               </RegExp>
+       </ParseAMGAlbumDate>
+
+       <GetAMGAlbumGenresByAMGID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
cache=&quot;am-\1-album.html&quot; 
function=&quot;ParseAMGAlbumGenres&quot;&gt;http://www.allmusic.com/album/\1/review&lt;/url&gt;";
 dest="5">
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetAMGAlbumGenresByAMGID>
+       <ParseAMGAlbumGenres dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
+                       <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="2">
+                               <expression repeat="yes" trim="1" 
noclean="1">&lt;li&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;/li&gt;</expression>
+                       </RegExp>
+                       <expression noclean="1" />
+               </RegExp>
+       </ParseAMGAlbumGenres>
+
+       <GetAMGAlbumStylesByAMGID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
cache=&quot;am-\1-album.html&quot; 
function=&quot;ParseAMGAlbumStyles&quot;&gt;http://www.allmusic.com/album/\1/review&lt;/url&gt;";
 dest="5">
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetAMGAlbumStylesByAMGID>
+       <ParseAMGAlbumStyles dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
+                       <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="2">
+                               <expression repeat="yes" trim="1" 
noclean="1">&lt;li&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;/li&gt;</expression>
+                       </RegExp>
+                       <expression noclean="1" />
+               </RegExp>
+       </ParseAMGAlbumStyles>
+
+       <GetAMGAlbumMoodsByAMGID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
cache=&quot;am-\1-album.html&quot; 
function=&quot;ParseAMGAlbumMoods&quot;&gt;http://www.allmusic.com/album/\1/review&lt;/url&gt;";
 dest="5">
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetAMGAlbumMoodsByAMGID>
+       <ParseAMGAlbumMoods dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
+                       <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="2">
+                               <expression repeat="yes" 
noclean="1">&lt;li&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;/li&gt;</expression>
+                       </RegExp>
+                       <expression noclean="1" />
+               </RegExp>
+       </ParseAMGAlbumMoods>
+
+       <GetAMGAlbumThemesByAMGID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
cache=&quot;am-\1-album.html&quot; 
function=&quot;ParseAMGAlbumThemes&quot;&gt;http://www.allmusic.com/album/\1/review&lt;/url&gt;";
 dest="5">
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetAMGAlbumThemesByAMGID>
+       <ParseAMGAlbumThemes dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
+                       <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="2">
+                               <expression repeat="yes" 
noclean="1">&lt;li&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;/li&gt;</expression>
+                       </RegExp>
+                       <expression noclean="1" />
+               </RegExp>
+       </ParseAMGAlbumThemes>
+
+       <GetAMGAlbumTracksByAMGID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
cache=&quot;am-\1-album.html&quot; 
function=&quot;ParseAMGAlbumTracks&quot;&gt;http://www.allmusic.com/album/\1/review&lt;/url&gt;";
 dest="5">
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetAMGAlbumTracksByAMGID>
+       <ParseAMGAlbumTracks dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
+                       <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="2">
+                               <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>
+                       <expression noclean="1" />
+               </RegExp>
+       </ParseAMGAlbumTracks>
+
+       <GetAMGAlbumThumbsByAMGID dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
cache=&quot;am-\1-album.html&quot; 
function=&quot;ParseAMGAlbumThumbs&quot;&gt;http://www.allmusic.com/album/\1/review&lt;/url&gt;";
 dest="5">
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetAMGAlbumThumbsByAMGID>
+       <ParseAMGAlbumThumbs dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
+                       <RegExp input="$$1" 
output="&lt;thumb&gt;http://image.allmusic.com/\1&lt;/thumb&gt;"; dest="2">
+                               <expression 
noclean="1">http://image.allmusic.com/([^&quot;]*)&quot;</expression>
+                       </RegExp>
+                       <expression noclean="1" />
+               </RegExp>
+       </ParseAMGAlbumThumbs>
+
+
+<!--The below functions will get depreciated after Eden!!!-->
+
        <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">
@@ -144,4 +549,5 @@
                        <expression noclean="1" />
                </RegExp>
        </ParseAMGAlbum>
+
 </scraperfunctions>

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

Summary of changes:
 metadata.albums.allmusic.com/addon.xml     |    8 +-
 metadata.albums.allmusic.com/allmusic.xml  |   48 +++-
 metadata.artists.allmusic.com/addon.xml    |    8 +-
 metadata.artists.allmusic.com/allmusic.xml |   38 ++-
 metadata.common.allmusic.com/addon.xml     |    2 +-
 metadata.common.allmusic.com/allmusic.xml  |  406 ++++++++++++++++++++++++++++
 6 files changed, 485 insertions(+), 25 deletions(-)


hooks/post-receive
-- 
Scrapers


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to