The branch, eden has been updated
via c039734b5be17fe10090c98f9a441bffe2968396 (commit)
from a9e1ec1f20842d29359f4d09c847907fd7881658 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=c039734b5be17fe10090c98f9a441bffe2968396
commit c039734b5be17fe10090c98f9a441bffe2968396
Author: olympia <[email protected]>
Date: Sat Jun 16 21:11:37 2012 +0200
[metadata.common.last.fm] updated to version 1.4.0
diff --git a/metadata.common.last.fm/addon.xml
b/metadata.common.last.fm/addon.xml
index 3164cd7..0bf0def 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.2"
+ version="1.4.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 db71b02..9671da5 100644
--- a/metadata.common.last.fm/lastfm.xml
+++ b/metadata.common.last.fm/lastfm.xml
@@ -1,77 +1,173 @@
<scraperfunctions>
- <GetLastFMDiscographyByMBID dest="5">
+ <GetLastFMDiscographyByMBID dest="5" clearbuffers="no">
<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">
+ <GetLastFMDiscography dest="5" clearbuffers="no">
<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"/>
</RegExp>
</GetLastFMDiscography>
- <ParseLastFMDiscography dest="5">
+ <ParseLastFMDiscography dest="5" clearbuffers="no">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1"
output="<album><title>\1</title></album>" dest="2+">
+ <RegExp input="" output="" dest="2">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1"
output="<album><title>\1</title></album>" dest="2">
<expression
repeat="yes"><album[^>]*>[^<]*<name>([^<]*?)</name></expression>
</RegExp>
<expression noclean="1">(.+)</expression>
</RegExp>
</ParseLastFMDiscography>
- <GetLastFMBiographyByMBID dest="5">
+ <GetLastFMBiographyByMBID dest="5" clearbuffers="no">
<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>
- <ParseLastFMBiography dest="5">
+ <ParseLastFMBiography dest="5" clearbuffers="no">
<RegExp input="$$6" output="<details>\1</details>"
dest="5">
+ <RegExp input="" output="" dest="6">
+ <expression />
+ </RegExp>
+ <RegExp input="" output="" dest="11">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="11">
+ <expression
fixchars="1"><content><!\[CDATA\[(.*?)\]\]</expression>
+ </RegExp>
+ <RegExp input="$$11" output="$$12" dest="2">
+ <RegExp input="$INFO[biogfbsource]"
output="<chain
function="GetAMGFallbackBiographyByAMGID">$$9</chain>"
dest="12">
+ <expression>allmusic.com</expression>
+ </RegExp>
+ <expression>^$</expression>
+ </RegExp>
+ <RegExp input="$$11"
output="<biography>\1</biography>" dest="6">
+ <expression>(.+)</expression>
+ </RegExp>
+ <expression noclean="1"/>
+ </RegExp>
+ </ParseLastFMBiography>
+
+ <GetLastFMFallbackBiographyByMBID dest="5" clearbuffers="no">
+ <RegExp input="$$1" output="<details><url
function="ParseLastFMFallbackBiography"
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>
+ </GetLastFMFallbackBiographyByMBID>
+ <ParseLastFMFallbackBiography dest="5" clearbuffers="no">
+ <RegExp input="$$6" output="<details>\1</details>"
dest="5">
+ <RegExp input="" output="" dest="6">
+ <expression />
+ </RegExp>
<RegExp input="$$1"
output="<biography>\1</biography>" dest="6">
<expression
fixchars="1"><content><!\[CDATA\[(.*?)\]\]</expression>
</RegExp>
<expression noclean="1">(.+)</expression>
</RegExp>
- </ParseLastFMBiography>
+ </ParseLastFMFallbackBiography>
- <GetLastFMArtistGenresByMBID dest="5">
+ <GetLastFMArtistGenresByMBID dest="5" clearbuffers="no">
<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>
- <ParseLastFMArtistGenres dest="5">
+ <ParseLastFMArtistGenres dest="5" clearbuffers="no">
<RegExp input="$$4" output="<details>\1</details>"
dest="5">
+ <RegExp input="" output="" dest="4">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1"
output="<genre>\1</genre>" dest="11">
+ <expression
noclean="1"><tag>.*?<name>([^/lt;]*)</name></expression>
+ </RegExp>
+ <RegExp input="$$11" output="$$12" dest="4">
+ <RegExp input="$INFO[genresfbsource]"
output="<chain
function="GetAMGFallbackArtistGenresByAMGID">$$9</chain>"
dest="12">
+ <expression>allmusic.com</expression>
+ </RegExp>
+
<expression><genre></genre></expression>
+ </RegExp>
+ <RegExp input="$$11" output="$$11" dest="4">
+
<expression><genre>(.+)</genre></expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseLastFMArtistGenres>
+
+ <GetLastFMFallbackArtistGenresByMBID dest="5" clearbuffers="no">
+ <RegExp input="$$1" output="<details><url
function="ParseLastFMFallbackArtistGenres"
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>
+ </GetLastFMFallbackArtistGenresByMBID>
+ <ParseLastFMFallbackArtistGenres dest="5" clearbuffers="no">
+ <RegExp input="$$4" output="<details>\1</details>"
dest="5">
+ <RegExp input="" output="" dest="4">
+ <expression />
+ </RegExp>
<RegExp input="$$1"
output="<genre>\1</genre>" dest="4">
<expression
noclean="1"><tag>.*?<name>([^/lt;]*)</name></expression>
</RegExp>
<expression noclean="1">(.+)</expression>
</RegExp>
- </ParseLastFMArtistGenres>
+ </ParseLastFMFallbackArtistGenres>
- <GetLastFMArtistStylesByMBID dest="5">
+ <GetLastFMArtistStylesByMBID dest="5" clearbuffers="no">
<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>
- <ParseLastFMArtistStyles dest="5">
+ <ParseLastFMArtistStyles dest="5" clearbuffers="no">
+ <RegExp input="$$4" output="<details>\1</details>"
dest="5">
+ <RegExp input="" output="" dest="4">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1"
output="<style>\1</style>" dest="11">
+ <expression repeat="yes"
noclean="1"><tag>.*?<name>([^/lt;]*)</name></expression>
+ </RegExp>
+ <RegExp input="$$11" output="$$12" dest="4">
+ <RegExp input="$INFO[genresfbsource]"
output="<chain
function="GetAMGFallbackArtistStylesByAMGID">$$9</chain>"
dest="12">
+ <expression>allmusic.com</expression>
+ </RegExp>
+
<expression><genre></genre></expression>
+ </RegExp>
+ <RegExp input="$$11" output="$$11" dest="4">
+
<expression><genre>(.+)</genre></expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseLastFMArtistStyles>
+
+ <GetLastFMFallbackArtistStylesByMBID dest="5" clearbuffers="no">
+ <RegExp input="$$1" output="<details><url
function="ParseLastFMFallbackArtistStyles"
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>
+ </GetLastFMFallbackArtistStylesByMBID>
+ <ParseLastFMFallbackArtistStyles dest="5" clearbuffers="no">
<RegExp input="$$4" output="<details>\1</details>"
dest="5">
+ <RegExp input="" output="" dest="4">
+ <expression />
+ </RegExp>
<RegExp input="$$1"
output="<style>\1</style>" dest="4">
<expression repeat="yes"
noclean="1"><tag>.*?<name>([^/lt;]*)</name></expression>
</RegExp>
<expression noclean="1">(.+)</expression>
</RegExp>
- </ParseLastFMArtistStyles>
+ </ParseLastFMFallbackArtistStyles>
- <GetLastFMArtistThumbsByMBID dest="5">
+ <GetLastFMArtistThumbsByMBID dest="5" clearbuffers="no">
<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">
+ <GetLastFMArtistThumbsByName dest="5" clearbuffers="no">
<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>
- <ParseLastFMArtistThumbs dest="5">
+ <ParseLastFMArtistThumbs dest="5" clearbuffers="no">
<RegExp input="$$6" output="<details>\1</details>"
dest="5">
+ <RegExp input="" output="" dest="6">
+ <expression />
+ </RegExp>
<RegExp input="$$1" output="<thumb
preview="\2">\1</thumb>" dest="6">
<expression repeat="yes" noclean="1"><size
name="original"[^>]*>([^<]*)<[^<]*<size
name="large"[^>]*>([^<]*)<</expression>
</RegExp>
-----------------------------------------------------------------------
Summary of changes:
metadata.common.last.fm/addon.xml | 2 +-
metadata.common.last.fm/lastfm.xml | 128 +++++++++++++++++++++++++++++++-----
2 files changed, 113 insertions(+), 17 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
