The branch, eden has been updated
via a9e1ec1f20842d29359f4d09c847907fd7881658 (commit)
from 0115ce3b40e6aa642a7e3896aa6cf6adb52ccfd0 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=a9e1ec1f20842d29359f4d09c847907fd7881658
commit a9e1ec1f20842d29359f4d09c847907fd7881658
Author: olympia <[email protected]>
Date: Sat Jun 16 21:09:49 2012 +0200
[metadata.common.musicbrainz.org] updated to version 1.2.0
diff --git a/metadata.common.musicbrainz.org/addon.xml
b/metadata.common.musicbrainz.org/addon.xml
index 47c2e25..5d81165 100644
--- a/metadata.common.musicbrainz.org/addon.xml
+++ b/metadata.common.musicbrainz.org/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.common.musicbrainz.org"
name="musicbrainz"
- version="1.1.4"
+ version="1.2.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.common.musicbrainz.org/musicbrainz.xml
b/metadata.common.musicbrainz.org/musicbrainz.xml
index 9b8d5ff..1e834e5 100644
--- a/metadata.common.musicbrainz.org/musicbrainz.xml
+++ b/metadata.common.musicbrainz.org/musicbrainz.xml
@@ -1,11 +1,14 @@
<scraperfunctions>
- <GetMBDiscographyByMBID dest="5">
+ <GetMBDiscographyByMBID dest="5" clearbuffers="no">
<RegExp input="$$1" output="<details><url
function="ParseMBDiscography"
cache="mb-\1-discog.xml">http://musicbrainz.org/ws/2/release-group?artist=\1&amp;limit=100&amp;type=album</url></details>"
dest="5">
<expression noclean="1" />
</RegExp>
</GetMBDiscographyByMBID>
- <ParseMBDiscography dest="5">
+ <ParseMBDiscography dest="5" clearbuffers="no">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="" output="" dest="2">
+ <expression />
+ </RegExp>
<RegExp input="$$1"
output="<album><year>\4</year><title>\2</title><label>\1</label></album>"
dest="2">
<expression repeat="yes" clear="yes"
fixchars="1,2,3" noclean="1,2,3"> type="Album"
id="([^"]*)"><title>([^<]*)</title><first-release-date(\s/)?>(\d{4})?</expression>
</RegExp>
@@ -13,20 +16,61 @@
</RegExp>
</ParseMBDiscography>
- <GetMBLafeSpanByMBID dest="5">
+ <GetMBLafeSpanByMBID dest="5" clearbuffers="no">
<RegExp input="$$1" output="<details><url
function="ParseMBLifeSpan"
cache="mb-\1-artist.xml">http://www.musicbrainz.org/ws/2/artist/\1?inc=url-rels</url></details>"
dest="5">
<expression noclean="1" />
</RegExp>
</GetMBLafeSpanByMBID>
- <ParseMBLifeSpan dest="5">
+ <ParseMBLifeSpan 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</born>" dest="11">
+ <expression><artist
type="Person".*?<life-span><begin>([^<]*)</expression>
+ </RegExp>
+ <RegExp input="$$1"
output="<died>\1</died>" dest="11+">
+ <expression><artist
type="Person".*?<life-span><begin>[^<]*</begin><end>([^<]*)</expression>
+ </RegExp>
+ <RegExp input="$$1"
output="<formed>\1</formed>" dest="11">
+ <expression><artist
type="Group".*?<life-span><begin>([^<]*)</expression>
+ </RegExp>
+ <RegExp input="$$1"
output="<disbanded>\1</disbanded>" dest="11+">
+ <expression><artist
type="Group".*?<life-span><begin>[^<]*</begin><end>([^<]*)</expression>
+ </RegExp>
+ <RegExp input="$$11" output="$$12" dest="2">
+ <RegExp input="$INFO[lifespanfbsource]"
output="<chain
function="GetAMGFallbackArtistLifeSpanByAMGID">$$9</chain>"
dest="12">
+ <expression>allmusic.com</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>
+ </ParseMBLifeSpan>
+
+ <GetMBFallbackLafeSpanByMBID dest="5" clearbuffers="no">
+ <RegExp input="$$1" output="<details><url
function="ParseFallbackMBLifeSpan"
cache="mb-\1-artist.xml">http://www.musicbrainz.org/ws/2/artist/\1?inc=url-rels</url></details>"
dest="5">
+ <expression noclean="1" />
+ </RegExp>
+ </GetMBFallbackLafeSpanByMBID>
+ <ParseFallbackMBLifeSpan 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</born>" dest="2">
<expression><artist
type="Person".*?<life-span><begin>([^<]*)</expression>
</RegExp>
<RegExp input="$$1"
output="<died>\1</died>" dest="2+">
<expression><artist
type="Person".*?<life-span><begin>[^<]*</begin><end>([^<]*)</expression>
</RegExp>
- <RegExp input="$$1"
output="<formed>\1</formed>" dest="2+">
+ <RegExp input="$$1"
output="<formed>\1</formed>" dest="2">
<expression><artist
type="Group".*?<life-span><begin>([^<]*)</expression>
</RegExp>
<RegExp input="$$1"
output="<disbanded>\1</disbanded>" dest="2+">
@@ -34,7 +78,7 @@
</RegExp>
<expression noclean="1"/>
</RegExp>
- </ParseMBLifeSpan>
+ </ParseFallbackMBLifeSpan>
<GetMBAlbumTitleByMBID dest="5">
<RegExp input="$$1" output="<details><url
function="ParseMBAlbumTitle"
cache="mb-\1-album.xml">http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></details>"
dest="5">
-----------------------------------------------------------------------
Summary of changes:
metadata.common.musicbrainz.org/addon.xml | 2 +-
metadata.common.musicbrainz.org/musicbrainz.xml | 56 ++++++++++++++++++++---
2 files changed, 51 insertions(+), 7 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