The branch, eden has been updated
via e10c96a9a69ca9bece89f2161f25881e26820890 (commit)
from 919687b64af8f17ae48d999c2a4bc24670a99e2a (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=e10c96a9a69ca9bece89f2161f25881e26820890
commit e10c96a9a69ca9bece89f2161f25881e26820890
Author: olympia <[email protected]>
Date: Wed May 23 09:18:03 2012 +0200
[metadata.artists.last.fm] updated to version 1.3.0
diff --git a/metadata.artists.last.fm/addon.xml
b/metadata.artists.last.fm/addon.xml
index aec3099..5f7d69a 100644
--- a/metadata.artists.last.fm/addon.xml
+++ b/metadata.artists.last.fm/addon.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.artists.last.fm"
name="Last.FM"
- version="1.2.0"
+ version="1.3.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
- <import addon="metadata.common.last.fm" version="1.1.0"/>
- <import addon="metadata.common.htbackdrops.com" version="1.0.1"/>
+ <import addon="metadata.common.last.fm" version="1.2.0"/>
+ <import addon="metadata.common.htbackdrops.com" version="1.1.0"/>
</requires>
<extension point="xbmc.metadata.scraper.artists"
language="en"
diff --git a/metadata.artists.last.fm/lastfm.xml
b/metadata.artists.last.fm/lastfm.xml
index 63db667..bc43f0c 100644
--- a/metadata.artists.last.fm/lastfm.xml
+++ b/metadata.artists.last.fm/lastfm.xml
@@ -35,33 +35,25 @@
<RegExp input="$$1" output="\1" dest="7">
<expression
noclean="1"><mbid>([^<]*)</mbid></expression>
</RegExp>
- <RegExp input="$$7" output="<chain
function="GetLastFMArtistThumbsByID">\1</chain>" dest="5+">
+ <RegExp input="$$7" output="<chain
function="GetLastFMArtistThumbsByMBID">\1</chain>" dest="5+">
<expression noclean="1">(.+)</expression>
</RegExp>
- <RegExp conditional="htbthumbs" input="$$2"
output="<chain function="GetHTBThumbs">\1</chain>"
dest="5+">
- <expression />
- </RegExp>
- <RegExp conditional="htbfanart" input="$$2"
output="<chain function="GetHTBFanart">\1</chain>"
dest="5+">
- <expression />
+ <RegExp conditional="htbthumbs" input="$$7"
output="<chain function="GetHTBThumbsByMBID">\1</chain>"
dest="5+">
+ <expression noclean="1">(.+)</expression>
</RegExp>
- <RegExp input="$$1" output="<url
function="GetGenres">http://ws.audioscrobbler.com/2.0/?method=artist.gettoptags&amp;artist=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url>";
dest="5+">
- <expression
noclean="1"><url>http://www.last.fm/music/(.*?)</url></expression>
+ <RegExp conditional="htbfanart" input="$$7"
output="<chain function="GetHTBFanartByMBID">\1</chain>"
dest="5+">
+ <expression noclean="1">(.+)</expression>
</RegExp>
- <RegExp input="$$1" output="<chain
function="GetLastFMDiscography">\1</chain>" dest="5+">
- <expression
noclean="1"><url>http://www.last.fm/music/(.*?)</url></expression>
+ <RegExp input="$$7" output="<chain
function="GetLastFMDiscographyByMBID">\1</chain>" dest="5+">
+ <expression noclean="1">(.+)</expression>
</RegExp>
- <expression noclean="1" />
- </RegExp>
- </GetArtistDetails>
- <GetGenres dest="5">
- <RegExp input="$$4" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1"
output="<genre>\1</genre>" dest="4">
- <expression
noclean="1"><tag>.*?<name>([^/lt;]*)</name></expression>
+ <RegExp input="$$7" output="<chain
function="GetLastFMGenresByMBID">\1</chain>" dest="5+">
+ <expression noclean="1">(.+)</expression>
</RegExp>
- <RegExp input="$$1"
output="<style>\1</style>" dest="4+">
- <expression repeat="yes"
noclean="1"><tag>.*?<name>([^/lt;]*)</name></expression>
+ <RegExp input="$$7" output="<chain
function="GetLastFMStylesByMBID">\1</chain>" dest="5+">
+ <expression noclean="1">(.+)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
- </GetGenres>
+ </GetArtistDetails>
</scraper>
\ No newline at end of file
diff --git a/metadata.common.last.fm/addon.xml
b/metadata.common.last.fm/addon.xml
index 981cf95..b77ca37 100644
--- a/metadata.common.last.fm/addon.xml
+++ b/metadata.common.last.fm/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.common.last.fm"
name="Last.FM"
- version="1.1.0"
+ version="1.2.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.common.last.fm/lastfm.xml
b/metadata.common.last.fm/lastfm.xml
index 6bd19c6..676951a 100644
--- a/metadata.common.last.fm/lastfm.xml
+++ b/metadata.common.last.fm/lastfm.xml
@@ -1,4 +1,9 @@
<scraperfunctions>
+ <GetLastFMDiscographyByMBID dest="5">
+ <RegExp input="$$1" output="<details><url
function="ParseLastFMDiscography"
cache="lastfmdiscog-\1.xml">http://ws.audioscrobbler.com/2.0/?method=artist.gettopalbums&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url></details>";
dest="5">
+ <expression noclean="1"/>
+ </RegExp>
+ </GetLastFMDiscographyByMBID>
<GetLastFMDiscography dest="5">
<RegExp input="$$1" output="<details><url
function="ParseLastFMDiscography">http://ws.audioscrobbler.com/2.0/?method=artist.gettopalbums&amp;artist=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url></details>";
dest="5">
<expression noclean="1"/>
@@ -12,26 +17,47 @@
<expression noclean="1"/>
</RegExp>
</ParseLastFMDiscography>
- <GetLastFMArtistThumbsByID dest="5">
- <RegExp input="$$1" output="<details><url
function="ParseLastFMArtistThumbs">http://ws.audioscrobbler.com/2.0/?method=artist.getimages&mbid=\1&api_key=71e468a84c1f40d4991ddccc46e40f1b</url></details>";
dest="5">
+
+ <GetLastFMBiographyByMBID dest="5">
+ <RegExp input="$$1" output="<details><url
function="ParseLastFMBiography"
cache="lastfmartistinfo-\1.xml">http://ws.audioscrobbler.com/2.0/?method=artist.getinfo&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url></details>";
dest="5">
+ <expression noclean="1"/>
+ </RegExp>
+ </GetLastFMBiographyByMBID>
+ <ParseLastFMBiography dest="5">
+ <RegExp input="$$6" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1"
output="<biography>\1</biography>" dest="6">
+ <expression
fixchars="1"><content><!\[CDATA\[(.*?)\]\]</expression>
+ </RegExp>
+ <expression noclean="1">(.+)</expression>
+ </RegExp>
+ </ParseLastFMBiography>
+
+ <GetLastFMArtistThumbsByMBID dest="5">
+ <RegExp input="$$1" output="<details><url
function="ParseLastFMArtistThumbs"
cache="lastfmartistimages-\1.xml">http://ws.audioscrobbler.com/2.0/?method=artist.getimages&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url></details>";
dest="5">
<expression noclean="1" />
</RegExp>
- </GetLastFMArtistThumbsByID>
+ </GetLastFMArtistThumbsByMBID>
<GetLastFMArtistThumbsByName dest="5">
- <RegExp input="$$1" output="<details><url
function="ParseLastFMArtistThumbs">http://ws.audioscrobbler.com/2.0/?method=artist.getimages&artist=\1&api_key=71e468a84c1f40d4991ddccc46e40f1b</url></details>";
dest="5">
+ <RegExp input="$$1" output="<details><url
function="ParseLastFMArtistThumbs">http://ws.audioscrobbler.com/2.0/?method=artist.getimages&amp;artist=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url></details>";
dest="5">
<expression noclean="1" />
</RegExp>
</GetLastFMArtistThumbsByName>
<ParseLastFMArtistThumbs dest="5">
<RegExp input="$$6" output="<details>\1</details>"
dest="5">
<RegExp input="$$1" output="<thumb
preview="\2">\1</thumb>" dest="6">
- <expression repeat="yes" noclean="1"><size
name="original"[^>]*>([^<]*)<[^<]*<size
name="large"[^>]*>([^<]*)<</expression>
+ <expression repeat="yes" noclean="1"><size
name="original"[^>]*>([^<]*)<[^<]*<size
name="large"[^>]*>([^<]*)<</expression>
</RegExp>
<expression noclean="1">(.+)</expression>
</RegExp>
</ParseLastFMArtistThumbs>
+
+ <GetLastFMAlbumThumbsByMBID dest="5">
+ <RegExp input="$$1" output="<details><url
function="ParseLastFMAlbumThumbs"
cache="lastfmalbum-\1.xml">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url></details>";
dest="5">
+ <expression noclean="1"/>
+ </RegExp>
+ </GetLastFMAlbumThumbsByMBID>
<GetLastFMAlbumThumbs dest="5">
- <RegExp input="$$1" output="<details><url
function="ParseLastFMAlbumThumbs">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&artist=\2&album=\1&api_key=71e468a84c1f40d4991ddccc46e40f1b</url></details>";
dest="5">
+ <RegExp input="$$1" output="<details><url
function="ParseLastFMAlbumThumbs">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&artist=\2&amp;album=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url></details>";
dest="5">
<expression>(.+)::(.+)</expression>
</RegExp>
</GetLastFMAlbumThumbs>
@@ -46,4 +72,32 @@
<expression noclean="1"></expression>
</RegExp>
</ParseLastFMAlbumThumbs>
+
+ <GetLastFMGenresByMBID dest="5">
+ <RegExp input="$$1" output="<details><url
function="ParseLastFMGenres"
cache="lastfmgenres-\1.xml">http://ws.audioscrobbler.com/2.0/?method=artist.gettoptags&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url></details>";
dest="5">
+ <expression noclean="1"/>
+ </RegExp>
+ </GetLastFMGenresByMBID>
+ <ParseLastFMGenres dest="5">
+ <RegExp input="$$4" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1"
output="<genre>\1</genre>" dest="4">
+ <expression
noclean="1"><tag>.*?<name>([^/lt;]*)</name></expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseLastFMGenres>
+
+ <GetLastFMStylesByMBID dest="5">
+ <RegExp input="$$1" output="<details><url
function="ParseLastFMStyles"
cache="lastfmgenres-\1.xml">http://ws.audioscrobbler.com/2.0/?method=artist.gettoptags&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url></details>";
dest="5">
+ <expression noclean="1"/>
+ </RegExp>
+ </GetLastFMStylesByMBID>
+ <ParseLastFMStyles dest="5">
+ <RegExp input="$$4" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1"
output="<style>\1</style>" dest="4">
+ <expression repeat="yes"
noclean="1"><tag>.*?<name>([^/lt;]*)</name></expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseLastFMStyles>
</scraperfunctions>
-----------------------------------------------------------------------
Summary of changes:
metadata.artists.last.fm/addon.xml | 6 ++--
metadata.artists.last.fm/lastfm.xml | 32 ++++++----------
metadata.common.last.fm/addon.xml | 2 +-
metadata.common.last.fm/lastfm.xml | 66 +++++++++++++++++++++++++++++++---
4 files changed, 76 insertions(+), 30 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
