The branch, eden has been updated
via 5862fa47eef9774ac2bef05b3cf9c80aaa236116 (commit)
from 8c98a4613535e0e1a8f0b420da5afd10f01c9d5b (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=5862fa47eef9774ac2bef05b3cf9c80aaa236116
commit 5862fa47eef9774ac2bef05b3cf9c80aaa236116
Author: olympia <[email protected]>
Date: Sat Jun 16 21:15:37 2012 +0200
[metadata.common.allmusic.com] updated to version 2.4.0
diff --git a/metadata.common.allmusic.com/addon.xml
b/metadata.common.allmusic.com/addon.xml
index dc70474..740c87b 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.3.1"
+ version="2.4.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 fbfb621..88cb721 100644
--- a/metadata.common.allmusic.com/allmusic.xml
+++ b/metadata.common.allmusic.com/allmusic.xml
@@ -1,16 +1,22 @@
<scraperfunctions>
- <GetAMGDiscographyByAMGID dest="5">
+ <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">
- <expression noclean="1"/>
+ <expression clear="yes" noclean="1"/>
</RegExp>
</GetAMGDiscographyByAMGID>
- <ParseAMGDiscography dest="5">
+ <ParseAMGDiscography dest="5" clearbuffers="no">
<RegExp input="$$2$$3"
output="<details>\1</details>" dest="5">
+ <RegExp input="" output="" dest="2">
+ <expression />
+ </RegExp>
+ <RegExp input="" output="" dest="3">
+ <expression />
+ </RegExp>
<RegExp input="$$1"
output="<album><year>\1</year><title>\2</title><label>\3</label></album>"
dest="2">
- <expression repeat="yes" clear="yes"
trim="1"><td class="year "
data-sort-value="[^>]*>([^<]*)</td>[^<]*<td
class="title" data-sort-value="([^"]*)(.*?<div
class="label">([^<]*))?</expression>
+ <expression repeat="yes" clear="yes"
trim="1"><td class="year "
data-sort-value="[^>]*>([^<]*)</td>[^<]*<td
class=".*?title="([^"]*)</expression>
</RegExp>
<RegExp input="$$2" output="\1&amp;\2" dest="3">
- <expression repeat="yes"
noclean="1,2">(.*?)&(.+)</expression>
+ <expression clear="yes" repeat="yes"
noclean="1,2">(.*?)&(.+)</expression>
</RegExp>
<RegExp input="$$3" output="" dest="2">
<expression>(.+)</expression>
@@ -19,37 +25,23 @@
</RegExp>
</ParseAMGDiscography>
- <GetAMGFakeBiographyByAMGID dest="5">
- <RegExp input="$$1" output="<details><url
cache="am-\1-artist.html"
function="ParseAMGFakeBiography">http://www.allmusic.com/artist/\1</url></details>";
dest="5">
- <expression noclean="1"/>
- </RegExp>
- </GetAMGFakeBiographyByAMGID>
- <ParseAMGFakeBiography dest="5">
- <RegExp input="$$2" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1" output="<biography>Fetching
artist biography from allmusic.com is not possible due to copyright
reasons.</biography>" dest="2">
- <expression noclean="1" />
- </RegExp>
- <expression noclean="1"/>
- </RegExp>
- </ParseAMGFakeBiography>
-
<GetAMGBiographyByAMGID dest="5" clearbuffers="no">
<RegExp input="$$1" output="<details><url
cache="am-\1-artist.html"
function="ParseAMGBiography">http://www.allmusic.com/artist/\1</url></details>";
dest="5">
<expression noclean="1"/>
</RegExp>
</GetAMGBiographyByAMGID>
- <ParseAMGBiography dest="5">
+ <ParseAMGBiography dest="5" clearbuffers="no">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="" output="" dest="2">
+ <expression />
+ </RegExp>
<RegExp input="$$1" output="\1" dest="11">
<expression clear="yes">"
itemprop="description">(.*?)div class="advertisement
leaderboard"></expression>
</RegExp>
<RegExp input="$$11" output="$$12" dest="2">
- <RegExp input="$INFO[biogfbsource]"
output="<chain
function="GetLastFMBiographyByMBID">$$8</chain>" dest="12">
+ <RegExp input="$INFO[biogfbsource]"
output="<chain
function="GetLastFMFallbackBiographyByMBID">$$8</chain>"
dest="12">
<expression>last.fm</expression>
</RegExp>
- <RegExp input="$INFO[biogfbsource]"
output="<chain
function="GetAMGBiographyByAMGID">$$9</chain>" dest="12">
- <expression>allmusic.com</expression>
- </RegExp>
<expression>^$</expression>
</RegExp>
<RegExp input="$$11"
output="<biography>\1</biography>" dest="2">
@@ -59,6 +51,23 @@
</RegExp>
</ParseAMGBiography>
+ <GetAMGFallbackBiographyByAMGID dest="5" clearbuffers="no">
+ <RegExp input="$$1" output="<details><url
cache="am-\1-artist.html"
function="ParseAMGFallbackBiography">http://www.allmusic.com/artist/\1</url></details>";
dest="5">
+ <expression noclean="1"/>
+ </RegExp>
+ </GetAMGFallbackBiographyByAMGID>
+ <ParseAMGFallbackBiography dest="5" clearbuffers="no">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="" output="" dest="2">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="2">
+ <expression clear="yes">"
itemprop="description">(.*?)div class="advertisement
leaderboard"></expression>
+ </RegExp>
+ <expression noclean="1"/>
+ </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"/>
@@ -73,20 +82,61 @@
</RegExp>
</ParseAMGArtistName>
- <GetAMGArtistLifeSpanByAMGID dest="5">
+ <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"/>
</RegExp>
</GetAMGArtistLifeSpanByAMGID>
- <ParseAMGArtistLifeSpan dest="5">
+ <ParseAMGArtistLifeSpan dest="5" clearbuffers="no">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="" output="" dest="2">
+ <expression />
+ </RegExp>
+ <RegExp input="" output="" dest="11">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1" output="<born>\1
\2</born>" dest="11+">
+ <expression
trim="1,2"><dt>\s*Born[^>]*>[^>]*>[^>]*>(.*?\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>
+ </RegExp>
+ <RegExp input="$$1"
output="<formed>\1</formed>" dest="11+">
+ <expression
trim="1,2"><dt>\s*Formed[^>]*>[^>]*>[^>]*>(.*?\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>
+ </RegExp>
+ <RegExp input="$$11" output="$$12" dest="2">
+ <RegExp input="$INFO[lifespanfbsource]"
output="<chain
function="GetMBLafeSpanByMBID">$$8</chain>" dest="12">
+ <expression>MusicBrainz</expression>
+ </RegExp>
+ <expression>^$</expression>
+ </RegExp>
+ <RegExp input="$$11" output="$$11" dest="2">
+ <expression
noclean="1"><(?:born|formed)*>(.+)</(?:born|formed)*></expression>
+ </RegExp>
+ <expression noclean="1"/>
+ </RegExp>
+ </ParseAMGArtistLifeSpan>
+
+ <GetAMGFallbackArtistLifeSpanByAMGID dest="5" clearbuffers="no">
+ <RegExp input="$$1" output="<details><url
cache="am-\1-artist.html"
function="ParseAMGFallbackArtistLifeSpan">http://www.allmusic.com/artist/\1</url></details>";
dest="5">
+ <expression noclean="1"/>
+ </RegExp>
+ </GetAMGFallbackArtistLifeSpanByAMGID>
+ <ParseAMGFallbackArtistLifeSpan dest="5" clearbuffers="no">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="" output="" dest="2">
+ <expression />
+ </RegExp>
<RegExp input="$$1" output="<born>\1
\2</born>" dest="2">
<expression
trim="1,2"><dt>\s*Born[^>]*>[^>]*>[^>]*>(.*?\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>
</RegExp>
- <RegExp input="$$1"
output="<formed>\1</formed>" dest="2+">
+ <RegExp input="$$1"
output="<formed>\1</formed>" dest="2">
<expression
trim="1,2"><dt>\s*Formed[^>]*>[^>]*>[^>]*>(.*?\d{4})\s*([^<]*)?</expression>
</RegExp>
<RegExp input="$$1"
output="<disbanded>\1</disbanded>" dest="2+">
@@ -94,15 +144,18 @@
</RegExp>
<expression noclean="1"/>
</RegExp>
- </ParseAMGArtistLifeSpan>
+ </ParseAMGFallbackArtistLifeSpan>
- <GetAMGArtistYearsActiveByAMGID dest="5">
+ <GetAMGArtistYearsActiveByAMGID dest="5" clearbuffers="no">
<RegExp input="$$1" output="<details><url
cache="am-\1-artist.html"
function="ParseAMGArtistYearsActive">http://www.allmusic.com/artist/\1</url></details>";
dest="5">
<expression noclean="1"/>
</RegExp>
</GetAMGArtistYearsActiveByAMGID>
- <ParseAMGArtistYearsActive dest="5">
+ <ParseAMGArtistYearsActive dest="5" clearbuffers="no">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="" output="" dest="2">
+ <expression />
+ </RegExp>
<RegExp input="$$1"
output="<yearsactive>\1</yearsactive>" dest="2">
<expression trim="1" noclean="1"><dd
class="active">([^<]*)<</expression>
</RegExp>
@@ -110,47 +163,126 @@
</RegExp>
</ParseAMGArtistYearsActive>
- <GetAMGArtistGenresByAMGID dest="5">
+ <GetAMGArtistGenresByAMGID dest="5" clearbuffers="no">
<RegExp input="$$1" output="<details><url
cache="am-\1-artist.html"
function="ParseAMGArtistGenres">http://www.allmusic.com/artist/\1</url></details>";
dest="5">
<expression noclean="1"/>
</RegExp>
</GetAMGArtistGenresByAMGID>
- <ParseAMGArtistGenres dest="5">
+ <ParseAMGArtistGenres dest="5" clearbuffers="no">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="" output="" dest="2">
+ <expression />
+ </RegExp>
+ <RegExp input="" output="" dest="6">
+ <expression />
+ </RegExp>
<RegExp input="$$1" output="\1" dest="6">
<expression
noclean="1"><dt>Genres</dt>(.*?)</dd></expression>
</RegExp>
- <RegExp input="$$6"
output="<genre>\2</genre>" dest="2">
+ <RegExp input="$$6"
output="<genre>\2</genre>" dest="11">
<expression repeat="yes"
noclean="1"><li><a
href="/genre/[^"]*">(<strong>)?([^<]*)</expression>
</RegExp>
+ <RegExp input="$$11" output="$$12" dest="2">
+ <RegExp input="$INFO[genresfbsource]"
output="<chain
function="GetLastFMFallbackArtistGenresByMBID">$$8</chain>"
dest="12">
+ <expression>last.fm</expression>
+ </RegExp>
+
<expression><genre></genre></expression>
+ </RegExp>
+ <RegExp input="$$11" output="$$11" dest="2">
+
<expression><genre>(.+)</genre></expression>
+ </RegExp>
<expression noclean="1" />
</RegExp>
</ParseAMGArtistGenres>
- <GetAMGArtistStylesByAMGID dest="5">
+ <GetAMGFallbackArtistGenresByAMGID dest="5" clearbuffers="no">
+ <RegExp input="$$1" output="<details><url
cache="am-\1-artist.html"
function="ParseAMGFallbackArtistGenres">http://www.allmusic.com/artist/\1</url></details>";
dest="5">
+ <expression noclean="1"/>
+ </RegExp>
+ </GetAMGFallbackArtistGenresByAMGID>
+ <ParseAMGFallbackArtistGenres dest="5" clearbuffers="no">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="" output="" dest="2">
+ <expression />
+ </RegExp>
+ <RegExp input="" output="" dest="6">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="6">
+ <expression
noclean="1"><dt>Genres</dt>(.*?)</dd></expression>
+ </RegExp>
+ <RegExp input="$$6"
output="<genre>\2</genre>" dest="2">
+ <expression repeat="yes"
noclean="1"><li><a
href="/genre/[^"]*">(<strong>)?([^<]*)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseAMGFallbackArtistGenres>
+
+ <GetAMGArtistStylesByAMGID dest="5" clearbuffers="no">
<RegExp input="$$1" output="<details><url
cache="am-\1-artist.html"
function="ParseAMGArtistStyles">http://www.allmusic.com/artist/\1</url></details>";
dest="5">
<expression noclean="1"/>
</RegExp>
</GetAMGArtistStylesByAMGID>
- <ParseAMGArtistStyles dest="5">
+ <ParseAMGArtistStyles dest="5" clearbuffers="no">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="" output="" dest="2">
+ <expression />
+ </RegExp>
+ <RegExp input="" output="" dest="7">
+ <expression />
+ </RegExp>
<RegExp input="$$1" output="\1" dest="7">
<expression
noclean="1"><dt>Styles</dt>(.*?)</dd></expression>
</RegExp>
- <RegExp input="$$7"
output="<style>\1</style>" dest="2">
+ <RegExp input="$$7"
output="<style>\1</style>" dest="11">
<expression repeat="yes"
noclean="1"><li><a
href="/style/[^"]*">([^<]*)</expression>
</RegExp>
+ <RegExp input="$$11" output="$$12" dest="2">
+ <RegExp input="$INFO[stylesfbsource]"
output="<chain
function="GetLastFMFallbackArtistStylesByMBID">$$8</chain>"
dest="12">
+ <expression>last.fm</expression>
+ </RegExp>
+
<expression><style></style></expression>
+ </RegExp>
+ <RegExp input="$$11" output="$$11" dest="2">
+
<expression><style>(.+)</style></expression>
+ </RegExp>
<expression noclean="1" />
</RegExp>
</ParseAMGArtistStyles>
- <GetAMGArtistMoodsByAMGID dest="5">
+ <GetAMGFallbackArtistStylesByAMGID dest="5" clearbuffers="no">
+ <RegExp input="$$1" output="<details><url
cache="am-\1-artist.html"
function="ParseAMGFallbackArtistStyles">http://www.allmusic.com/artist/\1</url></details>";
dest="5">
+ <expression noclean="1"/>
+ </RegExp>
+ </GetAMGFallbackArtistStylesByAMGID>
+ <ParseAMGFallbackArtistStyles dest="5" clearbuffers="no">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="" output="" dest="2">
+ <expression />
+ </RegExp>
+ <RegExp input="" output="" dest="7">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression
noclean="1"><dt>Styles</dt>(.*?)</dd></expression>
+ </RegExp>
+ <RegExp input="$$7"
output="<style>\1</style>" dest="2">
+ <expression repeat="yes"
noclean="1"><li><a
href="/style/[^"]*">([^<]*)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseAMGFallbackArtistStyles>
+
+ <GetAMGArtistMoodsByAMGID dest="5" clearbuffers="no">
<RegExp input="$$1" output="<details><url
cache="am-\1-artist.html"
function="ParseAMGArtistMoods">http://www.allmusic.com/artist/\1</url></details>";
dest="5">
<expression noclean="1"/>
</RegExp>
</GetAMGArtistMoodsByAMGID>
- <ParseAMGArtistMoods dest="5">
+ <ParseAMGArtistMoods dest="5" clearbuffers="no">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="" output="" dest="2">
+ <expression />
+ </RegExp>
<RegExp input="$$1" output="\1" dest="8">
<expression noclean="1"><h4>artist
moods</h4>(.*?)</ul></expression>
</RegExp>
@@ -161,13 +293,16 @@
</RegExp>
</ParseAMGArtistMoods>
- <GetAMGArtistThumbsByAMGID dest="5">
+ <GetAMGArtistThumbsByAMGID dest="5" clearbuffers="no">
<RegExp input="$$1" output="<details><url
cache="am-\1-artist.html"
function="ParseAMGArtistThumbs">http://www.allmusic.com/artist/\1</url></details>";
dest="5">
<expression noclean="1"/>
</RegExp>
</GetAMGArtistThumbsByAMGID>
- <ParseAMGArtistThumbs dest="5">
+ <ParseAMGArtistThumbs dest="5" clearbuffers="no">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="" output="" dest="2">
+ <expression />
+ </RegExp>
<RegExp input="$$1" output="\1" dest="9">
<expression noclean="1"><h4>photo
gallery</h4>(.*?)<h4></expression>
</RegExp>
@@ -179,20 +314,6 @@
</ParseAMGArtistThumbs>
- <GetAMGFakeAlbumReviewByAMGID dest="5">
- <RegExp input="$$1" output="<details><url
cache="am-\1-album.html"
function="ParseAMGFakeAlbumReview">http://www.allmusic.com/album/\1</url></details>";
dest="5">
- <expression noclean="1"/>
- </RegExp>
- </GetAMGFakeAlbumReviewByAMGID>
- <ParseAMGFakeAlbumReview dest="5">
- <RegExp input="$$2" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1" output="<review>Fetching
album review from allmusic.com is not possible due to copyright
reasons.</review>" dest="2">
- <expression noclean="1"/>
- </RegExp>
- <expression noclean="1" />
- </RegExp>
- </ParseAMGFakeAlbumReview>
-
<GetAMGAlbumReviewByAMGID dest="5">
<RegExp input="$$1" output="<details><url
cache="am-\1-album.html"
function="ParseAMGAlbumReview">http://www.allmusic.com/album/\1</url></details>";
dest="5">
<expression noclean="1"/>
@@ -362,4 +483,33 @@
</RegExp>
</ParseAMGAlbumThumbs>
+
+ <GetAMGFakeBiographyByAMGID dest="5">
+ <RegExp input="$$1" output="<details><url
cache="am-\1-artist.html"
function="ParseAMGFakeBiography">http://www.allmusic.com/artist/\1</url></details>";
dest="5">
+ <expression noclean="1"/>
+ </RegExp>
+ </GetAMGFakeBiographyByAMGID>
+ <ParseAMGFakeBiography dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1" output="<biography>Fetching
artist biography from allmusic.com is not possible due to copyright
reasons.</biography>" dest="2">
+ <expression noclean="1" />
+ </RegExp>
+ <expression noclean="1"/>
+ </RegExp>
+ </ParseAMGFakeBiography>
+
+ <GetAMGFakeAlbumReviewByAMGID dest="5">
+ <RegExp input="$$1" output="<details><url
cache="am-\1-album.html"
function="ParseAMGFakeAlbumReview">http://www.allmusic.com/album/\1</url></details>";
dest="5">
+ <expression noclean="1"/>
+ </RegExp>
+ </GetAMGFakeAlbumReviewByAMGID>
+ <ParseAMGFakeAlbumReview dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1" output="<review>Fetching
album review from allmusic.com is not possible due to copyright
reasons.</review>" dest="2">
+ <expression noclean="1"/>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseAMGFakeAlbumReview>
+
</scraperfunctions>
-----------------------------------------------------------------------
Summary of changes:
metadata.common.allmusic.com/addon.xml | 2 +-
metadata.common.allmusic.com/allmusic.xml | 258 +++++++++++++++++++++++------
2 files changed, 205 insertions(+), 55 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
