[Xbmc-addons] Scrapers branch, eden, updated. 6395203eb2a9345185bc30c5b1ebd9e0c8d8c74d

olympia Fri, 08 Jun 2012 08:27:34 -0700

The branch, eden has been updated
       via  6395203eb2a9345185bc30c5b1ebd9e0c8d8c74d (commit)
      from  b3e3e44af878cd2bfd18686926fb72779356674b (commit)


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

commit 6395203eb2a9345185bc30c5b1ebd9e0c8d8c74d
Author: olympia <[email protected]>
Date:   Fri Jun 8 17:26:47 2012 +0200

    [metadata.common.allmusic.com] updated to version 2.3.0

diff --git a/metadata.common.allmusic.com/addon.xml 
b/metadata.common.allmusic.com/addon.xml
index ba3a2cc..f2c0896 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="2.2.0"
+        version="2.3.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 d856998..5d9d352 100644
--- a/metadata.common.allmusic.com/allmusic.xml
+++ b/metadata.common.allmusic.com/allmusic.xml
@@ -27,7 +27,7 @@
        <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 noclean="1" />
+                               <expression noclean="1" />
                        </RegExp>
                        <expression noclean="1"/>
                </RegExp>
@@ -180,129 +180,101 @@
 
 
        <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;&lt;/details&gt;";
 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&lt;/url&gt;&lt;/details&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>
+                               <expression noclean="1"/>
                        </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;&lt;/details&gt;";
 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&lt;/url&gt;&lt;/details&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>
+                               <expression>&lt;span 
itemprop=&quot;description&quot;&gt;([^&lt;]*)</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;&lt;/details&gt;";
 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&lt;/url&gt;&lt;/details&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>
+                               <expression trim="1" noclean="1">&lt;div 
class=&quot;album-title&quot;&gt;([^&lt;]*)</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;&lt;/details&gt;";
 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&lt;/url&gt;&lt;/details&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>
+                               <expression noclean="1">&lt;div 
class=&quot;album-artist&quot;&gt;[^&gt;]*&gt;([^&lt;]*)</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;&lt;/details&gt;";
 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&lt;/url&gt;&lt;/details&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 input="$$1" output="&lt;rating 
max=&quot;5.0&quot;&gt;\1&lt;/rating&gt;" dest="2">
+                               <expression 
noclean="1">itemprop=&quot;rating&quot;&gt;([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;&lt;/details&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;&lt;/details&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;&lt;/details&gt;";
 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&lt;/url&gt;&lt;/details&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>
+                               <expression noclean="1">&lt;dd 
class=&quot;release-date&quot;&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 input="$$1" 
output="&lt;year&gt;\2&lt;/year&gt;" dest="2+">
+                               <expression trim="1" noclean="1">&lt;dd 
class=&quot;release-date&quot;&gt;([^,]*,)?([^&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;&lt;/details&gt;";
 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&lt;/url&gt;&lt;/details&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>
+                               <expression noclean="1">&lt;dd 
class=&quot;genres&quot;&gt;(.*?)&lt;/dd&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>
@@ -312,14 +284,14 @@
        </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;&lt;/details&gt;";
 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&lt;/url&gt;&lt;/details&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>
+                               <expression noclean="1">&lt;dd 
class=&quot;styles&quot;&gt;(.*?)&lt;/dd&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>
@@ -329,14 +301,14 @@
        </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;&lt;/details&gt;";
 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&lt;/url&gt;&lt;/details&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>
+                               <expression trim="1" 
noclean="1">&gt;&lt;h3&gt;popular moods&lt;/h3&gt;(.*?)&lt;/ul&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>
@@ -346,14 +318,14 @@
        </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;&lt;/details&gt;";
 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&lt;/url&gt;&lt;/details&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>
+                               <expression noclean="1">&lt;h4&gt;album 
themes&lt;/h4&gt;(.*?)&lt;/ul&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>
@@ -363,180 +335,31 @@
        </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;&lt;/details&gt;";
 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&lt;/url&gt;&lt;/details&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>
+                               <expression repeat="yes" trim="1" 
noclean="1,2,3">&lt;td class=&quot;tracknum&quot;&gt;([0-9]*).*?&lt;div 
class=&quot;title&quot;&gt;[^&gt;]*&gt;([^&lt;]*).*?&lt;td 
class=&quot;time&quot;&gt;([^&lt;]*)</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;&lt;/details&gt;";
 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&lt;/url&gt;&lt;/details&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 input="$$1" 
output="&lt;thumb&gt;http://cps-static.rovicorp.com/3/JPG_500/\1&lt;/thumb&gt;"; 
dest="2">
+                               <expression noclean="1">&lt;meta 
property=&quot;og:image&quot; 
content=&quot;http://cps-static.rovicorp.com/3/JPG_[^/]*/([^&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">
-                               <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;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>
-       </GetAMGBiography>
-       <GetAMGReview 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>
-       </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.common.allmusic.com/addon.xml    |    2 +-
 metadata.common.allmusic.com/allmusic.xml |  235 ++++-------------------------
 2 files changed, 30 insertions(+), 207 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

[Xbmc-addons] Scrapers branch, eden, updated. 6395203eb2a9345185bc30c5b1ebd9e0c8d8c74d

Reply via email to