The branch, eden has been updated
via f732927c99731d706c1181554c7b188869e79a60 (commit)
from 9f127bb5e1781b76553bec280b541b71480528d0 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=f732927c99731d706c1181554c7b188869e79a60
commit f732927c99731d706c1181554c7b188869e79a60
Author: olympia <[email protected]>
Date: Mon May 28 19:53:01 2012 +0200
[metadata.albums.last.fm] updated to version 1.2.0
diff --git a/metadata.albums.last.fm/addon.xml
b/metadata.albums.last.fm/addon.xml
index 0012262..11b4228 100644
--- a/metadata.albums.last.fm/addon.xml
+++ b/metadata.albums.last.fm/addon.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.albums.last.fm"
name="Last.FM"
- version="1.1.4"
+ version="1.2.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.last.fm" version="1.3.0"/>
</requires>
<extension point="xbmc.metadata.scraper.albums"
language="en"
diff --git a/metadata.albums.last.fm/lastfm.xml
b/metadata.albums.last.fm/lastfm.xml
index 5c171a9..45428b7 100644
--- a/metadata.albums.last.fm/lastfm.xml
+++ b/metadata.albums.last.fm/lastfm.xml
@@ -6,13 +6,13 @@
</RegExp>
</NfoUrl>
<CreateAlbumSearchUrl dest="3">
- <RegExp input="$$1"
output="<url>http://ws.audioscrobbler.com/2.0/?method=album.search&album=\1&artist=$$2&api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[language]</url>";
dest="3">
+ <RegExp input="$$1"
output="<url>http://ws.audioscrobbler.com/2.0/?method=album.search&album=\1&artist=$$2&api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url>";
dest="3">
<expression/>
</RegExp>
</CreateAlbumSearchUrl>
<GetAlbumSearchResults dest="8">
<RegExp input="$$5" output="<results>\1</results>"
dest="8">
- <RegExp input="$$1"
output="<entity><artist>\2</artist><title>\1</title><url>http://ws.audioscrobbler.com/2.0/?method=album.getinfo&album=\4&artist=\3&api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[language]</url></entity>";
dest="5+">
+ <RegExp input="$$1"
output="<entity><artist>\2</artist><title>\1</title><url
cache="lastfmalbum-\2-\1.xml">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&album=\4&artist=\3&api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></entity>";
dest="5+">
<expression repeat="yes"
fixchars="4"><album>.*?<name>([^<]*)</name>.*?<artist>([^<]*)</artist>.*?<url>http://www.last.fm/music/([^/]+)/(.*?)</url></expression>
</RegExp>
<expression noclean="1"/>
@@ -20,31 +20,34 @@
</GetAlbumSearchResults>
<GetAlbumDetails dest="3">
<RegExp input="$$5" output="<?xml version="1.0"
encoding="UTF-8"?><details>\1</details>" dest="3">
- <RegExp input="$$1"
output="<artist>\1</artist>" dest="5">
- <expression
noclean="1"><artist>(.*?)</artist></expression>
+ <RegExp input="$$1" output="\1" dest="7">
+
<expression><artist>(.*?)</artist></expression>
</RegExp>
- <RegExp input="$$1"
output="<title>\1</title>" dest="5+">
- <expression
noclean="1"><name>(.*?)</name></expression>
+ <RegExp input="$$1" output="\1" dest="8">
+
<expression><name>(.*?)</name></expression>
</RegExp>
- <RegExp input="$$1"
output="<releasedate>\1</releasedate>" dest="5+">
- <expression
trim="1"><releasedate>:(.*?)</releasedate></expression>
+ <RegExp input="$$7"
output="<artist>\1</artist>" dest="5">
+ <expression noclean="1" />
+ </RegExp>
+ <RegExp input="$$8"
output="<title>\1</title>" dest="5+">
+ <expression noclean="1" />
+ </RegExp>
+ <RegExp input="$$1" output="<chain
function="GetLastFMAlbumTitleByAlbumAndArtist">$$8::$$7::$$8::$$7</chain>"
dest="5+">
+ <expression noclean="1" />
</RegExp>
- <RegExp input="$$1"
output="<year>\1</year>" dest="5+">
- <expression
trim="1"><releasedate>[^,]*([0-9]+),</releasedate></expression>
+ <RegExp input="$$1" output="<chain
function="GetLastFMAlbumArtistByAlbumAndArtist">$$8::$$7::$$8::$$7</chain>"
dest="5+">
+ <expression noclean="1" />
</RegExp>
- <RegExp input="$$1"
output="<review>\1</review>" dest="5+">
- <expression
fixchars="1"><content><!\[CDATA\[(.*?)\]\]</expression>
+ <RegExp input="$$1" output="<chain
function="GetLastFMAlbumDateByAlbumAndArtist">$$8::$$7::$$8::$$7</chain>"
dest="5+">
+ <expression noclean="1" />
</RegExp>
- <RegExp input="$$1"
output="<track><position>\1</position><title>\2</title></track>"
dest="5+">
- <expression repeat="yes" noclean="1"><track
rank="(.*?)".*?<name>(.*?)</name></expression>
+ <RegExp input="$$1" output="<chain
function="GetLastFMAlbumTracksByAlbumAndArtist">$$8::$$7::$$8::$$7</chain>"
dest="5+">
+ <expression noclean="1" />
+ </RegExp>
+ <RegExp input="$$1" output="<chain
function="GetLastFMAlbumReviewByAlbumAndArtist">$$8::$$7::$$8::$$7</chain>"
dest="5+">
+ <expression noclean="1" />
</RegExp>
- <RegExp input="$$6"
output="<thumb>\1</thumb>" dest="5+">
- <RegExp input="$$1" output="\1" dest="6">
- <expression noclean="1"><image
size="large">([^<]*)</image></expression>
- </RegExp>
- <RegExp input="$$1" output="\1" dest="6">
- <expression noclean="1"><image
size="extralarge">([^<]*)</image></expression>
- </RegExp>
+ <RegExp input="$$1" output="<chain
function="GetLastFMAlbumThumbs">$$8::$$7::$$8::$$7</chain>"
dest="5+">
<expression noclean="1" />
</RegExp>
<expression noclean="1"/>
diff --git a/metadata.common.last.fm/addon.xml
b/metadata.common.last.fm/addon.xml
index 9eea278..e38b3bf 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.2.1"
+ version="1.3.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 494f487..ce3d6ef 100644
--- a/metadata.common.last.fm/lastfm.xml
+++ b/metadata.common.last.fm/lastfm.xml
@@ -14,7 +14,7 @@
<RegExp input="$$1"
output="<album><title>\1</title></album>" dest="2+">
<expression
repeat="yes"><album[^>]*>[^<]*<name>([^<]*?)</name></expression>
</RegExp>
- <expression noclean="1"/>
+ <expression noclean="1">(.+)</expression>
</RegExp>
</ParseLastFMDiscography>
@@ -42,7 +42,7 @@
<RegExp input="$$1"
output="<genre>\1</genre>" dest="4">
<expression
noclean="1"><tag>.*?<name>([^/lt;]*)</name></expression>
</RegExp>
- <expression noclean="1" />
+ <expression noclean="1">(.+)</expression>
</RegExp>
</ParseLastFMArtistGenres>
@@ -56,7 +56,7 @@
<RegExp input="$$1"
output="<style>\1</style>" dest="4">
<expression repeat="yes"
noclean="1"><tag>.*?<name>([^/lt;]*)</name></expression>
</RegExp>
- <expression noclean="1" />
+ <expression noclean="1">(.+)</expression>
</RegExp>
</ParseLastFMArtistStyles>
@@ -79,14 +79,113 @@
</RegExp>
</ParseLastFMArtistThumbs>
+
+ <GetLastFMAlbumTitleByMBID dest="5">
+ <RegExp input="$$1" output="<details><url
function="ParseLastFMAlbumTitle"
cache="lastfmalbum-\1.xml">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>";
dest="5">
+ <expression noclean="1"/>
+ </RegExp>
+ </GetLastFMAlbumTitleByMBID>
+ <GetLastFMAlbumTitleByAlbumAndArtist dest="5">
+ <RegExp input="$$1" output="<details><url
function="ParseLastFMAlbumTitle"
cache="lastfmalbum-\4-\3.xml">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&artist=\2&amp;album=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>";
dest="5">
+ <expression
encode="1,2">(.+)::(.+)::(.+)::(.+)</expression>
+ </RegExp>
+ </GetLastFMAlbumTitleByAlbumAndArtist>
+ <ParseLastFMAlbumTitle dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1"
output="<title>\1</title>" dest="2">
+ <expression
noclean="1"><name>(.*?)</name></expression>
+ </RegExp>
+ <expression noclean="1">(.+)</expression>
+ </RegExp>
+ </ParseLastFMAlbumTitle>
+
+ <GetLastFMAlbumArtistByMBID dest="5">
+ <RegExp input="$$1" output="<details><url
function="ParseLastFMAlbumArtist"
cache="lastfmalbum-\1.xml">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>";
dest="5">
+ <expression noclean="1"/>
+ </RegExp>
+ </GetLastFMAlbumArtistByMBID>
+ <GetLastFMAlbumArtistByAlbumAndArtist dest="5">
+ <RegExp input="$$1" output="<details><url
function="ParseLastFMAlbumArtist"
cache="lastfmalbum-\4-\3.xml">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&artist=\2&amp;album=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>";
dest="5">
+ <expression
encode="1,2">(.+)::(.+)::(.+)::(.+)</expression>
+ </RegExp>
+ </GetLastFMAlbumArtistByAlbumAndArtist>
+ <ParseLastFMAlbumArtist dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1"
output="<artist>\1</artist>" dest="2">
+ <expression
noclean="1"><artist>(.*?)</artist></expression>
+ </RegExp>
+ <expression noclean="1">(.+)</expression>
+ </RegExp>
+ </ParseLastFMAlbumArtist>
+
+ <GetLastFMAlbumDateByMBID dest="5">
+ <RegExp input="$$1" output="<details><url
function="ParseLastFMAlbumDate"
cache="lastfmalbum-\1.xml">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>";
dest="5">
+ <expression noclean="1"/>
+ </RegExp>
+ </GetLastFMAlbumDateByMBID>
+ <GetLastFMAlbumDateByAlbumAndArtist dest="5">
+ <RegExp input="$$1" output="<details><url
function="ParseLastFMAlbumDate"
cache="lastfmalbum-\4-\3.xml">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&artist=\2&amp;album=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>";
dest="5">
+ <expression
encode="1,2">(.+)::(.+)::(.+)::(.+)</expression>
+ </RegExp>
+ </GetLastFMAlbumDateByAlbumAndArtist>
+ <ParseLastFMAlbumDate dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1"
output="<releasedate>\1</releasedate>" dest="2">
+ <expression
trim="1"><releasedate>([^,]*)?([^<]*)?</releasedate></expression>
+ </RegExp>
+ <RegExp input="$$1"
output="<year>\1</year>" dest="2+">
+ <expression
trim="1"><releasedate>.*?([0-9]{4})[^<]*</releasedate></expression>
+ </RegExp>
+ <expression noclean="1">(.+)</expression>
+ </RegExp>
+ </ParseLastFMAlbumDate>
+
+ <GetLastFMAlbumTracksByMBID dest="5">
+ <RegExp input="$$1" output="<details><url
function="ParseLastFMAlbumTracks"
cache="lastfmalbum-\1.xml">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>";
dest="5">
+ <expression noclean="1"/>
+ </RegExp>
+ </GetLastFMAlbumTracksByMBID>
+ <GetLastFMAlbumTracksByAlbumAndArtist dest="5">
+ <RegExp input="$$1" output="<details><url
function="ParseLastFMAlbumTracks"
cache="lastfmalbum-\4-\3.xml">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&artist=\2&amp;album=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>";
dest="5">
+ <expression
encode="1,2">(.+)::(.+)::(.+)::(.+)</expression>
+ </RegExp>
+ </GetLastFMAlbumTracksByAlbumAndArtist>
+ <ParseLastFMAlbumTracks dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1"
output="<track><position>\1</position><title>\2</title></track>"
dest="2">
+ <expression repeat="yes" noclean="1"><track
rank="(.*?)".*?<name>(.*?)</name></expression>
+ </RegExp>
+ <expression noclean="1">(.+)</expression>
+ </RegExp>
+ </ParseLastFMAlbumTracks>
+
+ <GetLastFMAlbumReviewByMBID dest="5">
+ <RegExp input="$$1" output="<details><url
function="ParseLastFMAlbumReview"
cache="lastfmalbum-\1.xml">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>";
dest="5">
+ <expression noclean="1"/>
+ </RegExp>
+ </GetLastFMAlbumReviewByMBID>
+ <GetLastFMAlbumReviewByAlbumAndArtist dest="5">
+ <RegExp input="$$1" output="<details><url
function="ParseLastFMAlbumReview"
cache="lastfmalbum-\4-\3.xml">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&artist=\2&amp;album=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>";
dest="5">
+ <expression
encode="1,2">(.+)::(.+)::(.+)::(.+)</expression>
+ </RegExp>
+ </GetLastFMAlbumReviewByAlbumAndArtist>
+ <ParseLastFMAlbumReview dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1"
output="<review>\1</review>" dest="2">
+ <expression
fixchars="1"><content><!\[CDATA\[(.*?)\]\]</expression>
+ </RegExp>
+ <expression noclean="1">(.+)</expression>
+ </RegExp>
+ </ParseLastFMAlbumReview>
+
<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">
+ <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&lang=$INFO[lastfmlanguage]</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&amp;album=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url></details>";
dest="5">
- <expression>(.+)::(.+)</expression>
+ <RegExp input="$$1" output="<details><url
function="ParseLastFMAlbumThumbs"
cache="lastfmalbum-\4-\3.xml">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&artist=\2&amp;album=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>";
dest="5">
+ <expression
encode="1,2">(.+)::(.+)::(.+)::(.+)</expression>
</RegExp>
</GetLastFMAlbumThumbs>
<ParseLastFMAlbumThumbs dest="5">
@@ -97,7 +196,7 @@
<RegExp input="$$1"
output="<thumb>\1</thumb>" dest="2+">
<expression noclean="1"><image
size="large">([^<]*)</image></expression>
</RegExp>
- <expression noclean="1"></expression>
+ <expression noclean="1">(.+)</expression>
</RegExp>
</ParseLastFMAlbumThumbs>
-----------------------------------------------------------------------
Summary of changes:
metadata.albums.last.fm/addon.xml | 4 +-
metadata.albums.last.fm/lastfm.xml | 45 ++++++++-------
metadata.common.last.fm/addon.xml | 2 +-
metadata.common.last.fm/lastfm.xml | 113 +++++++++++++++++++++++++++++++++--
4 files changed, 133 insertions(+), 31 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
