The branch, dharma has been updated
via 6113e4599fa9a9f16cc2925ddd25da7289255aea (commit)
from db03e3799a99be9efe1446d92cb21f5d106c99f5 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=6113e4599fa9a9f16cc2925ddd25da7289255aea
commit 6113e4599fa9a9f16cc2925ddd25da7289255aea
Author: olympia <[email protected]>
Date: Sat Jan 29 09:16:47 2011 +0100
[metadata.artists.last.fm] scrape all images and general cleanup
diff --git a/metadata.albums.allmusic.com/addon.xml
b/metadata.albums.allmusic.com/addon.xml
index 313b27f..5f7e191 100644
--- a/metadata.albums.allmusic.com/addon.xml
+++ b/metadata.albums.allmusic.com/addon.xml
@@ -5,7 +5,7 @@
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.last.fm" version="1.1.0"/>
<import addon="metadata.common.allmusic.com" version="1.8.1"/>
<import addon="metadata.common.htbackdrops.com" version="1.0.7"/>
</requires>
@@ -21,7 +21,9 @@
<summary lang="nl">AllMusic-albuminfo</summary>
<summary lang="pl">Informacje o albumach z AllMusic</summary>
<summary lang="pt">Scraper de músicas AllMusic</summary>
+ <summary lang="ro">Catalog AllMusic pentru informaÈii albume</summary>
<summary lang="ru">ÐнÑоÑмаÑÐ¸Ñ Ð¾Ð± алÑбоме из
AllMusic</summary>
+ <summary lang="se">AllMusic albuminformation</summary>
<summary lang="zh">AllMusicé³ä¹ä¸è¾ä¿¡æ¯</summary>
<description lang="en">Use AllMusic.com to fill your library metadata
information.
The allmusic website was created in 1995 as a place for music fans to indulge
their passion.
@@ -50,10 +52,17 @@ Alle genres en stijlen - of het nu de meest commerciële of
de meest obscure zij
<description lang="pt">Use o AllMusic.com para obter a informação da sua
Biblioteca de música. O site allmusic foi criado em 1995 para alimentar a
paixão dos fans de música.
O pessoal da redacção da AMG, em conjunto com centenas de especialistas
(todos fanáticos por música à sua maneira), tornaram o allmusic o mais
completo site de referência musical do planeta. Continuam dedicados a criar e
manter o conhecimento, espÃrito e conteúdos que fans de música e
profissionais da indústria se habituaram a obter da AMG.
Todos os géneros e estilos de música podem ser encontrados aqui, desde o
mais comercial e popular até à música mais rara. Nós revemos e criticamos
álbuns e artistas dentro do contexto do seu género - the ópera a rock de
garagem, de pop a música country. Isto assegura que fans de qualquer género
podem depender de nós para os manter actualizados sobre os seus artistas
favoritos bem como de novos sons.</description>
+ <description lang="ro">FolosiÈi AllMusic.com ca sursÄ pentru mediateca
dumneavoastrÄ.
+Site-ul allmusic a fost creat în 1995 ca un loc unde iubitorii de muzicÄ sÄ
se rÄsfeÈe. Echipa editorialÄ AMG, împreunÄ cu sute de contribuitori
experÈi (niÈte fanatici dupÄ muzicÄ Ã®n felul lor), au fÄcut allmusic cea
mai cuprinzÄtoare sursÄ de referinÈe muzicale de pe planetÄ. ToÈi sunt
dedicaÈi sÄ creeze Èi sÄ Ã®ntreÈinÄ conÈinutul pe care iubitorii de
muzicÄ Èi profesioniÈtii din industrie îl aÈteaptÄ de la AMG.
+Toate genurile Èi stilurile de muzicÄ sunt incluse aici, începând de la
cele mai populare cÄtre cele mai obscure. Noi criticÄm albumele Èi artiÈtii
în contextul genurilor proprii. ToÈi fanii oricÄrui stil de muzicÄ pot
conta pe noi sÄ Ã®i Èinem la curent cu artiÈtii lor favoriÈi, dar Èi sÄ
le prezentÄm noi cântece.</description>
<description lang="ru">ÐÑполÑзÑйÑе AllMusic.com длÑ
Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¼ÐµÑа-даннÑÑ
в ваÑÑ Ð±Ð¸Ð±Ð»Ð¸Ð¾ÑекÑ.
Ð¡Ð°Ð¹Ñ allmusic бÑл Ñоздан в 1995 как меÑÑо длÑ
ÑанаÑов мÑзÑки, где они могли бÑ
ÑдовлеÑвоÑÑÑÑ ÑÐ²Ð¾Ñ ÑÑÑаÑÑÑ.
РедакÑоÑÑкий ÑоÑÑав AMG, вмеÑÑе Ñ ÑоÑнÑми
ÑÑаÑÑников-ÑкÑпеÑÑов (каждÑй по-ÑвоемÑ
ÑÐ°Ð½Ð°Ñ Ð¼ÑзÑки), Ñделали allmusic ÑамÑм полнÑм
иÑÑоÑником инÑоÑмаÑии о мÑзÑке на планеÑе.
ÐÑе они поÑвÑÑили ÑÐµÐ±Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¸
поддеÑжке полезного, и познаваÑелÑного,
конÑенÑа коÑоÑÑй лÑбиÑели мÑзÑки, и
пÑоÑеÑÑÐ¸Ð¾Ð½Ð°Ð»Ñ Ð¸Ð½Ð´ÑÑÑÑии, ожидаÑÑ Ð¾Ñ AMG.
ÐдеÑÑ Ð¿ÑедÑÑÐ°Ð²Ð»ÐµÐ½Ñ Ð²Ñе ÑÑили и жанÑÑ
мÑзÑки, Ð¾Ñ ÑамÑÑ
коммеÑÑеÑки попÑлÑÑнÑÑ
до
наиболее неизвеÑÑнÑÑ
. ÐÑ ÐºÑиÑикÑем алÑбомÑ
и иÑполниÑелей в конÑекÑÑе иÑ
ÑобÑÑвенного
жанÑа - Ð¾Ñ Ð¾Ð¿ÐµÑÑ Ð¸ гаÑажного Ñока до
ÑÑадиÑионного канÑÑи. ÐÑо обеÑпеÑÐ¸Ð²Ð°ÐµÑ Ñо,
ÑÑо ÑÐ°Ð½Ð°Ñ Ð»Ñбого ÑÑÐ¸Ð»Ñ Ð¼ÑзÑки можеÑ
полагаÑÑÑÑ Ð½Ð° Ð½Ð°Ñ Ð² поддеÑжке акÑÑалÑноÑÑи
ÑвоиÑ
познаний о лÑбимом иÑполниÑеле и
Ñакже ÑаÑÑиÑÑÑÑ Ñвои знаниÑ.</description>
+ <description lang="se">LÃ¥t AllMusic.com fylla dina mappar med
metadatainformation.
+AllMusic's webbplats skapades 1995 som en plats för musikälskare där de
kunde njuta av sin passion.
+AMG's redaktion har tillsammans med hundratals experter och bidragsgivare,
alla musikfanatiker på sina egna sätt, gjort AllMusic till den mest
omfattande källan inom musikreferens på den här planeten. De är alla
kunniga och engagerade med att skapa och upprätthålla ett innehåll på
webbplatsen, som musikälskare och branschfolk förväntar sig av AMG.
+Alla genrer och stilar av musik behandlas här, allt från det mest
kommersiellt populära till det mest suspekta. De kritiserar album och artister
inom ramen för sina egna genrer, allt från opera, garagerock till
traditionell countrymusik. Detta säkerställer att alla fans oavsett musikstil
kan lita på dem och hålla sig uppdaterade med sina favoritartister och bli
introducerade till nya ljud.</description>
<description lang="zh">ä»AllMusic.comç½ç«è·åé³ä¹èµæã
allmusicç½ç«å建äº1995å¹´ï¼å®æ¯é³ä¹ç±å¥½è
çä¹åã
AMGçç¼è¾å许å¤ä¸ä¸æ°ç¨¿äººï¼é½æ¯é³ä¹ççååï¼å
±åæallmusic建æä¸çä¸æå
¨é¢çé³ä¹èµæåºãä»ä»¬è´åäºåé åç»´æ¤é³ä¹ç±å¥½è
åä¸å
ä¸ä¸äººå£«ææä»AMGå¾å°çç¥è¯åç²¾ç¥äº§åã
diff --git a/metadata.albums.last.fm/addon.xml
b/metadata.albums.last.fm/addon.xml
index 75b78a2..4926d78 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.0"
+ version="1.1.1"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
- <import addon="metadata.common.last.fm" version="1.0.1"/>
+ <import addon="metadata.common.last.fm" version="1.1.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 efac399..4b3d3c7 100644
--- a/metadata.albums.last.fm/lastfm.xml
+++ b/metadata.albums.last.fm/lastfm.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<scraper framework="1.1" date="2009-09-26">
+<scraper framework="1.1" date="2011-01-26">
<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">
<expression>(http://www.last.fm/music/([^/]*)/(.*))</expression>
@@ -12,11 +12,11 @@
</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&amp;album=\4&amp;artist=\3&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&amp;lang=$INFO[language]</url></entity>";
dest="5+">
+ <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+">
<expression
repeat="yes"><album>.*?<name>([^<]*)</name>.*?<artist>([^<]*)</artist>.*?<url>http://www.last.fm/music/([^/]+)/(.*?)</url></expression>
</RegExp>
<expression noclean="1"/>
- </RegExp>
+ </RegExp>
</GetAlbumSearchResults>
<GetAlbumDetails dest="3">
<RegExp input="$$5" output="<?xml version="1.0"
encoding="UTF-8"?><details>\1</details>" dest="3">
@@ -42,9 +42,6 @@
<RegExp input="$$1" output="\1" dest="6">
<expression noclean="1"><image
size="extralarge">([^<]*)</image></expression>
</RegExp>
- <RegExp input="$$1" output="\1" dest="6">
- <expression noclean="1"><image
size="mega">([^<]*)</image></expression>
- </RegExp>
<expression noclean="1" />
</RegExp>
<RegExp input="$$1" output="<url
function="GetTracks">http://ws.audioscrobbler.com/2.0/?method=playlist.fetch&amp;playlistURL=lastfm://playlist/album/\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url>";
dest="5+">
diff --git a/metadata.artists.allmusic.com/addon.xml
b/metadata.artists.allmusic.com/addon.xml
index 7e2b034..008eeff 100644
--- a/metadata.artists.allmusic.com/addon.xml
+++ b/metadata.artists.allmusic.com/addon.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.artists.allmusic.com"
name="AllMusic"
- version="2.0.2"
+ version="2.0.3"
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.last.fm" version="1.1.0"/>
<import addon="metadata.common.allmusic.com" version="1.8.1"/>
<import addon="metadata.common.htbackdrops.com" version="1.0.7"/>
</requires>
@@ -21,7 +21,9 @@
<summary lang="nl">AllMusic-artiestinfo</summary>
<summary lang="pl">Informacje o artystach AllMusic</summary>
<summary lang="pt">Scraper de músicas AllMusic</summary>
+ <summary lang="ro">Catalog AllMusic pentru informaÈii artiÈti</summary>
<summary lang="ru">ÐнÑоÑмаÑÐ¸Ñ Ð¾Ð± иÑполниÑеле из
AllMusic</summary>
+ <summary lang="se">AllMusic artistinformation + HTBackdrops
artistbilder</summary>
<summary lang="zh">AllMusicèºæ¯å®¶ä¿¡æ¯</summary>
<description lang="en">Use AllMusic.com to fill your libray metadata
information.
The allmusic website was created in 1995 as a place for music fans to indulge
their passion. All genres and styles of music are covered here, ranging from
the most commercially popular to the most obscure. We critique albums and
artists within the context of their own genres - from opera to garage rock to
traditional country.
@@ -50,10 +52,18 @@ Alle genres en stijlen - of het nu de meest commerciële of
de meest obscure zij
<description lang="pt">Use o AllMusic.com para obter a informação da sua
Biblioteca de música. O site allmusic foi criado em 1995 para alimentar a
paixão dos fans de música.
O pessoal da redacção da AMG, em conjunto com centenas de especialistas
(todos fanáticos por música à sua maneira), tornaram o allmusic o mais
completo site de referência musical do planeta. Continuam dedicados a criar e
manter o conhecimento, espÃrito e conteúdos que fans de música e
profissionais da indústria se habituaram a obter da AMG.
Todos os géneros e estilos de música podem ser encontrados aqui, desde o
mais comercial e popular até à música mais rara. Nós revemos e criticamos
álbuns e artistas dentro do contexto do seu género - the ópera a rock de
garagem, de pop a música country. Isto assegura que fans de qualquer género
podem depender de nós para os manter actualizados sobre os seus artistas
favoritos bem como de novos sons.</description>
+ <description lang="ro">FolosiÈi AllMusic.com ca sursÄ pentru mediateca
dumneavoastrÄ.
+Site-ul allmusic a fost creat în 1995 ca un loc unde iubitorii de muzicÄ sÄ
se rÄsfeÈe. Toate genurile Èi stilurile de muzicÄ sunt incluse aici,
începând de la cele mai populare cÄtre cele mai obscure. Noi criticÄm
albumele Èi artiÈtii în contextul genurilor proprii.
+
+Home Theater Backdrops (HTBackdrops.com) este o bazÄ de date de imagini
realizatÄ de comunitate pentru imagini de înaltÄ calitate ale artiÈtiilor,
cum ar fi miniaturi Èi imagini realizate de fani (fanarts). Toate imaginile au
fost create sau au ca sursÄ membrii ei. VÄ rugÄm sÄ luaÈi în considerare
cÄ puteÈi încÄrca propriile imagini cu muzicianul preferat.</description>
<description lang="ru">ÐÑполÑзÑйÑе AllMusic.com длÑ
Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¼ÐµÑа-даннÑÑ
в ваÑÑ Ð±Ð¸Ð±Ð»Ð¸Ð¾ÑекÑ.
Ð¡Ð°Ð¹Ñ allmusic бÑл Ñоздан в 1995 как меÑÑо длÑ
ÑанаÑов мÑзÑки, где они могли бÑ
ÑдовлеÑвоÑÑÑÑ ÑÐ²Ð¾Ñ ÑÑÑаÑÑÑ.
РедакÑоÑÑкий ÑоÑÑав AMG, вмеÑÑе Ñ ÑоÑнÑми
ÑÑаÑÑников-ÑкÑпеÑÑов (каждÑй по-ÑвоемÑ
ÑÐ°Ð½Ð°Ñ Ð¼ÑзÑки), Ñделали allmusic ÑамÑм полнÑм
иÑÑоÑником инÑоÑмаÑии о мÑзÑке на планеÑе.
ÐÑе они поÑвÑÑили ÑÐµÐ±Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¸
поддеÑжке полезного, и познаваÑелÑного,
конÑенÑа коÑоÑÑй лÑбиÑели мÑзÑки, и
пÑоÑеÑÑÐ¸Ð¾Ð½Ð°Ð»Ñ Ð¸Ð½Ð´ÑÑÑÑии, ожидаÑÑ Ð¾Ñ AMG.
ÐдеÑÑ Ð¿ÑедÑÑÐ°Ð²Ð»ÐµÐ½Ñ Ð²Ñе ÑÑили и жанÑÑ
мÑзÑки, Ð¾Ñ ÑамÑÑ
коммеÑÑеÑки попÑлÑÑнÑÑ
до
наиболее неизвеÑÑнÑÑ
. ÐÑ ÐºÑиÑикÑем алÑбомÑ
и иÑполниÑелей в конÑекÑÑе иÑ
ÑобÑÑвенного
жанÑа - Ð¾Ñ Ð¾Ð¿ÐµÑÑ Ð¸ гаÑажного Ñока до
ÑÑадиÑионного канÑÑи. ÐÑо обеÑпеÑÐ¸Ð²Ð°ÐµÑ Ñо,
ÑÑо ÑÐ°Ð½Ð°Ñ Ð»Ñбого ÑÑÐ¸Ð»Ñ Ð¼ÑзÑки можеÑ
полагаÑÑÑÑ Ð½Ð° Ð½Ð°Ñ Ð² поддеÑжке акÑÑалÑноÑÑи
ÑвоиÑ
познаний о лÑбимом иÑполниÑеле и
Ñакже ÑаÑÑиÑÑÑÑ Ñвои знаниÑ.</description>
+ <description lang="se">LÃ¥t AllMusic.com fylla dina mappar med
metadatainformation.
+AllMusic's webbplats skapades 1995 som en plats för musikälskare där de
kunde njuta av sin passion. Alla genrer och stilar av musik behandlas här,
allt från det mest kommersiellt populära till det mest suspekta. De
kritiserar album och artister inom ramen för sina egna genrer, allt från
opera, garagerock till traditionell countrymusik.
+
+Home Theater Backdrops (HTBackdrops.com) är en gemenskapsdriven bilddatabas
för högkvalitativa miniatyrer och fanart på artister. Alla bilder har
skapats eller bidragits frÃ¥n medlemmarna. Ãverväg att ladda upp dina egna
bilder av dina favoritartister.</description>
<description lang="zh">ä»AllMusic.comç½ç«è·åé³ä¹èµæã
allmusicç½ç«å建äº1995å¹´ï¼å®æ¯é³ä¹ç±å¥½è
çä¹åã
AMGçç¼è¾å许å¤ä¸ä¸æ°ç¨¿äººï¼é½æ¯é³ä¹ççååï¼å
±åæallmusic建æä¸çä¸æå
¨é¢çé³ä¹èµæåºãä»ä»¬è´åäºåé åç»´æ¤é³ä¹ç±å¥½è
åä¸å
ä¸ä¸äººå£«ææä»AMGå¾å°çç¥è¯åç²¾ç¥äº§åã
diff --git a/metadata.artists.allmusic.com/allmusic.xml
b/metadata.artists.allmusic.com/allmusic.xml
index eb26034..e9506bc 100644
--- a/metadata.artists.allmusic.com/allmusic.xml
+++ b/metadata.artists.allmusic.com/allmusic.xml
@@ -44,7 +44,7 @@
<RegExp input="$$1" output="<url
cache="am-$$2-artist.html"
function="ParseAMGArtist">http://www.allmusic.com/artist/\1</url>";
dest="5+">
<expression>http://www.allmusic.com/artist/([^&"/]*)</expression>
</RegExp>
- <RegExp input="$$2" conditional="lastfmartistthumbs"
output="<chain
function="GetLastFMArtistThumbs">\1</chain>" dest="5+">
+ <RegExp input="$$2" conditional="lastfmartistthumbs"
output="<chain
function="GetLastFMArtistThumbsByName">\1</chain>" dest="5+">
<expression/>
</RegExp>
<RegExp input="$$2" conditional="htbfanart"
output="<chain function="GetHTBFanart">\1</chain>"
dest="5+">
diff --git a/metadata.artists.last.fm/addon.xml
b/metadata.artists.last.fm/addon.xml
index cd609e7..6f72991 100644
--- a/metadata.artists.last.fm/addon.xml
+++ b/metadata.artists.last.fm/addon.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.artists.last.fm"
name="Last.FM"
- version="1.1.0"
+ version="1.1.1"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
- <import addon="metadata.common.last.fm" version="1.0.1"/>
+ <import addon="metadata.common.last.fm" version="1.1.0"/>
<import addon="metadata.common.htbackdrops.com" version="1.0.1"/>
</requires>
<extension point="xbmc.metadata.scraper.artists"
diff --git a/metadata.artists.last.fm/lastfm.xml
b/metadata.artists.last.fm/lastfm.xml
index f6cda99..65f7c17 100644
--- a/metadata.artists.last.fm/lastfm.xml
+++ b/metadata.artists.last.fm/lastfm.xml
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
-<scraper framework="1.1" date="2009-09-26">
+<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&amp;artist=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&amp;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[language]</url>";
dest="3">
<expression>(http://www.last.fm/music/([^/]*))$</expression>
</RegExp>
</NfoUrl>
<CreateArtistSearchUrl dest="3">
- <RegExp input="$$1"
output="<url>http://ws.audioscrobbler.com/2.0/?method=artist.search&amp;artist=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url>";
dest="3">
- <expression/>
+ <RegExp input="$$1"
output="<url>http://ws.audioscrobbler.com/2.0/?method=artist.search&artist=\1&api_key=71e468a84c1f40d4991ddccc46e40f1b</url>";
dest="3">
+ <expression />
</RegExp>
</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&amp;artist=\4&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&amp;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[language]</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"/>
- </RegExp>
+ <expression noclean="1" />
+ </RegExp>
</GetArtistSearchResults>
<GetArtistDetails dest="3">
<RegExp input="$$5" output="<?xml version="1.0"
encoding="utf-8"?><details>\1</details>" dest="3">
@@ -24,25 +24,16 @@
<expression
noclean="1"><name>([^<]*)</name></expression>
</RegExp>
<RegExp input="$$1"
output="<biography><![CDATA[\1]]></biography>" dest="5+">
- <expression
fixchars="1"><content><!\[CDATA\[(.*?)\]</expression>
+
<expression><content><!\[CDATA\[(.*?)\]</expression>
</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="\1" dest="6">
- <expression noclean="1"><image
size="mega">([^<]*)</image></expression>
- </RegExp>
- <expression noclean="1" />
+ <RegExp input="$$1" output="<chain
function="GetLastFMArtistThumbsByID">\1</chain>" dest="5+">
+ <expression
noclean="1"><mbid>([^<]*)</mbid></expression>
</RegExp>
- <RegExp input="$$2" conditional="htbthumbs"
output="<chain function="GetHTBThumbs">\1</chain>"
dest="5+">
- <expression/>
+ <RegExp conditional="htbthumbs" input="$$2"
output="<chain function="GetHTBThumbs">\1</chain>"
dest="5+">
+ <expression />
</RegExp>
- <RegExp input="$$2" conditional="htbfanart"
output="<chain function="GetHTBFanart">\1</chain>"
dest="5+">
- <expression/>
+ <RegExp conditional="htbfanart" input="$$2"
output="<chain function="GetHTBFanart">\1</chain>"
dest="5+">
+ <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>
@@ -50,7 +41,7 @@
<RegExp input="$$1" output="<chain
function="GetLastFMDiscography">\1</chain>" dest="5+">
<expression
noclean="1"><url>http://www.last.fm/music/(.*?)</url></expression>
</RegExp>
- <expression noclean="1"/>
+ <expression noclean="1" />
</RegExp>
</GetArtistDetails>
<GetGenres dest="5">
@@ -61,7 +52,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" />
</RegExp>
</GetGenres>
-</scraper>
+</scraper>
\ No newline at end of file
diff --git a/metadata.common.last.fm/addon.xml
b/metadata.common.last.fm/addon.xml
index 5a6e8d1..ac77954 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.0.4"
+ version="1.1.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
@@ -16,20 +16,22 @@
<summary lang="es">Scraper de música de LastFM</summary>
<summary lang="fr">Scraper LastFM</summary>
<summary lang="hu">LastFM leolvasó-könyvtár</summary>
- <summary lang="nl">LastFM Scraper Collectie</summary>
- <summary lang="pl">Scraper LastFM</summary>
+ <summary lang="nl">LastFM-scraperfuncties</summary>
+ <summary lang="pl">Scraper biblioteki LastFM</summary>
<summary lang="pt">Scraper de música LastFM</summary>
<summary lang="ru">ÐбÑабоÑÑик Ð´Ð»Ñ LastFM</summary>
+ <summary lang="se">Skrapebibliotek för LastFM</summary>
<summary lang="zh">LastFMå®åå¨ä»£ç åº</summary>
<description lang="en">Download Music information from
www.last.fm</description>
<description lang="de">Downloade Musik informationen von
www.last.fm</description>
<description lang="es">Descargar información musical de
www.last.fm</description>
<description lang="fr">Télécharge les infos musicales depuis
www.last.fm</description>
<description lang="hu">Zene információk letöltése a www.last.fm
webhelyrÅl</description>
- <description lang="nl">Download muziek informatie</description>
+ <description lang="nl">Muziekinfo ophalen van LastFM</description>
<description lang="pl">Pobieraj informacje o muzyce z
www.last.fm</description>
<description lang="pt">Descarregar informação de música de
www.last.fm</description>
<description lang="ru">ÐагÑÑжаÑÑ Ð¸Ð½ÑоÑмаÑÐ¸Ñ Ð¾
ÐÑзÑке Ñ www.last.fm</description>
+ <description lang="se">Ladda ner musikinformation från
www.last.fm</description>
<description lang="zh">ä»www.last.fmä¸è½½é³ä¹ä¿¡æ¯</description>
</extension>
</addon>
diff --git a/metadata.common.last.fm/lastfm.xml
b/metadata.common.last.fm/lastfm.xml
index c31e640..db92b68 100644
--- a/metadata.common.last.fm/lastfm.xml
+++ b/metadata.common.last.fm/lastfm.xml
@@ -1,44 +1,49 @@
-<scraperfunctions>
- <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"/>
- </RegExp>
- </GetLastFMDiscography>
- <ParseLastFMDiscography dest="5">
- <RegExp input="$$2" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1"
output="<album><title>\1</title></album>" dest="2+">
- <expression
repeat="yes"><album[^>]*>[^<]*<name>([^<]*?)</name></expression>
- </RegExp>
- <expression noclean="1"/>
- </RegExp>
- </ParseLastFMDiscography>
- <GetLastFMArtistThumbs 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>
- </GetLastFMArtistThumbs>
- <ParseLastFMArtistThumbs dest="5">
- <RegExp input="$$2" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1"
output="<thumb>\1</thumb>" dest="2">
- <expression noclean="1" repeat="yes"><size
name="original"[^>]*>([^<]*)</size></expression>
- </RegExp>
- <expression noclean="1"></expression>
- </RegExp>
- </ParseLastFMArtistThumbs>
- <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">
- <expression>(.+)::(.+)</expression>
- </RegExp>
- </GetLastFMAlbumThumbs>
- <ParseLastFMAlbumThumbs dest="5">
- <RegExp input="$$2" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1"
output="<thumb>\1</thumb>" dest="2">
- <expression noclean="1"><image
size="extralarge">([^<]*)</image></expression>
- </RegExp>
- <RegExp input="$$1"
output="<thumb>\1</thumb>" dest="2+">
- <expression noclean="1"><image
size="large">([^<]*)</image></expression>
- </RegExp>
- <expression noclean="1"></expression>
- </RegExp>
- </ParseLastFMAlbumThumbs>
-</scraperfunctions>
+<scraperfunctions>
+ <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"/>
+ </RegExp>
+ </GetLastFMDiscography>
+ <ParseLastFMDiscography dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1"
output="<album><title>\1</title></album>" dest="2+">
+ <expression
repeat="yes"><album[^>]*>[^<]*<name>([^<]*?)</name></expression>
+ </RegExp>
+ <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">
+ <expression noclean="1" />
+ </RegExp>
+ </GetLastFMArtistThumbsByID>
+ <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">
+ <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>
+ </RegExp>
+ <expression noclean="1">(.+)</expression>
+ </RegExp>
+ </ParseLastFMArtistThumbs>
+ <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">
+ <expression>(.+)::(.+)</expression>
+ </RegExp>
+ </GetLastFMAlbumThumbs>
+ <ParseLastFMAlbumThumbs dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1"
output="<thumb>\1</thumb>" dest="2">
+ <expression noclean="1"><image
size="extralarge">([^<]*)</image></expression>
+ </RegExp>
+ <RegExp input="$$1"
output="<thumb>\1</thumb>" dest="2+">
+ <expression noclean="1"><image
size="large">([^<]*)</image></expression>
+ </RegExp>
+ <expression noclean="1"></expression>
+ </RegExp>
+ </ParseLastFMAlbumThumbs>
+</scraperfunctions>
-----------------------------------------------------------------------
Summary of changes:
metadata.albums.allmusic.com/addon.xml | 11 +++-
metadata.albums.last.fm/addon.xml | 4 +-
metadata.albums.last.fm/lastfm.xml | 9 +--
metadata.artists.allmusic.com/addon.xml | 14 ++++-
metadata.artists.allmusic.com/allmusic.xml | 2 +-
metadata.artists.last.fm/addon.xml | 4 +-
metadata.artists.last.fm/lastfm.xml | 43 +++++--------
metadata.common.last.fm/addon.xml | 10 ++-
metadata.common.last.fm/lastfm.xml | 93 +++++++++++++++-------------
9 files changed, 102 insertions(+), 88 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
