The branch, eden has been updated
via 886b5f58b7170aeceacf60f620efb70d41979f12 (commit)
from 31afa17f71b371838bd6ef83871779e842265007 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=886b5f58b7170aeceacf60f620efb70d41979f12
commit 886b5f58b7170aeceacf60f620efb70d41979f12
Author: olympia <[email protected]>
Date: Tue May 29 08:53:31 2012 +0200
[metadata.albums/artist/common.last.fm/] updated last.fm scrapers
diff --git a/metadata.albums.last.fm/addon.xml
b/metadata.albums.last.fm/addon.xml
index 11b4228..f769d18 100644
--- a/metadata.albums.last.fm/addon.xml
+++ b/metadata.albums.last.fm/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.albums.last.fm"
name="Last.FM"
- version="1.2.0"
+ version="1.2.1"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.albums.last.fm/lastfm.xml
b/metadata.albums.last.fm/lastfm.xml
index 45428b7..6f8b7b4 100644
--- a/metadata.albums.last.fm/lastfm.xml
+++ b/metadata.albums.last.fm/lastfm.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<scraper framework="1.1" date="2011-02-17">
<NfoUrl dest="3">
- <RegExp input="$$1"
output="http://ws.audioscrobbler.com/2.0/?method=album.getinfo&album=\2&artist=\1&api_key=71e468a84c1f40d4991ddccc46e40f1b";
dest="3">
+ <RegExp input="$$1"
output="http://ws.audioscrobbler.com/2.0/?method=album.getinfo&album=\2&artist=\1&api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]";
dest="3">
<expression>(http://www.last.fm/music/([^/]*)/(.*))</expression>
</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[lastfmlanguage]</url>";
dest="3">
+ <RegExp input="$$1"
output="<url>http://ws.audioscrobbler.com/2.0/?method=album.search&album=\1&artist=$$2&api_key=71e468a84c1f40d4991ddccc46e40f1b</url>";
dest="3">
<expression/>
</RegExp>
</CreateAlbumSearchUrl>
diff --git a/metadata.artists.last.fm/addon.xml
b/metadata.artists.last.fm/addon.xml
index 9699302..65b190f 100644
--- a/metadata.artists.last.fm/addon.xml
+++ b/metadata.artists.last.fm/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.artists.last.fm"
name="Last.FM"
- version="1.3.1"
+ version="1.3.2"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.artists.last.fm/lastfm.xml
b/metadata.artists.last.fm/lastfm.xml
index 0442474..5438fd0 100644
--- a/metadata.artists.last.fm/lastfm.xml
+++ b/metadata.artists.last.fm/lastfm.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<scraper framework="1.1" date="2011-01-24">
<NfoUrl dest="3">
- <RegExp input="$$1"
output="<url>http://ws.audioscrobbler.com/2.0/?method=artist.getinfo&artist=\1&api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[language]</url>";
dest="3">
+ <RegExp input="$$1"
output="<url>http://ws.audioscrobbler.com/2.0/?method=artist.getinfo&artist=\1&api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url>";
dest="3">
<expression>(http://www.last.fm/music/([^/]*))$</expression>
</RegExp>
</NfoUrl>
@@ -12,7 +12,7 @@
</CreateArtistSearchUrl>
<GetArtistSearchResults dest="8">
<RegExp input="$$5" output="<results>\1</results>"
dest="8">
- <RegExp input="$$1"
output="<entity><title>\1</title><url>http://ws.audioscrobbler.com/2.0/?method=artist.getinfo&artist=\4&api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[language]</url></entity>";
dest="5+">
+ <RegExp input="$$1"
output="<entity><title>\1</title><url>http://ws.audioscrobbler.com/2.0/?method=artist.getinfo&artist=\4&api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></entity>";
dest="5+">
<expression
repeat="yes"><artist>.*?<name>([^<]*)</name>.*?<mbid>([^<]*)</mbid>.*?<url>(?:http://)?www\.last\.fm/music/(\+noredirect/)?([^<]*)</url></expression>
</RegExp>
<expression noclean="1" />
diff --git a/metadata.common.last.fm/addon.xml
b/metadata.common.last.fm/addon.xml
index e38b3bf..708f6c4 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.3.0"
+ version="1.3.1"
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 ce3d6ef..4f63be9 100644
--- a/metadata.common.last.fm/lastfm.xml
+++ b/metadata.common.last.fm/lastfm.xml
@@ -19,7 +19,7 @@
</ParseLastFMDiscography>
<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">
+ <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&lang=$INFO[lastfmlanguage]</url></details>";
dest="5">
<expression noclean="1"/>
</RegExp>
</GetLastFMBiographyByMBID>
@@ -33,7 +33,7 @@
</ParseLastFMBiography>
<GetLastFMArtistGenresByMBID dest="5">
- <RegExp input="$$1" output="<details><url
function="ParseLastFMArtistGenres"
cache="lastfmgenres-\1.xml">http://ws.audioscrobbler.com/2.0/?method=artist.gettoptags&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url></details>";
dest="5">
+ <RegExp input="$$1" output="<details><url
function="ParseLastFMArtistGenres"
cache="lastfmgenres-\1.xml">http://ws.audioscrobbler.com/2.0/?method=artist.gettoptags&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>";
dest="5">
<expression noclean="1"/>
</RegExp>
</GetLastFMArtistGenresByMBID>
@@ -47,7 +47,7 @@
</ParseLastFMArtistGenres>
<GetLastFMArtistStylesByMBID dest="5">
- <RegExp input="$$1" output="<details><url
function="ParseLastFMArtistStyles"
cache="lastfmgenres-\1.xml">http://ws.audioscrobbler.com/2.0/?method=artist.gettoptags&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url></details>";
dest="5">
+ <RegExp input="$$1" output="<details><url
function="ParseLastFMArtistStyles"
cache="lastfmgenres-\1.xml">http://ws.audioscrobbler.com/2.0/?method=artist.gettoptags&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>";
dest="5">
<expression noclean="1"/>
</RegExp>
</GetLastFMArtistStylesByMBID>
@@ -61,12 +61,12 @@
</ParseLastFMArtistStyles>
<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">
+ <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&lang=$INFO[lastfmlanguage]</url></details>";
dest="5">
<expression noclean="1" />
</RegExp>
</GetLastFMArtistThumbsByMBID>
<GetLastFMArtistThumbsByName 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">
+ <RegExp input="$$1" output="<details><url
function="ParseLastFMArtistThumbs">http://ws.audioscrobbler.com/2.0/?method=artist.getimages&amp;artist=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>";
dest="5">
<expression noclean="1" />
</RegExp>
</GetLastFMArtistThumbsByName>
-----------------------------------------------------------------------
Summary of changes:
metadata.albums.last.fm/addon.xml | 2 +-
metadata.albums.last.fm/lastfm.xml | 4 ++--
metadata.artists.last.fm/addon.xml | 2 +-
metadata.artists.last.fm/lastfm.xml | 4 ++--
metadata.common.last.fm/addon.xml | 2 +-
metadata.common.last.fm/lastfm.xml | 10 +++++-----
6 files changed, 12 insertions(+), 12 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
