The branch, frodo has been updated
via 3a295f8d22ff288f53b9062f9f47eccbeb6d30d1 (commit)
from dd3bacc97ae5aab0bba687fdb16e9fde22da3cda (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=3a295f8d22ff288f53b9062f9f47eccbeb6d30d1
commit 3a295f8d22ff288f53b9062f9f47eccbeb6d30d1
Author: olympia <[email protected]>
Date: Sat Jul 20 00:35:12 2013 +0200
[metadata.common.allmusic.com] updated to version 3.0.0
diff --git a/metadata.common.allmusic.com/addon.xml
b/metadata.common.allmusic.com/addon.xml
index 750870e..63ca86e 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.6.0"
+ version="3.0.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="2.1.0"/>
diff --git a/metadata.common.allmusic.com/allmusic.xml
b/metadata.common.allmusic.com/allmusic.xml
index 51d57fb..7ae6acc 100644
--- a/metadata.common.allmusic.com/allmusic.xml
+++ b/metadata.common.allmusic.com/allmusic.xml
@@ -1,6 +1,6 @@
<scraperfunctions>
<GetAMGDiscographyByAMGID dest="5" clearbuffers="no">
- <RegExp input="$$1" output="<details><url
cache="am-\1-artist.html"
function="ParseAMGDiscography">http://www.allmusic.com/artist/\1</url></details>";
dest="5">
+ <RegExp input="$$1" output="<details><url
cache="am-\1-artist-discography.html"
function="ParseAMGDiscography">http://www.allmusic.com/artist/\1/discography</url></details>";
dest="5">
<expression clear="yes" noclean="1"/>
</RegExp>
</GetAMGDiscographyByAMGID>
@@ -10,7 +10,7 @@
<expression />
</RegExp>
<RegExp input="$$1"
output="<album><year>\1</year><title>\2</title><label>\3</label></album>"
dest="3">
- <expression repeat="yes" clear="yes"
trim="1"><td
class="year[^"]*"(?:\stitle="[^"]*")*\s*data-sort-value="[^>]*>([^<]*)</td>[^<]*<td
class=".*?title="([^"]*)</expression>
+ <expression repeat="yes" clear="yes"
trim="1"><td\sclass="year[^"]*"(?:\stitle="[^"]*")*\s*data-sort-value="[^>]*>\s*([^<]*)</td>[^<]*<td\sclass=".*?title="([^"]*)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -62,20 +62,6 @@
</RegExp>
</ParseAMGFallbackBiography>
- <GetAMGArtistNameByAMGID dest="5">
- <RegExp input="$$1" output="<details><url
cache="am-\1-artist.html"
function="ParseAMGArtistName">http://www.allmusic.com/artist/\1</url></details>";
dest="5">
- <expression noclean="1"/>
- </RegExp>
- </GetAMGArtistNameByAMGID>
- <ParseAMGArtistName dest="5">
- <RegExp input="$$2" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1"
output="<name>\1</name>" dest="2">
- <expression
noclean="1">http://schema.org/MusicGroup">[^<]*<span
itemprop="name">([^<]*)</span></expression>
- </RegExp>
- <expression noclean="1"/>
- </RegExp>
- </ParseAMGArtistName>
-
<GetAMGArtistLifeSpanByAMGID dest="5" clearbuffers="no">
<RegExp input="$$1" output="<details><url
cache="am-\1-artist.html"
function="ParseAMGArtistLifeSpan">http://www.allmusic.com/artist/\1</url></details>";
dest="5">
<expression noclean="1"/>
@@ -90,16 +76,16 @@
<expression />
</RegExp>
<RegExp input="$$1" output="<born>\1
\2</born>" dest="11+">
- <expression
trim="1,2"><dt>\s*Born[^>]*>[^>]*>[^>]*>(.*?\d{4})\s*([^<]*)?</expression>
+ <expression
trim="1,2"><h4>\s*Born\s*</h4>\s*<div>(.*?\d{4})\s*([^<]*)?</expression>
</RegExp>
<RegExp input="$$1" output="<died>\1
\2</died>" dest="11+">
- <expression
trim="1,2"><dt>\s*Died[^>]*>[^>]*>[^>]*>(.*?\d{4})\s*([^<]*)?</expression>
+ <expression
trim="1,2"><h4>\s*Died\s*</h4>\s*<div>(.*?\d{4})\s*([^<]*)?</expression>
</RegExp>
<RegExp input="$$1"
output="<formed>\1</formed>" dest="11+">
- <expression
trim="1,2"><dt>\s*Formed[^>]*>[^>]*>[^>]*>(.*?\d{4})\s*([^<]*)?</expression>
+ <expression
trim="1,2"><h4>\s*Formed\s*</h4>\s*<div>(.*?\d{4})\s*([^<]*)?</expression>
</RegExp>
<RegExp input="$$1"
output="<disbanded>\1</disbanded>" dest="11+">
- <expression
trim="1,2"><dt>\s*Disbanded[^>]*>[^>]*>[^>]*>(.*?\d{4})\s*([^<]*)?</expression>
+ <expression
trim="1,2"><h4>\s*Disbanded\s*</h4>\s*<div>(.*?\d{4})\s*([^<]*)?</expression>
</RegExp>
<RegExp input="$$11" output="$$12" dest="2">
<RegExp input="$INFO[lifespanfbsource]"
output="<chain
function="GetMBFallbackLafeSpanByMBID">$$8</chain>"
dest="12">
@@ -128,16 +114,16 @@
<expression />
</RegExp>
<RegExp input="$$1" output="<born>\1
\2</born>" dest="2">
- <expression
trim="1,2"><dt>\s*Born[^>]*>[^>]*>[^>]*>(.*?\d{4})\s*([^<]*)?</expression>
+ <expression
trim="1,2"><h4>\s*Born\s*</h4>\s*<div>(.*?\d{4})\s*([^<]*)?</expression>
</RegExp>
<RegExp input="$$1" output="<died>\1
\2</died>" dest="2+">
- <expression
trim="1,2"><dt>\s*Died[^>]*>[^>]*>[^>]*>(.*?\d{4})\s*([^<]*)?</expression>
+ <expression
trim="1,2"><h4>\s*Died\s*</h4>\s*<div>(.*?\d{4})\s*([^<]*)?</expression>
</RegExp>
<RegExp input="$$1"
output="<formed>\1</formed>" dest="2">
- <expression
trim="1,2"><dt>\s*Formed[^>]*>[^>]*>[^>]*>(.*?\d{4})\s*([^<]*)?</expression>
+ <expression
trim="1,2"><h4>\s*Formed\s*</h4>\s*<div>(.*?\d{4})\s*([^<]*)?</expression>
</RegExp>
<RegExp input="$$1"
output="<disbanded>\1</disbanded>" dest="2+">
- <expression
trim="1,2"><dt>\s*Disbanded[^>]*>[^>]*>[^>]*>(.*?\d{4})\s*([^<]*)?</expression>
+ <expression
trim="1,2"><h4>\s*Disbanded\s*</h4>\s*<div>(.*?\d{4})\s*([^<]*)?</expression>
</RegExp>
<expression noclean="1"/>
</RegExp>
@@ -154,7 +140,7 @@
<expression />
</RegExp>
<RegExp input="$$1"
output="<yearsactive>\1</yearsactive>" dest="2">
- <expression trim="1" noclean="1"><dd
class="active">([^<]*)<</expression>
+ <expression trim="1"
noclean="1"><h\d>Active</h\d>[^>]*>([^<]*)<</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -174,10 +160,10 @@
<expression />
</RegExp>
<RegExp input="$$1" output="\1" dest="6">
- <expression
noclean="1"><dt>Genres</dt>(.*?)</dd></expression>
+ <expression
noclean="1"><h4>Genre</h4>\s*<div>(.*?)</div></expression>
</RegExp>
- <RegExp input="$$6"
output="<genre>\2</genre>" dest="11">
- <expression repeat="yes"
noclean="1"><li><a
href="/genre/[^"]*">(<strong>)?([^<]*)</expression>
+ <RegExp input="$$6"
output="<genre>\1</genre>" dest="11">
+ <expression repeat="yes"
noclean="1"><a\shref="http://www.allmusic.com/genre/[^"]*">([^<]*)</expression>
</RegExp>
<RegExp input="$$11" output="$$12" dest="2">
<RegExp input="$INFO[genresfbsource]"
output="<chain
function="GetLastFMFallbackArtistGenresByMBID">$$8</chain>"
dest="12">
@@ -209,10 +195,10 @@
<expression />
</RegExp>
<RegExp input="$$1" output="\1" dest="6">
- <expression
noclean="1"><dt>Genres</dt>(.*?)</dd></expression>
+ <expression
noclean="1"><h4>Genre</h4>\s*<div>(.*?)</div></expression>
</RegExp>
- <RegExp input="$$6"
output="<genre>\2</genre>" dest="2">
- <expression repeat="yes"
noclean="1"><li><a
href="/genre/[^"]*">(<strong>)?([^<]*)</expression>
+ <RegExp input="$$6"
output="<genre>\1</genre>" dest="2">
+ <expression repeat="yes"
noclean="1"><a\shref="http://www.allmusic.com/genre/[^"]*">([^<]*)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -232,10 +218,10 @@
<expression />
</RegExp>
<RegExp input="$$1" output="\1" dest="7">
- <expression
noclean="1"><dt>Styles</dt>(.*?)</dd></expression>
+ <expression
noclean="1"><h4>Styles</h4>\s*<div>(.*?)</div></expression>
</RegExp>
<RegExp input="$$7"
output="<style>\1</style>" dest="11">
- <expression repeat="yes"
noclean="1"><li><a
href="/style/[^"]*">([^<]*)</expression>
+ <expression repeat="yes"
noclean="1"><a\shref="http://www.allmusic.com/style/[^"]*">([^<]*)</expression>
</RegExp>
<RegExp input="$$11" output="$$12" dest="2">
<RegExp input="$INFO[stylesfbsource]"
output="<chain
function="GetLastFMFallbackArtistStylesByMBID">$$8</chain>"
dest="12">
@@ -264,10 +250,10 @@
<expression />
</RegExp>
<RegExp input="$$1" output="\1" dest="7">
- <expression
noclean="1"><dt>Styles</dt>(.*?)</dd></expression>
+ <expression
noclean="1"><h4>Styles</h4>\s*<div>(.*?)</div></expression>
</RegExp>
<RegExp input="$$7"
output="<style>\1</style>" dest="2">
- <expression repeat="yes"
noclean="1"><li><a
href="/style/[^"]*">([^<]*)</expression>
+ <expression repeat="yes"
noclean="1"><a\shref="http://www.allmusic.com/style/[^"]*">([^<]*)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -284,10 +270,10 @@
<expression />
</RegExp>
<RegExp input="$$1" output="\1" dest="10">
- <expression noclean="1"><h4>artist
moods</h4>(.*?)</ul></expression>
+ <expression
noclean="1">>Artists\sMoods</h\d*>(.*?)</ul></expression>
</RegExp>
<RegExp input="$$10"
output="<mood>\1</mood>" dest="2">
- <expression repeat="yes"
noclean="1"><li>[^>]*>([^<]*)</a></li></expression>
+ <expression repeat="yes"
noclean="1"><li>[^>]*>([^<]*)</a>\s*</li></expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -307,7 +293,7 @@
<expression />
</RegExp>
<RegExp input="$$1" output="\1" dest="4">
- <expression noclean="1"><h4>photo
gallery</h4>(.*?)<h4></expression>
+ <expression
noclean="1"><h\d>Photo\sGallery</h\d>(.*?)<h2\sclass="artist-name"></expression>
</RegExp>
<RegExp input="$$4"
output="<thumb>http://cps-static.rovicorp.com/3/JPG_1080/\1</thumb>";
dest="2">
<expression repeat="yes" noclean="1"><img
src="http://cps-static.rovicorp.com/3/JPG_[^/]*/([^"]*)</expression>
@@ -366,8 +352,8 @@
</GetAMGAlbumRatingByAMGID>
<ParseAMGAlbumRating dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1" output="<rating
max="5.0">\1</rating>" dest="2">
- <expression
noclean="1">itemprop="rating">([0-9^]*)</expression>
+ <RegExp input="$$1" output="<rating
max="10.0">\1</rating>" dest="2">
+ <expression
noclean="1">rating-allmusic-([0-9^]*)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -398,10 +384,10 @@
<ParseAMGAlbumGenres dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1" output="\1" dest="6">
- <expression noclean="1"><dd
class="genres">(.*?)</dd></expression>
+ <expression
noclean="1"><h4>Genre</h4>\s*<div>(.*?)</div></expression>
</RegExp>
<RegExp input="$$6"
output="<genre>\1</genre>" dest="2">
- <expression repeat="yes" trim="1"
noclean="1"><li>[^>]*>([^<]*)</a></li></expression>
+ <expression repeat="yes"
noclean="1"><a\shref="http://www.allmusic.com/genre/[^"]*">([^<]*)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -415,10 +401,10 @@
<ParseAMGAlbumStyles dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1" output="\1" dest="7">
- <expression noclean="1"><dd
class="styles">(.*?)</dd></expression>
+ <expression
noclean="1"><h4>Styles</h4>\s*<div>(.*?)</div></expression>
</RegExp>
<RegExp input="$$7"
output="<style>\1</style>" dest="2">
- <expression repeat="yes" trim="1"
noclean="1"><li>[^>]*>([^<]*)</a></li></expression>
+ <expression repeat="yes"
noclean="1"><a\shref="http://www.allmusic.com/style/[^"]*">([^<]*)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -432,10 +418,10 @@
<ParseAMGAlbumMoods dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1" output="\1" dest="8">
- <expression trim="1"
noclean="1">>\s*<h4>album moods</h4>(.*?)</ul></expression>
+ <expression trim="1"
noclean="1">>\s*<h4>Album\sMoods</h4>(.*?)</section></expression>
</RegExp>
<RegExp input="$$8"
output="<mood>\1</mood>" dest="2">
- <expression repeat="yes"
noclean="1"><li>[^>]*>([^<]*)</a></li></expression>
+ <expression repeat="yes"
noclean="1"><a\shref="http://www.allmusic.com/mood/[^"]*">([^<]*)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -449,10 +435,10 @@
<ParseAMGAlbumThemes dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1" output="\1" dest="4">
- <expression noclean="1"><h4>album
themes</h4>(.*?)</ul></expression>
+ <expression trim="1"
noclean="1">>\s*<h4>Themes</h4>(.*?)</ul></expression>
</RegExp>
<RegExp input="$$4"
output="<theme>\1</theme>" dest="2">
- <expression repeat="yes"
noclean="1"><li>[^>]*>([^<]*)</a></li></expression>
+ <expression repeat="yes"
noclean="1"><a\shref="http://www.allmusic.com/theme/[^"]*">([^<]*)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -480,7 +466,7 @@
<ParseAMGAlbumThumbs dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1"
output="<thumb>http://cps-static.rovicorp.com/3/JPG_500/\1</thumb>";
dest="2">
- <expression noclean="1"><meta
property="og:image"
content="http://cps-static.rovicorp.com/3/JPG_[^/]*/([^"]*)</expression>
+ <expression
noclean="1">"http://cps-static.rovicorp.com/3/JPG_[^/]*/([^"]*)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
-----------------------------------------------------------------------
Summary of changes:
metadata.common.allmusic.com/addon.xml | 2 +-
metadata.common.allmusic.com/allmusic.xml | 84 ++++++++++++-----------------
2 files changed, 36 insertions(+), 50 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
