The branch, frodo has been updated
       via  9321ec4dd67eadd6fdddd4ee2b3f9e59256a8950 (commit)
      from  9d4ecef6ab794044edac089e599d71cc464e42ba (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=9321ec4dd67eadd6fdddd4ee2b3f9e59256a8950

commit 9321ec4dd67eadd6fdddd4ee2b3f9e59256a8950
Author: olympia <olym...@xbmc.org>
Date:   Wed May 29 11:53:11 2013 +0200

    [metadata.artists.universal] updated to version 3.0.0

diff --git a/metadata.artists.universal/addon.xml 
b/metadata.artists.universal/addon.xml
index 1bc15a7..e30f4af 100644
--- a/metadata.artists.universal/addon.xml
+++ b/metadata.artists.universal/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.artists.universal"
        name="Universal Artist Scraper"
-       version="2.6.5"
+       version="3.0.0"
        provider-name="Olympia, Team XBMC">
   <requires>
     <import addon="xbmc.metadata" version="2.1.0"/>
diff --git a/metadata.artists.universal/artistuniversal.xml 
b/metadata.artists.universal/artistuniversal.xml
index 48945d7..03799a8 100644
--- a/metadata.artists.universal/artistuniversal.xml
+++ b/metadata.artists.universal/artistuniversal.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.1" date="2013-02-27">
+<scraper framework="1.1" date="2013-05-29">
        <NfoUrl dest="3">
-               <RegExp input="$$1" 
output="&lt;url&gt;http://www.musicbrainz.org/ws/2/artist/\1?inc=url-rels&lt;/url&gt;";
 dest="3">
+               <RegExp input="$$1" 
output="&lt;url&gt;http://musicbrainz.org/ws/2/artist/\1?inc=url-rels&lt;/url&gt;";
 dest="3">
                        
<expression>http://musicbrainz.org/artist/(.+)</expression>
                </RegExp>
        </NfoUrl>
+       <ResolveIDToUrl dest="3">
+               <RegExp input="$$1" 
output="&lt;url&gt;http://musicbrainz.org/ws/2/artist/\1?inc=url-rels&lt;/url&gt;";
 dest="3">
+                       <expression>(.+)</expression>
+               </RegExp>
+       </ResolveIDToUrl>
+
        <CreateArtistSearchUrl dest="3">
                <RegExp input="$$1" 
output="&lt;url&gt;http://search.musicbrainz.org/ws/2/artist/?fmt=xml&amp;query=artist:&quot;$$4&quot;&amp;limit=100&lt;/url&gt;";
 dest="3">
                        <RegExp input="$$1" output="\1" dest="4">
@@ -21,10 +27,10 @@
        </CreateArtistSearchUrl>
        <GetArtistSearchResults dest="8">
                <RegExp input="$$5" output="&lt;results 
sorted=&quot;yes&quot;&gt;\1&lt;/results&gt;" dest="8">
-                       <RegExp input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;genre&gt;\7&lt;/genre&gt;&lt;url
 
cache=&quot;mb-\1-artist.xml&quot;&gt;http://www.musicbrainz.org/ws/2/artist/\1?inc=url-rels&lt;/url&gt;&lt;/entity&gt;";
 dest="9">
+                       <RegExp input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;genre&gt;\7&lt;/genre&gt;&lt;url
 
cache=&quot;mb-\1-artist.xml&quot;&gt;http://musicbrainz.org/ws/2/artist/\1?inc=url-rels&lt;/url&gt;&lt;/entity&gt;";
 dest="9">
                                <expression repeat="yes" noclean="1">artist 
id=&quot;([^&quot;]*)&quot;(?:\stype=&quot;[^&quot;]*&quot;)* 
ext:score=&quot;[^&quot;]*&quot;&gt;&lt;name&gt;([^&lt;]*)&lt;/name&gt;(&lt;sort-name&gt;[^&lt;]*&lt;/sort-name&gt;)?(&lt;gender&gt;[^&lt;]*&lt;/gender&gt;)?(&lt;country&gt;[^&lt;]*&lt;/country&gt;)?(&lt;disambiguation&gt;([^&lt;]*))?</expression>
                        </RegExp>
-                       <RegExp input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;genre&gt;\7&lt;/genre&gt;&lt;url
 
cache=&quot;mb-\1-artist.xml&quot;&gt;http://www.musicbrainz.org/ws/2/artist/\1?inc=url-rels&lt;/url&gt;&lt;/entity&gt;";
 dest="9">
+                       <RegExp input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;genre&gt;\7&lt;/genre&gt;&lt;url
 
cache=&quot;mb-\1-artist.xml&quot;&gt;http://musicbrainz.org/ws/2/artist/\1?inc=url-rels&lt;/url&gt;&lt;/entity&gt;";
 dest="9">
                                <expression repeat="yes" noclean="1">artist 
ext:score=&quot;[^&quot;]*&quot;(?:\stype=&quot;[^&quot;]*&quot;)* 
id=&quot;([^&quot;]*)&quot;&gt;&lt;name&gt;([^&lt;]*)&lt;/name&gt;(&lt;sort-name&gt;[^&lt;]*&lt;/sort-name&gt;)?(&lt;gender&gt;[^&lt;]*&lt;/gender&gt;)?(&lt;country&gt;[^&lt;]*&lt;/country&gt;)?(&lt;disambiguation&gt;([^&lt;]*))?</expression>
                        </RegExp>
                        <RegExp input="$$9" output="\1" dest="5">
@@ -43,8 +49,8 @@
                        <RegExp input="$$1" output="\2" dest="9">
                                <expression 
noclean="1">&gt;http://(www.)?allmusic.com/artist/([^&lt;]*)</expression>
                        </RegExp>
-                       <RegExp input="$$1" 
output="&lt;name&gt;\1&lt;/name&gt;" dest="5">
-                               <expression 
noclean="1">&lt;artist(?:\stype=&quot;[^&quot;]*&quot;)* 
id=&quot;[^&quot;]*&quot;&gt;&lt;name&gt;([^&lt;]*)</expression>
+                       <RegExp input="$$1" 
output="&lt;musicBrainzArtistID&gt;\1&lt;/musicBrainzArtistID&gt;&lt;name&gt;\2&lt;/name&gt;"
 dest="5">
+                               <expression 
noclean="1">&lt;artist(?:\stype=&quot;[^&quot;]*&quot;)* 
id=&quot;([^&quot;]*)&quot;&gt;&lt;name&gt;([^&lt;]*)</expression>
                        </RegExp>
                        <RegExp input="$$8" conditional="fanarttvthumbs" 
output="&lt;chain 
function=&quot;GetFanartTvArtistThumbsByMBID&quot;&gt;\1&lt;/chain&gt;" 
dest="5+">
                                <expression/>
diff --git a/metadata.artists.universal/changelog.txt 
b/metadata.artists.universal/changelog.txt
index 34f7905..06327cd 100644
--- a/metadata.artists.universal/changelog.txt
+++ b/metadata.artists.universal/changelog.txt
@@ -1,3 +1,6 @@
+[B]3.0.0[/B]
+Added: ResolveIDToUrl
+
 [B]2.6.5[/B]
 Updated language files from Transifex
 

-----------------------------------------------------------------------

Summary of changes:
 metadata.artists.universal/addon.xml           |    2 +-
 metadata.artists.universal/artistuniversal.xml |   18 ++++++++++++------
 metadata.artists.universal/changelog.txt       |    3 +++
 3 files changed, 16 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Scrapers

------------------------------------------------------------------------------
Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET
Get 100% visibility into your production application - at no cost.
Code-level diagnostics for performance bottlenecks with <2% overhead
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap1
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to