The branch, dharma-pre has been updated
via a036248b394a97b49583dbe02846ce95d00bbdde (commit)
from dd3407e1b58b2f5494f735c0808a6bc54b1a163b (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=a036248b394a97b49583dbe02846ce95d00bbdde
commit a036248b394a97b49583dbe02846ce95d00bbdde
Author: olympia <[email protected]>
Date: Sat Oct 16 12:51:30 2010 +0200
[metadata.artists.allmusic.com] bugfix and cleanup
diff --git a/metadata.albums.allmusic.com/addon.xml
b/metadata.albums.allmusic.com/addon.xml
index 3dbd2bd..abc705a 100644
--- a/metadata.albums.allmusic.com/addon.xml
+++ b/metadata.albums.allmusic.com/addon.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.albums.allmusic.com"
name="AllMusic"
- version="1.8.0"
+ version="1.8.1"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
<import addon="metadata.common.last.fm" version="1.0"/>
- <import addon="metadata.common.allmusic.com" version="1.8.0"/>
+ <import addon="metadata.common.allmusic.com" version="1.8.1"/>
<import addon="metadata.common.htbackdrops.com" version="1.0.7"/>
</requires>
<extension point="xbmc.metadata.scraper.albums"
diff --git a/metadata.albums.allmusic.com/allmusic.xml
b/metadata.albums.allmusic.com/allmusic.xml
index 93c5565..03f7470 100644
--- a/metadata.albums.allmusic.com/allmusic.xml
+++ b/metadata.albums.allmusic.com/allmusic.xml
@@ -12,14 +12,11 @@
</CreateAlbumSearchUrl>
<GetAlbumSearchResults dest="8">
<RegExp input="$$5" output="<results>\1</results>"
dest="8">
- <RegExp input="$$1"
output="<entity><title>\1</title></entity>" dest="5">
- <expression repeat="yes"
noclean="1"><TITLE>allmusic[ (]+ ([^>]*) > Overview</expression>
+ <RegExp input="$$1"
output="<entity><year>\4</year><artist>\3</artist><title>\2</title><url
cache="am-\3-\2-album.html">http://www.allmusic.com/album/\1/review</url></entity>";
dest="5">
+ <expression repeat="yes" noclean="1,2,3"><td
class="text-center">[^<]*<a
href.*?www.allmusic.com/album/([^"]*)">([^<]*).*?<td>([^<]*)</td>.*?<td>.*?<td>([^<]*)</expression>
</RegExp>
<RegExp input="$$1"
output="<entity><year>\4</year><artist>\3</artist><title>\2</title><url
cache="am-\3-\2-album.html">http://www.allmusic.com/album/\1/review</url></entity>";
dest="5+">
- <expression repeat="yes" noclean="1,2,3"><td
class="text-center">[^<]*<a
href.*?www.allmusic.com/album/([^"]*)">([^<]*).*?<td>([^<]*)</td>.*?<td>.*?<td>([^<]*)</expression>
- </RegExp>
- <RegExp input="$$1"
output="<entity><year>\4</year><artist>\3</artist><title>\2</title><url
cache="am-\3-\2-album.html">http://www.allmusic.com/album/\1/review</url></entity>";
dest="5+">
- <expression repeat="yes" noclean="1,2,3"><td
class="text-center">[^<]*</td>.*?www.allmusic.com/album/([^"]*)">([^<]*).*?<td>([^<]*)</td>.*?<td>.*?<td>([^<]*)</expression>
+ <expression repeat="yes" noclean="1,2,3"><td
class="text-center">[^<]*</td>.*?www.allmusic.com/album/([^"]*)">([^<]*).*?<td>([^<]*)</td>.*?<td>.*?<td>([^<]*)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -27,19 +24,19 @@
<GetAlbumDetails dest="3">
<RegExp input="$$5" output="<details>\1</details>"
dest="3">
<RegExp input="$$1" output="\1" dest="2">
- <expression noclean="1"><h1
class="title">([^<]*)</h1></expression>
+ <expression noclean="1"><h1
class="title">([^<]*)</h1></expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="3">
- <expression
noclean="1">allmusic.com/artist/[^"]*">([^<]*)</a></div></expression>
+ <expression
noclean="1">allmusic.com/artist/[^"]*">([^<]*)</a></div></expression>
</RegExp>
<RegExp conditional="lastfmalbumthumbs" input="$$1"
output="<chain
function="GetLastFMAlbumThumbs">\1::\2</chain>" dest="5+">
- <expression trim="1,2" encode="1,2"><meta
name="title" content="([^-]*)- ([^<]*)" /></expression>
+ <expression trim="1,2" encode="1,2"><meta
name="title" content="([^-]*)- ([^<]*)"
/></expression>
</RegExp>
<RegExp input="$$1" output="<url
cache="am-$$3-$$2-album.html"
function="ParseAMGAlbum">http://www.allmusic.com/album/\1/review</url>";
dest="5+">
- <expression
noclean="1">allmusic.com/artist/([^"]*)">[^<]*</a></div></expression>
+ <expression
noclean="1">allmusic.com/artist/([^"]*)">[^<]*</a></div></expression>
</RegExp>
<RegExp input="$$1" output="<url
cache="am-$$3-$$2-album.html"
function="GetAMGReview">http://www.allmusic.com/album/\1/review</url>";
dest="5+">
- <expression
noclean="1">allmusic.com/artist/([^"]*)">[^<]*</a></div></expression>
+ <expression
noclean="1">allmusic.com/artist/([^"]*)">[^<]*</a></div></expression>
</RegExp>
<expression noclean="1" />
</RegExp>
diff --git a/metadata.artists.allmusic.com/addon.xml
b/metadata.artists.allmusic.com/addon.xml
index f66d09d..9071ce1 100644
--- a/metadata.artists.allmusic.com/addon.xml
+++ b/metadata.artists.allmusic.com/addon.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.artists.allmusic.com"
name="AllMusic"
- version="1.8.0"
+ version="1.8.1"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
<import addon="metadata.common.last.fm" version="1.0"/>
- <import addon="metadata.common.allmusic.com" version="1.8.0"/>
+ <import addon="metadata.common.allmusic.com" version="1.8.1"/>
<import addon="metadata.common.htbackdrops.com" version="1.0.7"/>
</requires>
<extension point="xbmc.metadata.scraper.artists"
diff --git a/metadata.artists.allmusic.com/allmusic.xml
b/metadata.artists.allmusic.com/allmusic.xml
index 297cb0c..4de03cb 100644
--- a/metadata.artists.allmusic.com/allmusic.xml
+++ b/metadata.artists.allmusic.com/allmusic.xml
@@ -13,7 +13,7 @@
<GetArtistSearchResults dest="8">
<RegExp input="$$5" output="<results>\1</results>"
dest="8">
<RegExp input="$$1"
output="<entity><title>\1</title><url
cache="am-$$2-artist.html">http://www.allmusic.com/artist/\2</url></entity>";
dest="5">
- <expression repeat="yes" noclean="1"><meta
name="title" content="([^"]*)".*?<a
href="http://www.allmusic.com/artist/([^/]*)/discography"</expression>
+ <expression repeat="yes" noclean="1"><meta
name="title" content="([^"]*)".*?<a
href="http://www.allmusic.com/artist/([^/]*)/discography"</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+">
<expression repeat="yes"
noclean="1,2"><td><a
href="http://www.allmusic.com/artist/([^"]*)">([^<]*)</a></td>[^>]*>([^<]*)</td>[^>]*>([^<]*)</td></expression>
@@ -36,10 +36,10 @@
<expression/>
</RegExp>
<RegExp input="$$1" output="<url
cache="am-$$2-biog.html"
function="GetAMGBiography">http://www.allmusic.com/artist/\1/biography</url>";
dest="5+">
-
<expression>http://www.allmusic.com/artist/([^&"/]*)</expression>
+ <expression><a
href="http://www.allmusic.com/artist/([^/]*)/biography"</expression>
</RegExp>
<RegExp input="$$1" output="<url
cache="am-$$2-discog.html"
function="GetAMGDiscography">http://www.allmusic.com/artist/\1/discography</url>";
dest="5+">
-
<expression>http://www.allmusic.com/artist/([^&"/]*)</expression>
+ <expression><a
href="http://www.allmusic.com/artist/([^/]*)/discography"</expression>
</RegExp>
<expression noclean="1"/>
</RegExp>
diff --git a/metadata.common.allmusic.com/addon.xml
b/metadata.common.allmusic.com/addon.xml
index 1499365..427f5fa 100644
--- a/metadata.common.allmusic.com/addon.xml
+++ b/metadata.common.allmusic.com/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.common.allmusic.com"
name="AllMusic"
- version="1.8.0"
+ version="1.8.1"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.common.allmusic.com/allmusic.xml
b/metadata.common.allmusic.com/allmusic.xml
index d4b5f09..adea10a 100644
--- a/metadata.common.allmusic.com/allmusic.xml
+++ b/metadata.common.allmusic.com/allmusic.xml
@@ -59,7 +59,7 @@
<expression
noclean="1"><h3>Genres</h3>(.*?)</div></expression>
</RegExp>
<RegExp input="$$6"
output="<genre>\2</genre>" dest="5+">
- <expression repeat="yes" noclean="1"><a
href="/explore/genre/[^>]*>(<strong>)?([^<]*)</expression>
+ <expression repeat="yes" noclean="1"><a
href="/explore/genre/[^>]*>(<strong>)?([^<]*)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="7">
<expression
noclean="1"><h3>Styles</h3>(.*?)</div></expression>
@@ -88,10 +88,10 @@
<ParseAMGAlbum dest="3">
<RegExp input="$$5" output="<details>\1</details>"
dest="3">
<RegExp input="$$1"
output="<title>\1</title>" dest="5">
- <expression trim="1" noclean="1"><meta
name="title" content="([^-]*)-[^<]*" /></expression>
+ <expression trim="1" noclean="1"><meta
name="title" content="([^-]*)-[^<]*" /></expression>
</RegExp>
<RegExp input="$$1"
output="<artist>\1</artist>" dest="5+">
- <expression noclean="1"><meta name="title"
content="[^-]*- ([^<]*)" /></expression>
+ <expression noclean="1"><meta
name="title" content="[^-]*- ([^<]*)" /></expression>
</RegExp>
<RegExp input="$$1"
output="<rating>\1</rating>" dest="5+">
<expression
noclean="1"><h3>Rating</h3>[^_]*_r([0-9^]*)</expression>
@@ -133,10 +133,10 @@
<expression repeat="yes"
noclean="1"><li>[^>]*>([^<]*)</a></li></expression>
</RegExp>
<RegExp input="$$1"
output="<track><position>\1</position><title>\2</title><duration>\3</duration></track>"
dest="5+">
- <expression repeat="yes"
noclean="1,2,3">"cell">([0-9]+)<.*?<td
class="cell">[^>]*>([^<]*)</a></td>.*?<td
class="cell">([0-9]*:[0-9]*)</td></expression>
+ <expression repeat="yes"
noclean="1,2,3">"cell">([0-9]+)<.*?<td
class="cell">[^>]*>([^<]*)</a></td>.*?<td
class="cell">([0-9]*:[0-9]*)</td></expression>
</RegExp>
<RegExp conditional="allmusicalbumthumbs" input="$$1"
output="<thumb>http://image.allmusic.com/\1</thumb>"; dest="5+">
- <expression
noclean="1">http://image.allmusic.com/([^"]*)"</expression>
+ <expression
noclean="1">http://image.allmusic.com/([^"]*)"</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
-----------------------------------------------------------------------
Summary of changes:
metadata.albums.allmusic.com/addon.xml | 4 ++--
metadata.albums.allmusic.com/allmusic.xml | 19 ++++++++-----------
metadata.artists.allmusic.com/addon.xml | 4 ++--
metadata.artists.allmusic.com/allmusic.xml | 6 +++---
metadata.common.allmusic.com/addon.xml | 2 +-
metadata.common.allmusic.com/allmusic.xml | 10 +++++-----
6 files changed, 21 insertions(+), 24 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
