The branch, dharma-pre has been updated
via d1c6b2ba68fd64ec1219f68f50e71d142f2e94e7 (commit)
from 2f30e40642d54a424197380757e906af03b51897 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=d1c6b2ba68fd64ec1219f68f50e71d142f2e94e7
commit d1c6b2ba68fd64ec1219f68f50e71d142f2e94e7
Author: olympia <[email protected]>
Date: Sat Oct 16 12:06:29 2010 +0200
[metadata.all.allmusic.com] adapt new layout of allmusic.com. Tested but
bugs expected...
diff --git a/metadata.albums.allmusic.com/addon.xml
b/metadata.albums.allmusic.com/addon.xml
index 284d2e6..3dbd2bd 100644
--- a/metadata.albums.allmusic.com/addon.xml
+++ b/metadata.albums.allmusic.com/addon.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.albums.allmusic.com"
name="AllMusic"
- version="1.0.10"
+ version="1.8.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
<import addon="metadata.common.last.fm" version="1.0"/>
- <import addon="metadata.common.allmusic.com" version="1.0.3"/>
+ <import addon="metadata.common.allmusic.com" version="1.8.0"/>
<import addon="metadata.common.htbackdrops.com" version="1.0.7"/>
</requires>
<extension point="xbmc.metadata.scraper.albums"
diff --git a/metadata.albums.allmusic.com/allmusic.xml
b/metadata.albums.allmusic.com/allmusic.xml
index 7a64a15..93c5565 100644
--- a/metadata.albums.allmusic.com/allmusic.xml
+++ b/metadata.albums.allmusic.com/allmusic.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.1" date="2009-09-30">
+<scraper framework="1.1" date="2010-10-16">
<NfoUrl dest="3">
<RegExp input="$$1"
output="<url>http://www.\1</url>"; dest="3">
<expression>(allmusic.com/cg/.*)</expression>
</RegExp>
</NfoUrl>
<CreateAlbumSearchUrl dest="3">
- <RegExp input="$$1" output="<url
post="yes">http://www.allmusic.com/cg/amg.dll?P=amg&amp;SQL=\1&amp;OPT1=2</url>";
dest="3">
- <expression/>
+ <RegExp input="$$1"
output="<url>http://www.allmusic.com/search/album/\1</url>";
dest="3">
+ <expression />
</RegExp>
</CreateAlbumSearchUrl>
<GetAlbumSearchResults dest="8">
@@ -15,11 +15,11 @@
<RegExp input="$$1"
output="<entity><title>\1</title></entity>" dest="5">
<expression repeat="yes"
noclean="1"><TITLE>allmusic[ (]+ ([^>]*) > Overview</expression>
</RegExp>
- <RegExp input="$$1"
output="<entity><year>\1</year><artist>\2</artist><title>\4</title><url
cache="am-\2-\4-album.html">http://www.allmusic.com/cg/amg.dll?p=amg&amp;SQL=\3</url></entity>";
dest="5+">
- <expression repeat="yes"
noclean="1,2,3">>([0-9]+)?[^>]*>[^>]*>([^<]*)</TD><td
class="cell-img.*?sql=([0-9:a-z]*)">(.*?)<.</expression>
+ <RegExp input="$$1"
output="<entity><year>\4</year><artist>\3</artist><title>\2</title><url
cache="am-\3-\2-album.html">http://www.allmusic.com/album/\1/review</url></entity>";
dest="5+">
+ <expression repeat="yes" noclean="1,2,3"><td
class="text-center">[^<]*<a
href.*?www.allmusic.com/album/([^"]*)">([^<]*).*?<td>([^<]*)</td>.*?<td>.*?<td>([^<]*)</expression>
</RegExp>
- <RegExp input="$$1"
output="<entity><year>\1</year><artist>\2</artist><title>\4</title><url
cache="am-\2-\4-album.html">http://www.allmusic.com/cg/amg.dll?p=amg&amp;SQL=\3</url></entity>";
dest="5+">
- <expression repeat="yes"
noclean="1,2,3">>([0-9]+)?</.*?>([a-zA-Z0-9].*?)<.*?sql=([0-9:a-z]*)">(.*?)<.</expression>
+ <RegExp input="$$1"
output="<entity><year>\4</year><artist>\3</artist><title>\2</title><url
cache="am-\3-\2-album.html">http://www.allmusic.com/album/\1/review</url></entity>";
dest="5+">
+ <expression repeat="yes" noclean="1,2,3"><td
class="text-center">[^<]*</td>.*?www.allmusic.com/album/([^"]*)">([^<]*).*?<td>([^<]*)</td>.*?<td>.*?<td>([^<]*)</ eview</url></entity>"
dest="5+"> t;" dest="5+">
÷aÈÿ »þÀêä* è è ! è ! ÐbÈÿ...@bÈÿ xÝëä* pùaÈÿ íáÀêä*
ÖþÀêä* ÐBÈÿ °áÀêä* BÈÿ ÀAìä* ÃéÀêä* Aìä* ØAìä* ¨Aìä* ÈdÂêä* xÝëä* PùAÈÿ
øaÈÿ »þÀêä* ÐbÈÿ...@bÈÿ È]½ëä* 0úaÈÿ íáÀêä*
ÖþÀêä* ÐBÈÿ °áÀêä* BÈÿ BÈÿ øBÈÿ ûáêä* : ...@bÈÿ ÃéÀêä* ÈdÂêä* 0úaÈÿ ùaÈÿ »þÀêä* h i j k m n o p ÐbÈÿ @bÈÿ hëä* ÐûaÈÿ íáÀêä* 8ëä* ÖþÀêä* ÐbÈÿ 0aìä* ÃéÀêä* Ýëä* iqëä* aìä* Øaìä* ¨aìä* ÈdÂêä* hëä* ÐûaÈÿ úaÈÿ »þÀêä* 8ëä* ÐûaÈÿ ...@úaÈÿ »þÀêä* (ëä* ÐûAÈÿ púAÈÿ »þÀêä* ëä* ÐûAÈÿ úAÈÿ »þÀêä*
¨Aìä* ÃéÀêä* ¨Aìä*
õaÈÿ qëä* ¶èÀêä* ÿ Øaìä...@ûaÈÿ yqëä* ¶èÀêä* aìä* pûaÈÿ zqëä* ¶èÀêä* Ødqëä* Ýëä* iqëä* aìä* ؤÝëä* Øaìä* ¨aìä* ÈdÂêä* àoëä* ðüaÈÿ ÀûaÈÿ »þÀêä* ) * - . 0 3 5 6 7 8 : < = ÐbÈÿ...@bÈÿ pË;ëä* þaÈÿ íáÀêä* s t 8¯Ýëä* ÃéÀêä* ؤÝëä* ©Ýëä* ÈdÂêä* c f ...@f Æs
ëä...@bÈÿ pË;ëä* þAÈÿ àüAÈÿ »þÀêä* øÒ êÓïs¨Ó,~9×u]ÞÓ
4q ÷u^qʧ ¶uª¹ñìò*ÄvÐbÈÿ...@bÈÿ hnëä* @ bÈÿ ...@bÈÿ ÃéÀêä* èôáêä* ûaÈÿ
ëä* ¶èÀêä* èôáêä* ÐbÈÿ bÈÿ õâêä...@bÈÿ hnëä* @ BÈÿ ðýAÈÿ »þÀêä* 8nëä* expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -27,21 +27,21 @@
<GetAlbumDetails dest="3">
<RegExp input="$$5" output="<details>\1</details>"
dest="3">
<RegExp input="$$1" output="\1" dest="2">
- <expression noclean="1"><TITLE>allmusic[
(]+ ([^>]*) > Overview</expression>
+ <expression noclean="1"><h1
class="title">([^<]*)</h1></expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="3">
- <expression
noclean="1"><span>Artist</span>[^;]*[^>]*>[^>]*>([^<]*)</expression>
+ <expression
noclean="1">allmusic.com/artist/[^"]*">([^<]*)</a></div></expression>
</RegExp>
- <RegExp input="$$1" output="<url
cache="am-$$3-$$2-album.html"
function="ParseAMGAlbum">http://www.allmusic.com/cg/amg.dll?p=amg&amp;sql=\1</url>";
dest="5+">
- <expression
noclean="1">sql=([^"]*)">Overview</expression>
+ <RegExp conditional="lastfmalbumthumbs" input="$$1"
output="<chain
function="GetLastFMAlbumThumbs">\1::\2</chain>" dest="5+">
+ <expression trim="1,2" encode="1,2"><meta
name="title" content="([^-]*)- ([^<]*)" /></expression>
</RegExp>
- <RegExp input="$$1" output="<url
cache="am-$$3-$$2-album.html"
function="GetAMGReview">http://www.allmusic.com/cg/amg.dll?p=amg&amp;sql=\1</url>";
dest="5+">
- <expression
noclean="1">sql=([^"]*)">Review</expression>
+ <RegExp input="$$1" output="<url
cache="am-$$3-$$2-album.html"
function="ParseAMGAlbum">http://www.allmusic.com/album/\1/review</url>";
dest="5+">
+ <expression
noclean="1">allmusic.com/artist/([^"]*)">[^<]*</a></div></expression>
</RegExp>
- <RegExp input="$$1" conditional="lastfmalbumthumbs"
output="<chain
function="GetLastFMAlbumThumbs">\1::\2</chain>" dest="5+">
- <expression trim="1,2" encode="1,2"><span
class="title">[ ]*([^<]*)</span>.*<a
href="[^"]+" class="subtitle">[
]*([^<]*)</a></expression>
+ <RegExp input="$$1" output="<url
cache="am-$$3-$$2-album.html"
function="GetAMGReview">http://www.allmusic.com/album/\1/review</url>";
dest="5+">
+ <expression
noclean="1">allmusic.com/artist/([^"]*)">[^<]*</a></div></expression>
</RegExp>
- <expression noclean="1"/>
+ <expression noclean="1" />
</RegExp>
</GetAlbumDetails>
</scraper>
diff --git a/metadata.albums.allmusic.com/resources/settings.xml
b/metadata.albums.allmusic.com/resources/settings.xml
index 89eb227..3071c6d 100644
--- a/metadata.albums.allmusic.com/resources/settings.xml
+++ b/metadata.albums.allmusic.com/resources/settings.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings>
<setting label="30000" type="bool" id="allmusicalbumthumbs"
default="true"/>
- <setting label="30001" type="bool" id="lastfmalbumthumbs" default="false"/>
+ <setting label="30001" type="bool" id="lastfmalbumthumbs" default="true"/>
</settings>
diff --git a/metadata.artists.allmusic.com/addon.xml
b/metadata.artists.allmusic.com/addon.xml
index 04b1ea1..f66d09d 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="1.0.8"
+ version="1.8.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
<import addon="metadata.common.last.fm" version="1.0"/>
- <import addon="metadata.common.allmusic.com" version="1.0"/>
+ <import addon="metadata.common.allmusic.com" version="1.8.0"/>
<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 4ad7674..297cb0c 100644
--- a/metadata.artists.allmusic.com/allmusic.xml
+++ b/metadata.artists.allmusic.com/allmusic.xml
@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.1" date="2009-09-30">
+<scraper framework="1.1" date="2010-10-16">
<NfoUrl dest="3">
<RegExp input="$$1"
output="<url>http://www.\1</url>"; dest="3">
<expression>(allmusic.com/cg/.*)</expression>
</RegExp>
</NfoUrl>
<CreateArtistSearchUrl dest="3">
- <RegExp input="$$1" output="<url
post="yes">http://www.allmusic.com/cg/amg.dll?P=amg&amp;SQL=\1&amp;OPT1=1</url>";
dest="3">
+ <RegExp input="$$1"
output="<url>http://www.allmusic.com/search/artist/\1</url>";
dest="3">
<expression/>
</RegExp>
</CreateArtistSearchUrl>
<GetArtistSearchResults dest="8">
<RegExp input="$$5" output="<results>\1</results>"
dest="8">
- <RegExp input="$$1"
output="<entity><title>\1</title></entity>" dest="5">
- <expression repeat="yes"
noclean="1"><TITLE>allmusic[ (]+ ([^>]*) > Overview</expression>
+ <RegExp input="$$1"
output="<entity><title>\1</title><url
cache="am-$$2-artist.html">http://www.allmusic.com/artist/\2</url></entity>";
dest="5">
+ <expression repeat="yes" noclean="1"><meta
name="title" content="([^"]*)".*?<a
href="http://www.allmusic.com/artist/([^/]*)/discography"</expression>
</RegExp>
- <RegExp input="$$1"
output="<entity><title>\2</title><genre>\3</genre><year>\5</year><url>http://www.allmusic.com/cg/amg.dll?p=amg&amp;SQL=\1</url></entity>";
dest="5+">
- <expression repeat="yes"
noclean="1,2">style="[^=]*<a
href="[^"]*sql=([^"]*)">([^<]*)</a>[^-]*[^>]*>([^<]*)</TD>[^>]*>(&nbsp;)?([^<]*)</td></expression>
+ <RegExp input="$$1"
output="<entity><title>\2</title><genre>\3</genre><year>\4</year><url
cache="am-$$2-artist.html">http://www.allmusic.com/artist/\1</url></entity>";
dest="5+">
+ <expression repeat="yes"
noclean="1,2"><td><a
href="http://www.allmusic.com/artist/([^"]*)">([^<]*)</a></td>[^>]*>([^<]*)</td>[^>]*>([^<]*)</td></expression>
</RegExp>
<expression noclean="1"/>
- </RegExp>
+ </RegExp>
</GetArtistSearchResults>
<GetArtistDetails dest="3">
<RegExp input="$$5" output="<details>\1</details>"
dest="3">
<RegExp input="$$2" conditional="htbthumbs"
output="<chain function="GetHTBThumbs">\1</chain>"
dest="5">
<expression/>
</RegExp>
- <RegExp input="$$1" output="<url
cache="am-$$2-artist.html"
function="ParseAMGArtist">http://www.allmusic.com/cg/amg.dll?p=amg&amp;sql=\1</url>";
dest="5+">
- <expression
noclean="1">sql=([^"]*)">Biography</expression>
+ <RegExp input="$$1" output="<url
cache="am-$$2-artist.html"
function="ParseAMGArtist">http://www.allmusic.com/artist/\1</url>";
dest="5+">
+
<expression>http://www.allmusic.com/artist/([^&"/]*)</expression>
</RegExp>
<RegExp input="$$2" conditional="lastfmartistthumbs"
output="<chain
function="GetLastFMArtistThumbs">\1</chain>" dest="5+">
<expression/>
@@ -35,11 +35,11 @@
<RegExp input="$$2" conditional="htbfanart"
output="<chain function="GetHTBFanart">\1</chain>"
dest="5+">
<expression/>
</RegExp>
- <RegExp input="$$1" output="<url
cache="am-$$2-artist.html"
function="GetAMGBiography">http://www.allmusic.com/cg/amg.dll?p=amg&amp;sql=\1</url>";
dest="5+">
- <expression
noclean="1">sql=([^"]*)">Biography</expression>
+ <RegExp input="$$1" output="<url
cache="am-$$2-biog.html"
function="GetAMGBiography">http://www.allmusic.com/artist/\1/biography</url>";
dest="5+">
+
<expression>http://www.allmusic.com/artist/([^&"/]*)</expression>
</RegExp>
- <RegExp input="$$1" output="<url
cache="am-$$2-discog.html"
function="GetAMGDiscography">http://www.allmusic.com/cg/amg.dll?p=amg&amp;sql=\1</url>";
dest="5+">
- <expression
noclean="1">sql=([^"]*)">Discography</expression>
+ <RegExp input="$$1" output="<url
cache="am-$$2-discog.html"
function="GetAMGDiscography">http://www.allmusic.com/artist/\1/discography</url>";
dest="5+">
+
<expression>http://www.allmusic.com/artist/([^&"/]*)</expression>
</RegExp>
<expression noclean="1"/>
</RegExp>
diff --git a/metadata.common.allmusic.com/addon.xml
b/metadata.common.allmusic.com/addon.xml
index a2dc608..1499365 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.0.3"
+ version="1.8.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 a0484f7..d4b5f09 100644
--- a/metadata.common.allmusic.com/allmusic.xml
+++ b/metadata.common.allmusic.com/allmusic.xml
@@ -1,8 +1,8 @@
<scraperfunctions>
<GetAMGDiscography dest="5">
<RegExp input="$$2$$3"
output="<details>\1</details>" dest="5">
- <RegExp input="$$1"
output="<album><year>\1</year><title>\3</title><label>\5</label></album>"
dest="2">
- <expression repeat="yes" clear="yes"
noclean="1,3,4">sorted-cell">([0-9]+)</td><td[^>]*>(<a
href=[^>]*><img
[^>]*/></a>|[^<]*)?</td><td[^>]*><a
href=[^>]*>([^<]*)</a></td><td[^<]*[^>]*>[^>]*>(</a></td><td[^>]*>)?([^<]+)</td></expression>
+ <RegExp input="$$1"
output="<album><year>\1</year><title>\2</title><label>\3</label></album>"
dest="2">
+ <expression repeat="yes" clear="yes"
noclean="1,3,4"><td class="sorted
cell">([^<]*)</td>.*?<td class="cell"><a
href="[^>]*>([^<]*)<.*?<td
class="cell">([^<]*)<</expression>
</RegExp>
<RegExp input="$$2" output="\1&amp;\2" dest="3">
<expression repeat="yes"
noclean="1,2">(.*?)&(.+)</expression>
@@ -16,7 +16,7 @@
<GetAMGBiography dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1"
output="<biography>\1</biography>" dest="2">
- <expression
clear="yes">Biography</td>.*?<p>(.*?)</p></expression>
+ <expression
clear="yes">Biography</h2>.*?</p>(.*?)</p></expression>
</RegExp>
<expression noclean="1"/>
</RegExp>
@@ -24,124 +24,121 @@
<GetAMGReview dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1"
output="<review>\1</review>" dest="2">
-
<expression>Review</td>.*?<p>(.*?)</p></expression>
+ <expression><h2
class="title">Review</h2>.*?</p>(.*?)</p></expression>
</RegExp>
- <expression noclean="1"/>
+ <expression noclean="1" />
</RegExp>
</GetAMGReview>
<ParseAMGArtist dest="3">
<RegExp input="$$5" output="<details>\1</details>"
dest="3">
<RegExp input="$$1"
output="<name>\1</name>" dest="5">
- <expression noclean="1"><TITLE>allmusic[
(]+ ([^>]*) > Overview</expression>
+ <expression noclean="1"><meta
name="title" content="([^"]*)</expression>
</RegExp>
<RegExp input="$$1"
output="<born>\1</born>" dest="5+">
-
<expression><span>Born.*?;">(.*?)</td></expression>
+
<expression><h3>Born[^>]*>[^>]*>(.*?)</p></expression>
</RegExp>
<RegExp input="$$1"
output="<died>\1</died>" dest="5+">
-
<expression><span>Died.*?;">(.*?)</td></expression>
+
<expression><h3>Died[^>]*>[^>]*>(.*?)</p></expression>
</RegExp>
<RegExp input="$$1"
output="<formed>\1</formed>" dest="5+">
-
<expression><span>Formed.*?;">(.*?)</td></expression>
+
<expression><h3>Formed[^>]*>[^>]*>(.*?)</p></expression>
</RegExp>
<RegExp input="$$1"
output="<disbanded>\1</disbanded>" dest="5+">
-
<expression><span>Disbanded.*?;">(.*?)</td></expression>
+
<expression><h3>Disbanded[^>]*>[^>]*>(.*?)</p></expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="6">
- <expression noclean="1">Years
Active-->([^!]*)<!--Years Active</expression>
+ <expression noclean="1"><h3>Years
Active</h3>(.*?)</p></expression>
</RegExp>
- <RegExp input="$$6" output="\1's/" dest="7+">
- <expression repeat="yes"><div
class="timeline-sub-active">([0-9]+)</div></expression>
+ <RegExp input="$$6" output="\1's/" dest="7+">
+ <expression repeat="yes"><span
class="active">([0-9]+)</span></expression>
</RegExp>
<RegExp input="$$7"
output="<yearsactive>\1</yearsactive>" dest="5+">
<expression noclean="1">(.+)/</expression>
- </RegExp>
+ </RegExp>
<RegExp input="$$1" output="\1" dest="6">
- <expression noclean="1">Genre
Listing-->([^!]*)<!--Genre Listing</expression>
+ <expression
noclean="1"><h3>Genres</h3>(.*?)</div></expression>
</RegExp>
- <RegExp input="$$6"
output="<genre>\1</genre>" dest="5+">
- <expression noclean="1"
repeat="yes"><li>[^>]*>([^<]*)</a></li></expression>
+ <RegExp input="$$6"
output="<genre>\2</genre>" dest="5+">
+ <expression repeat="yes" noclean="1"><a
href="/explore/genre/[^>]*>(<strong>)?([^<]*)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="7">
- <expression noclean="1">Style
Listing-->([^!]*)<!--Style Listing</expression>
+ <expression
noclean="1"><h3>Styles</h3>(.*?)</div></expression>
</RegExp>
<RegExp input="$$7"
output="<style>\1</style>" dest="5+">
- <expression noclean="1"
repeat="yes"><li>[^>]*>([^<]*)</a></li></expression>
+ <expression repeat="yes"
noclean="1"><li>[^>]*>([^<]*)</a></li></expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="8">
- <expression noclean="1">Moods
Listing-->([^!]*)<!--Moods Listing</expression>
+ <expression
noclean="1"><h3>Moods</h3>(.*?)</div></expression>
</RegExp>
<RegExp input="$$8"
output="<mood>\1</mood>" dest="5+">
- <expression noclean="1"
repeat="yes"><li>[^>]*>([^<]*)</a></li></expression>
+ <expression repeat="yes"
noclean="1"><li>[^>]*>([^<]*)</a></li></expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="9">
- <expression noclean="1">Instruments
Listing-->([^!]*)<!--Instruments Listing</expression>
+ <expression
noclean="1"><h3>Instruments</h3>(.*?)</div></expression>
</RegExp>
<RegExp input="$$9"
output="<instruments>\1</instruments>" dest="5+">
- <expression noclean="1"
repeat="yes"><li>[^>]*>([^<]*)</a></li></expression>
- </RegExp>
- <RegExp input="$$1" conditional="allmusicartistthumbs"
output="<thumb>\1</thumb>" dest="5+">
- <expression noclean="1"><img
src="([^"]*)" id="Picture"</expression>
+ <expression repeat="yes"
noclean="1"><li>[^>]*>([^<]*)</a></li></expression>
</RegExp>
- <RegExp input="$$1" conditional="allmusicartistthumbs"
output="<thumb>http://image.allmusic.com/00/amg/pic200/dr\1\200/\1\2\3\4/\1\2\3\4\5.jpg</thumb>";
dest="5+">
- <expression noclean="1"
repeat="yes">"([A-Z^])([0-9^])([0-9^])([0-9^])([^"]*)"</expression>
+ <RegExp conditional="allmusicartistthumbs" input="$$1"
output="<thumb>\1</thumb>" dest="5+">
+ <expression noclean="1"><img
id="artist_image" src="([^"]*)"</expression>
</RegExp>
- <expression noclean="1"/>
+ <expression noclean="1" />
</RegExp>
</ParseAMGArtist>
<ParseAMGAlbum dest="3">
<RegExp input="$$5" output="<details>\1</details>"
dest="3">
<RegExp input="$$1"
output="<title>\1</title>" dest="5">
- <expression noclean="1"><TITLE>allmusic[
(]+ ([^>]*) > Overview</expression>
+ <expression trim="1" noclean="1"><meta
name="title" content="([^-]*)-[^<]*" /></expression>
</RegExp>
<RegExp input="$$1"
output="<artist>\1</artist>" dest="5+">
- <expression
noclean="1"><span>Artist</span>[^;]*[^>]*>[^>]*>([^<]*)</expression>
+ <expression noclean="1"><meta name="title"
content="[^-]*- ([^<]*)" /></expression>
</RegExp>
<RegExp input="$$1"
output="<rating>\1</rating>" dest="5+">
- <expression
noclean="1"><span>Rating</span>[^_]*_r([0-9^]*)</expression>
+ <expression
noclean="1"><h3>Rating</h3>[^_]*_r([0-9^]*)</expression>
</RegExp>
<RegExp input="$$1"
output="<label>\1</label>" dest="5+">
- <expression
noclean="1"><span>Label</span>[^;]*[^>]*>([^<]*)</expression>
+ <expression
noclean="1"><h3>Label</h3>[^>]*>([^<]*)</expression>
</RegExp>
<RegExp input="$$1"
output="<type>\1</type>" dest="5+">
- <expression
noclean="1"><span>Type</span>[^;]*[^>]*>([^<]*)</expression>
+ <expression
noclean="1"><h3>Type</h3>[^>]*>([^<]*)</expression>
</RegExp>
<RegExp input="$$1"
output="<releasedate>\1</releasedate>" dest="5+">
- <expression noclean="1"><span>Release
Date</span>[^;]*[^>]*>([^<]*)</expression>
+ <expression noclean="1"><h3>Release
Date</h3>[^>]*>([^<]*)</expression>
</RegExp>
<RegExp input="$$1"
output="<year>\1</year>" dest="5+">
<expression noclean="1"><span>Release
Date.*?([0-9]+)</</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="6">
- <expression noclean="1">Genre[s]*
Listing-->([^!]*)<!--Genre[s]* Listing</expression>
+ <expression
noclean="1"><h3>Genre[s]?</h3>(.*?)</div></expression>
</RegExp>
<RegExp input="$$6"
output="<genre>\1</genre>" dest="5+">
- <expression noclean="1"
repeat="yes"><li>[^>]*>([^<]*)</a></li></expression>
+ <expression repeat="yes" trim="1"
noclean="1"><li>[^>]*>([^<]*)</a></li></expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="7">
- <expression noclean="1">Style[s]*
Listing-->([^!]*)<!--Style[s]* Listing</expression>
+ <expression
noclean="1"><h3>Style[s]?</h3>(.*?)</div></expression>
</RegExp>
<RegExp input="$$7"
output="<style>\1</style>" dest="5+">
- <expression noclean="1"
repeat="yes"><li>[^>]*>([^<]*)</a></li></expression>
+ <expression repeat="yes" trim="1"
noclean="1"><li>[^>]*>([^<]*)</a></li></expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="8">
- <expression noclean="1">Mood[s]*
Listing-->([^!]*)<!--Mood[s]* Listing</expression>
+ <expression trim="1"
noclean="1"><h3>Mood[s]?</h3>(.*?)</div></expression>
</RegExp>
<RegExp input="$$8"
output="<mood>\1</mood>" dest="5+">
- <expression noclean="1"
repeat="yes"><li>[^>]*>([^<]*)</a></li></expression>
+ <expression repeat="yes"
noclean="1"><li>[^>]*>([^<]*)</a></li></expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="9">
- <expression noclean="1">Theme[s]*
Listing-->([^!]*)<!--Theme[s]* Listing</expression>
+ <expression
noclean="1"><h3>Theme[s]?</h3>(.*?)</div></expression>
</RegExp>
<RegExp input="$$9"
output="<theme>\1</theme>" dest="5+">
- <expression noclean="1"
repeat="yes"><li>[^>]*>([^<]*)</a></li></expression>
+ <expression repeat="yes"
noclean="1"><li>[^>]*>([^<]*)</a></li></expression>
</RegExp>
- <RegExp input="$$1"
output="<track><position>\1</position><title>\3</title><duration>\4</duration></track>"
dest="5+">
- <expression noclean="1,2,3"
repeat="yes">"cell">([0-9]+)</.*?sql=([0-9:a-z]*)">(.*?)</a>.*?"right".*?>(.*?)</</expression>
+ <RegExp input="$$1"
output="<track><position>\1</position><title>\2</title><duration>\3</duration></track>"
dest="5+">
+ <expression repeat="yes"
noclean="1,2,3">"cell">([0-9]+)<.*?<td
class="cell">[^>]*>([^<]*)</a></td>.*?<td
class="cell">([0-9]*:[0-9]*)</td></expression>
</RegExp>
- <RegExp input="$$1" conditional="allmusicalbumthumbs"
output="<thumb>http://image.allmusic.com/\1</thumb>"; dest="5+">
- <expression
noclean="1">http://image.allmusic.com/([^"]*)"</expression>
+ <RegExp conditional="allmusicalbumthumbs" input="$$1"
output="<thumb>http://image.allmusic.com/\1</thumb>"; dest="5+">
+ <expression
noclean="1">http://image.allmusic.com/([^"]*)"</expression>
</RegExp>
- <expression noclean="1"/>
+ <expression noclean="1" />
</RegExp>
</ParseAMGAlbum>
</scraperfunctions>
-----------------------------------------------------------------------
Summary of changes:
metadata.albums.allmusic.com/addon.xml | 4 +-
metadata.albums.allmusic.com/allmusic.xml | 32 ++++----
.../resources/settings.xml | 2 +-
metadata.artists.allmusic.com/addon.xml | 4 +-
metadata.artists.allmusic.com/allmusic.xml | 26 +++---
metadata.common.allmusic.com/addon.xml | 2 +-
metadata.common.allmusic.com/allmusic.xml | 93 ++++++++++----------
7 files changed, 80 insertions(+), 83 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
![http://image.allmusic.com/00/amg/pic200/dr\1\200/\1\2\3\4/\1\2\3\4\5.jpg</thumb>"](http://image.allmusic.com/00/amg/pic200/dr\1\200/\1\2\3\4/\1\2\3\4\5.jpg</thumb>"){kind=link}