[Xbmc-addons] Scrapers branch, dharma-pre, updated. c1b19c0a084cb024face3b2fe6cda088d9e97998

[olympia]

The branch, dharma-pre has been updated
       via  c1b19c0a084cb024face3b2fe6cda088d9e97998 (commit)
      from  e2bc508019592691a7bd5e06f1386533689e4d0e (commit)

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

commit c1b19c0a084cb024face3b2fe6cda088d9e97998
Author: olympia <olym...@xbmc.org>
Date:   Wed Oct 27 12:09:32 2010 +0200

    [metadata.artists.allmusic.com] prevent the same artist showing up multiple 
times under certain circumstances

diff --git a/metadata.artists.allmusic.com/addon.xml 
b/metadata.artists.allmusic.com/addon.xml
index 66b64b5..7e2b034 100644
--- a/metadata.artists.allmusic.com/addon.xml
+++ b/metadata.artists.allmusic.com/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.artists.allmusic.com"
        name="AllMusic"
-       version="2.0.1"
+       version="2.0.2"
        provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.artists.allmusic.com/allmusic.xml 
b/metadata.artists.allmusic.com/allmusic.xml
index ffb4808..eb26034 100644
--- a/metadata.artists.allmusic.com/allmusic.xml
+++ b/metadata.artists.allmusic.com/allmusic.xml
@@ -12,15 +12,24 @@
        </CreateArtistSearchUrl>
        <GetArtistSearchResults dest="8">
                <RegExp input="$$5" output="&lt;results&gt;\1&lt;/results&gt;" 
dest="8">
-                       <RegExp input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\1&lt;/title&gt;&lt;url 
cache=&quot;am-$$2-artist.html&quot;&gt;http://www.allmusic.com/artist/\2&lt;/url&gt;&lt;/entity&gt;";
 dest="5">
+                       <RegExp input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\1&lt;/title&gt;&lt;url 
cache=&quot;am-$$2-artist.html&quot;&gt;http://www.allmusic.com/artist/\2&lt;/url&gt;&lt;/entity&gt;";
 dest="9">
                                <expression noclean="1">&lt;meta 
name=&quot;title&quot; content=&quot;([^&quot;]*)&quot;.*?&lt;a 
href="http://www.allmusic.com/artist/([^/]*)/credits&quot;</expression>
                        </RegExp>
-                       <RegExp input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\1&lt;/title&gt;&lt;url 
cache=&quot;am-$$2-artist.html&quot;&gt;http://www.allmusic.com/artist/\2&lt;/url&gt;&lt;/entity&gt;";
 dest="5+">
+                       <RegExp input="$$9" output="\1" dest="5">
+                               <expression noclean="1">(.+)</expression>
+                       </RegExp>
+                       <RegExp input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\1&lt;/title&gt;&lt;url 
cache=&quot;am-$$2-artist.html&quot;&gt;http://www.allmusic.com/artist/\2&lt;/url&gt;&lt;/entity&gt;";
 dest="9">
                                <expression noclean="1">&lt;meta 
name=&quot;title&quot; content=&quot;([^&quot;]*)&quot;.*?&lt;a 
href="http://www.allmusic.com/artist/([^/]*)/biography&quot;</expression>
                        </RegExp>
-                       <RegExp input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\1&lt;/title&gt;&lt;url 
cache=&quot;am-$$2-artist.html&quot;&gt;http://www.allmusic.com/artist/\2&lt;/url&gt;&lt;/entity&gt;";
 dest="5+">
+                       <RegExp input="$$9" output="\1" dest="5">
+                               <expression noclean="1">(.+)</expression>
+                       </RegExp>
+                       <RegExp input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\1&lt;/title&gt;&lt;url 
cache=&quot;am-$$2-artist.html&quot;&gt;http://www.allmusic.com/artist/\2&lt;/url&gt;&lt;/entity&gt;";
 dest="9">
                                <expression noclean="1">&lt;meta 
name=&quot;title&quot; content=&quot;([^&quot;]*)&quot;.*?&lt;a 
href="http://www.allmusic.com/artist/([^/]*)/discography&quot;</expression>
                        </RegExp>
+                       <RegExp input="$$9" output="\1" dest="5">
+                               <expression noclean="1">(.+)</expression>
+                       </RegExp>
                        <RegExp input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;genre&gt;\3&lt;/genre&gt;&lt;year&gt;\4&lt;/year&gt;&lt;url
 
cache=&quot;am-$$2-artist.html&quot;&gt;http://www.allmusic.com/artist/\1&lt;/url&gt;&lt;/entity&gt;";
 dest="5+">
                                <expression repeat="yes" 
noclean="1,2">&lt;td&gt;&lt;a 
href=&quot;http://www.allmusic.com/artist/([^&quot;]*)&quot;&gt;([^&lt;]*)&lt;/a&gt;&lt;/td&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/td&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/td&gt;</expression>
                        </RegExp>

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

Summary of changes:
 metadata.artists.allmusic.com/addon.xml    |    2 +-
 metadata.artists.allmusic.com/allmusic.xml |   15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Scrapers

------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in  U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store 
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons