The branch, dharma has been updated
via bf540af935dc353bf560f1d09e6c1dc17743749d (commit)
from 57af90e4828494c864e2e9a8fbe722e98c600d3e (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=bf540af935dc353bf560f1d09e6c1dc17743749d
commit bf540af935dc353bf560f1d09e6c1dc17743749d
Author: olympia <[email protected]>
Date: Wed Nov 9 22:23:48 2011 +0100
[metadata.artists.allmusic.com] fix: address caching issue with special
chars in artist name
diff --git a/metadata.artists.allmusic.com/addon.xml
b/metadata.artists.allmusic.com/addon.xml
index 6b5ff2f..e0fd2c4 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.5"
+ version="2.0.6"
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 cd1369a..3d99ff1 100644
--- a/metadata.artists.allmusic.com/allmusic.xml
+++ b/metadata.artists.allmusic.com/allmusic.xml
@@ -12,25 +12,25 @@
</CreateArtistSearchUrl>
<GetArtistSearchResults dest="8">
<RegExp input="$$5" output="<results>\1</results>"
dest="8">
- <RegExp input="$$1"
output="<entity><title>\1</title><url
cache="am-\1-artist.html">http://www.allmusic.com/artist/\2</url></entity>";
dest="9">
+ <RegExp input="$$1"
output="<entity><title>\1</title><url
cache="am-\2-artist.html">http://www.allmusic.com/artist/\2</url></entity>";
dest="9">
<expression noclean="1"><meta
name="title" content="([^"]*)".*?<a
href="http://www.allmusic.com/artist/([^/]*)/credits"</expression>
</RegExp>
<RegExp input="$$9" output="\1" dest="5">
<expression noclean="1">(.+)</expression>
</RegExp>
- <RegExp input="$$1"
output="<entity><title>\1</title><url
cache="am-\1-artist.html">http://www.allmusic.com/artist/\2</url></entity>";
dest="9">
+ <RegExp input="$$1"
output="<entity><title>\1</title><url
cache="am-\2-artist.html">http://www.allmusic.com/artist/\2</url></entity>";
dest="9">
<expression noclean="1"><meta
name="title" content="([^"]*)".*?<a
href="http://www.allmusic.com/artist/([^/]*)/biography"</expression>
</RegExp>
<RegExp input="$$9" output="\1" dest="5">
<expression noclean="1">(.+)</expression>
</RegExp>
- <RegExp input="$$1"
output="<entity><title>\1</title><url
cache="am-\1-artist.html">http://www.allmusic.com/artist/\2</url></entity>";
dest="9">
+ <RegExp input="$$1"
output="<entity><title>\1</title><url
cache="am-\2-artist.html">http://www.allmusic.com/artist/\2</url></entity>";
dest="9">
<expression noclean="1"><meta
name="title" content="([^"]*)".*?<a
href="http://www.allmusic.com/artist/([^/]*)/discography"</expression>
</RegExp>
<RegExp input="$$9" output="\1" dest="5">
<expression noclean="1">(.+)</expression>
</RegExp>
- <RegExp input="$$1"
output="<entity><title>\2</title><genre>\3</genre><year>\4</year><url
cache="am-\2-artist.html">http://www.allmusic.com/artist/\1</url></entity>";
dest="5+">
+ <RegExp input="$$1"
output="<entity><title>\2</title><genre>\3</genre><year>\4</year><url
cache="am-\1-artist.html">http://www.allmusic.com/artist/\1</url></entity>";
dest="5+">
<expression repeat="yes"
noclean="1,2"><td><a
href="http://www.allmusic.com/artist/([^"]*)">([^<]*)</a></td>[^>]*>([^<]*)</td>[^>]*>([^<]*)</td></expression>
</RegExp>
<expression noclean="1"/>
@@ -41,23 +41,26 @@
<RegExp input="$$1" output="\1" dest="7">
<expression noclean="1"><meta
name="title" content="([^"]*)</expression>
</RegExp>
+ <RegExp input="$$1" output="\1" dest="8">
+
<expression>http://www.allmusic.com/artist/([^&"/]*)</expression>
+ </RegExp>
<RegExp input="$$7" conditional="htbthumbs"
output="<chain function="GetHTBThumbs">\1</chain>"
dest="5">
<expression/>
</RegExp>
<RegExp input="$$2" conditional="lastfmartistthumbs"
output="<chain
function="GetLastFMArtistThumbsByName">\1</chain>" dest="5+">
<expression/>
</RegExp>
- <RegExp input="$$1" output="<url
cache="am-$$7-artist.html"
function="ParseAMGArtist">http://www.allmusic.com/artist/\1</url>";
dest="5+">
-
<expression>http://www.allmusic.com/artist/([^&"/]*)</expression>
+ <RegExp input="$$8" output="<url
cache="am-\1-artist.html"
function="ParseAMGArtist">http://www.allmusic.com/artist/\1</url>";
dest="5+">
+ <expression/>
</RegExp>
<RegExp input="$$7" conditional="htbfanart"
output="<chain function="GetHTBFanart">\1</chain>"
dest="5+">
<expression/>
</RegExp>
- <RegExp input="$$1" output="<url
cache="am-$$7-biog.html"
function="GetAMGBiography">http://www.allmusic.com/artist/\1/biography</url>";
dest="5+">
- <expression><a
href="http://www.allmusic.com/artist/([^/]*)/biography"</expression>
+ <RegExp input="$$8" output="<url
cache="am-\1-biog.html"
function="GetAMGBiography">http://www.allmusic.com/artist/\1/biography</url>";
dest="5+">
+ <expression/>
</RegExp>
- <RegExp input="$$1" output="<url
cache="am-$$7-discog.html"
function="GetAMGDiscography">http://www.allmusic.com/artist/\1/discography</url>";
dest="5+">
- <expression><a
href="http://www.allmusic.com/artist/([^/]*)/discography"</expression>
+ <RegExp input="$$8" output="<url
cache="am-\1-discog.html"
function="GetAMGDiscography">http://www.allmusic.com/artist/\1/discography</url>";
dest="5+">
+ <expression/>
</RegExp>
<expression noclean="1"/>
</RegExp>
-----------------------------------------------------------------------
Summary of changes:
metadata.artists.allmusic.com/addon.xml | 2 +-
metadata.artists.allmusic.com/allmusic.xml | 23 +++++++++++++----------
2 files changed, 14 insertions(+), 11 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
