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="&lt;details&gt;&lt;url 
function=&quot;ParseMBDiscography&quot; 
cache=&quot;mb-\1-discog.xml&quot;&gt;http://musicbrainz.org/ws/2/release-group?artist=\1&amp;amp;limit=100&amp;amp;type=album&lt;/url&gt;&lt;/details&gt;";
 dest="5">
                        <expression noclean="1" />
                </RegExp>
        </GetMBDiscographyByMBID>
-       <ParseMBDiscography dest="5">
+       <ParseMBDiscography dest="5" clearbuffers="no">
                <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
+                       <RegExp input="" output="" dest="2">
+                               <expression />
+                       </RegExp>
                        <RegExp input="$$1" 
output="&lt;album&gt;&lt;year&gt;\4&lt;/year&gt;&lt;title&gt;\2&lt;/title&gt;&lt;label&gt;\1&lt;/label&gt;&lt;/album&gt;"
 dest="2">
                                <expression repeat="yes" clear="yes" 
fixchars="1,2,3" noclean="1,2,3"> type="Album" 
id="([^"]*)"&gt;&lt;title&gt;([^&lt;]*)&lt;/title&gt;&lt;first-release-date(\s/)?&gt;(\d{4})?</expression>
                        </RegExp>
@@ -13,20 +16,61 @@
                </RegExp>
        </ParseMBDiscography>
 
-       <GetMBLafeSpanByMBID dest="5">
+       <GetMBLafeSpanByMBID dest="5" clearbuffers="no">
                <RegExp input="$$1" output="&lt;details&gt;&lt;url 
function=&quot;ParseMBLifeSpan&quot; 
cache=&quot;mb-\1-artist.xml&quot;&gt;http://www.musicbrainz.org/ws/2/artist/\1?inc=url-rels&lt;/url&gt;&lt;/details&gt;";
 dest="5">
                        <expression noclean="1" />
                </RegExp>
        </GetMBLafeSpanByMBID>
-       <ParseMBLifeSpan dest="5">
+       <ParseMBLifeSpan dest="5" clearbuffers="no">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
+                       <RegExp input="" output="" dest="2">
+                               <expression />
+                       </RegExp>
+                       <RegExp input="" output="" dest="11">
+                               <expression />
+                       </RegExp>
+                       <RegExp input="$$1" 
output="&lt;born&gt;\1&lt;/born&gt;" dest="11">
+                       <expression>&lt;artist 
type=&quot;Person&quot;.*?&lt;life-span&gt;&lt;begin&gt;([^&lt;]*)</expression>
+                       </RegExp>
+                       <RegExp input="$$1" 
output="&lt;died&gt;\1&lt;/died&gt;" dest="11+">
+                       <expression>&lt;artist 
type=&quot;Person&quot;.*?&lt;life-span&gt;&lt;begin&gt;[^&lt;]*&lt;/begin&gt;&lt;end&gt;([^&lt;]*)</expression>
+                       </RegExp>
+                       <RegExp input="$$1" 
output="&lt;formed&gt;\1&lt;/formed&gt;" dest="11">
+                       <expression>&lt;artist 
type=&quot;Group&quot;.*?&lt;life-span&gt;&lt;begin&gt;([^&lt;]*)</expression>
+                       </RegExp>
+                       <RegExp input="$$1" 
output="&lt;disbanded&gt;\1&lt;/disbanded&gt;" dest="11+">
+                       <expression>&lt;artist 
type=&quot;Group&quot;.*?&lt;life-span&gt;&lt;begin&gt;[^&lt;]*&lt;/begin&gt;&lt;end&gt;([^&lt;]*)</expression>
+                       </RegExp>
+                       <RegExp input="$$11" output="$$12" dest="2">
+                               <RegExp input="$INFO[lifespanfbsource]" 
output="&lt;chain 
function=&quot;GetAMGFallbackArtistLifeSpanByAMGID&quot;&gt;$$9&lt;/chain&gt;" 
dest="12">
+                                       <expression>allmusic.com</expression>
+                               </RegExp>
+                       <expression>^$</expression>
+                       </RegExp>
+                       <RegExp input="$$11" output="$$11" dest="2">
+                       <expression 
noclean="1">&lt;(?:born|formed)*&gt;(.+)&lt;/(?:born|formed)*&gt;</expression>
+                       </RegExp>
+                       <expression noclean="1"/>
+               </RegExp>
+       </ParseMBLifeSpan>
+
+       <GetMBFallbackLafeSpanByMBID dest="5" clearbuffers="no">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
function=&quot;ParseFallbackMBLifeSpan&quot; 
cache=&quot;mb-\1-artist.xml&quot;&gt;http://www.musicbrainz.org/ws/2/artist/\1?inc=url-rels&lt;/url&gt;&lt;/details&gt;";
 dest="5">
+                       <expression noclean="1" />
+               </RegExp>
+       </GetMBFallbackLafeSpanByMBID>
+       <ParseFallbackMBLifeSpan dest="5" clearbuffers="no">
                <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
+                       <RegExp input="" output="" dest="2">
+                               <expression />
+                       </RegExp>
                        <RegExp input="$$1" 
output="&lt;born&gt;\1&lt;/born&gt;" dest="2">
                        <expression>&lt;artist 
type=&quot;Person&quot;.*?&lt;life-span&gt;&lt;begin&gt;([^&lt;]*)</expression>
                        </RegExp>
                        <RegExp input="$$1" 
output="&lt;died&gt;\1&lt;/died&gt;" dest="2+">
                        <expression>&lt;artist 
type=&quot;Person&quot;.*?&lt;life-span&gt;&lt;begin&gt;[^&lt;]*&lt;/begin&gt;&lt;end&gt;([^&lt;]*)</expression>
                        </RegExp>
-                       <RegExp input="$$1" 
output="&lt;formed&gt;\1&lt;/formed&gt;" dest="2+">
+                       <RegExp input="$$1" 
output="&lt;formed&gt;\1&lt;/formed&gt;" dest="2">
                        <expression>&lt;artist 
type=&quot;Group&quot;.*?&lt;life-span&gt;&lt;begin&gt;([^&lt;]*)</expression>
                        </RegExp>
                        <RegExp input="$$1" 
output="&lt;disbanded&gt;\1&lt;/disbanded&gt;" dest="2+">
@@ -34,7 +78,7 @@
                        </RegExp>
                        <expression noclean="1"/>
                </RegExp>
-       </ParseMBLifeSpan>
+       </ParseFallbackMBLifeSpan>
 
        <GetMBAlbumTitleByMBID dest="5">
                <RegExp input="$$1" output="&lt;details&gt;&lt;url 
function=&quot;ParseMBAlbumTitle&quot; 
cache=&quot;mb-\1-album.xml&quot;&gt;http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings&lt;/url&gt;&lt;/details&gt;";
 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

Reply via email to