The branch, dharma has been updated
via 46b91bb48473f4bf0a0aa174321455fbb8db5a36 (commit)
via a6caa47883f87846c2647678f91698764716545b (commit)
from 56d88986e1f8998331376e017fec7db43a05860b (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=46b91bb48473f4bf0a0aa174321455fbb8db5a36
commit 46b91bb48473f4bf0a0aa174321455fbb8db5a36
Author: olympia <[email protected]>
Date: Wed Mar 14 08:21:23 2012 +0100
[metadata.artists.yoyo.pl] updated to version 1.1.1
diff --git a/metadata.artists.yoyo.pl/addon.xml
b/metadata.artists.yoyo.pl/addon.xml
index 93c25a9..9991db9 100644
--- a/metadata.artists.yoyo.pl/addon.xml
+++ b/metadata.artists.yoyo.pl/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.artists.yoyo.pl"
name="YoYo-MusicBrainz"
- version="1.1.0"
+ version="1.1.1"
provider-name="smuto">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.artists.yoyo.pl/resources/settings.xml
b/metadata.artists.yoyo.pl/resources/settings.xml
index 3f9357a..38137d5 100644
--- a/metadata.artists.yoyo.pl/resources/settings.xml
+++ b/metadata.artists.yoyo.pl/resources/settings.xml
@@ -3,6 +3,7 @@
<setting label="30000" type="lsep"/>
<setting type="sep"/>
<setting label="30002" type="labelenum"
values="en|de|es|fr|it|jp|pl|pt|ru|sv|tr|zh" id="language" default="pl"/>
+ <setting label="30003" type="bool" id="allmusicartistthumbs"
default="true"/>
<setting label="30004" type="bool" id="relationships" default="false"/>
<setting label="" type="lsep"/>
<setting label="[COLOR=FFe2ff43] pozdr. smuto[/COLOR]" type="lsep"/>
diff --git a/metadata.artists.yoyo.pl/yoyo.xml
b/metadata.artists.yoyo.pl/yoyo.xml
index bb10069..75cc0df 100644
--- a/metadata.artists.yoyo.pl/yoyo.xml
+++ b/metadata.artists.yoyo.pl/yoyo.xml
@@ -12,8 +12,8 @@
</CreateArtistSearchUrl>
<GetArtistSearchResults dest="8">
<RegExp input="$$5" output="<results>\1</results>"
dest="8">
- <RegExp input="$$1"
output="<entity><title>\5\7\9</title><genre>\2</genre><year>\6\8</year><url>http://musicbrainz.org/ws/2/artist/\3?inc=url-rels+release-groups</url></entity>";
dest="5">
- <expression
repeat="yes">(score":"[^"]+","type":"([^"]+)|score":"[^"]+)","id":"([^"]+)","(name":"([^"]+)",[^,]+,[^,]+,"disambiguation":"([^"]+)|name":"([^"]+)",[^,]+,"disambiguation":"([^"]+)|name":"([^"]+))</expression>
+ <RegExp input="$$1"
output="<entity><title>\4</title><genre>\2</genre><year>\6\7\8</year><url>http://musicbrainz.org/ws/2/artist/\3?inc=url-rels+release-groups</url></entity>";
dest="5">
+ <expression
repeat="yes">(score":"[^"]+","type":"([^"]+)|score":"[^"]+)","id":"([^"]+)","name":"([^"]+)","(sort-name":"[^"]+",[^,]+,[^,]+,"disambiguation":"([^"]+)|sort-name":"[^"]+",[^,]+,"disambiguation":"([^"]+)|sort-name":"[^"]+","disambiguation":"([^"]+)|sort-name":"[^"]+)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -26,6 +26,18 @@
<RegExp input="$$1"
output="<album><title>\1\2\3</title></album>" dest="5+">
<expression
repeat="yes">type="Album"[^<]*<title>([^<]*)</title>|type="Compilation"[^<]*<title>([^<]*)</title>|type="Soundtrack"[^<]*<title>([^<]*)</title></expression>
</RegExp>
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression
noclean="1"><artist.*?id="([^"]+)</expression>
+ </RegExp>
+ <RegExp input="" output="<url
function="FirstTryFanart"
cache="ftv-images-$$7.xml">http://fanart.tv/api/music.php?id=$$7&type=background</url>";
dest="5+">
+ <expression/>
+ </RegExp>
+ <RegExp input="" output="<url
function="GetBiography">http://ws.audioscrobbler.com/2.0/?method=artist.getinfo&amp;mbid=$$7&amp;lang=$INFO[language]&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url>";
dest="5+">
+ <expression/>
+ </RegExp>
+ <RegExp input="" output="<chain
function="GetLastFMArtistThumbsByID">$$7</chain>" dest="5+">
+ <expression />
+ </RegExp>
<RegExp input="$$1" output="\2xbmc\1" dest="6">
<expression fixchars="1,2" encode="1,2"
noclean="1,2"><name>([^<]+).*?<title>([^<]+)</expression>
</RegExp>
@@ -41,18 +53,6 @@
</RegExp>
<expression noclean="1"/>
</RegExp>
- <RegExp input="$$1" output="\1" dest="7">
- <expression
noclean="1"><artist.*?id="([^"]+)</expression>
- </RegExp>
- <RegExp input="" output="<url
function="FirstTryFanart"
cache="ftv-images-$$7.xml">http://fanart.tv/api/music.php?id=$$7&type=background</url>";
dest="5+">
- <expression/>
- </RegExp>
- <RegExp input="" output="<url
function="GetBiography">http://ws.audioscrobbler.com/2.0/?method=artist.getinfo&amp;mbid=$$7&amp;lang=$INFO[language]&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url>";
dest="5+">
- <expression/>
- </RegExp>
- <RegExp input="" output="<chain
function="GetLastFMArtistThumbsByID">$$7</chain>" dest="5+">
- <expression />
- </RegExp>
<RegExp input="" output="<url
function="GetGenres">http://ws.audioscrobbler.com/2.0/?method=artist.gettoptags&amp;mbid=$$7&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url>";
dest="5+">
<expression/>
</RegExp>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=a6caa47883f87846c2647678f91698764716545b
commit a6caa47883f87846c2647678f91698764716545b
Author: olympia <[email protected]>
Date: Wed Mar 14 08:20:55 2012 +0100
[metadata.albums.merlin.pl] updated to version 1.1.1
diff --git a/metadata.albums.merlin.pl/addon.xml
b/metadata.albums.merlin.pl/addon.xml
index 3a6ac0f..de7e6e3 100644
--- a/metadata.albums.merlin.pl/addon.xml
+++ b/metadata.albums.merlin.pl/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.albums.merlin.pl"
name="Merlin.pl"
- version="1.1.0"
+ version="1.1.1"
provider-name="smuto">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.albums.merlin.pl/merlin.xml
b/metadata.albums.merlin.pl/merlin.xml
index 119a482..0e54f18 100644
--- a/metadata.albums.merlin.pl/merlin.xml
+++ b/metadata.albums.merlin.pl/merlin.xml
@@ -13,7 +13,10 @@
<GetAlbumSearchResults dest="8">
<RegExp input="$$5" output="<results>\1</results>"
dest="8">
<RegExp input="$$1"
output="<entity><artist>\5</artist><title>\4</title><url>http://musicbrainz.org/ws/2/release-group/\3?inc=url-rels+artist-credits+releases</url></entity>";
dest="5">
- <expression
repeat="yes">(score":"[^"]+","type":"([^"]+)|score":"[^"]+)","id":"([^"]+)","title":"([^"]+)".+?"name":"([^"]+)</expression>
+ <expression
repeat="yes">(score":"[^"]+","type":"([^"]+)|score":"[^"]+)","id":"([^"]+)","title":"([^"]+)[^\[]+[^,]+,"name":"([^"]+)</expression>
+ </RegExp>
+ <RegExp input="$$1"
output="<entity><artist>\5</artist><title>\4</title><url>http://musicbrainz.org/ws/2/release-group/\3?inc=url-rels+artist-credits+releases</url></entity>";
dest="5+">
+
<expression>(score":"[^"]+","type":"([^"]+)|score":"[^"]+)","id":"([^"]+)","title":"([^"]+)[^\[]+[^,]+,"name":"([^"]+)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -59,8 +62,11 @@
<RegExp input="$$6" output="<url
function="AlbumUTFtoASCII">http://www.remove-pl.yoyo.pl/smu4.php?text=$$6&dot=$$6</url>";
dest="5+">
<expression />
</RegExp>
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression
noclean="1"><title>(.*?)</title></expression>
+ </RegExp>
<RegExp input="$$1" output="<url
function="GetMBTracks">http://musicbrainz.org/ws/2/release/\1?inc=recordings</url>";
dest="5+">
- <expression noclean="1">release
id="([^"]+)</expression>
+ <expression noclean="1">release
id="([^"]+)[^<]+<title>$$7</title></expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -194,6 +200,12 @@
<RegExp input="$$9"
output="<thumb>http://merlin.pl/images,images_big\1</thumb>";
dest="10">
<expression
noclean="1">src="[^,]+,[^,]+([^"]+)</expression>
</RegExp>
+ <RegExp input="$$1" output="\1" dest="9">
+ <expression
noclean="1">Kategorie:(.+?)</dd></expression>
+ </RegExp>
+ <RegExp input="$$9"
output="<genre>\1</genre>" dest="10+">
+ <expression repeat="yes" trim="1"
noclean="1">">([^<]+)</a></expression>
+ </RegExp>
<RegExp input="$$1"
output="<label>\1</label>" dest="10+">
<expression noclean="1">dt>Firma
fonograficzna:[^=]+[^>]+> ([^<]*)<</expression>
</RegExp>
-----------------------------------------------------------------------
Summary of changes:
metadata.albums.merlin.pl/addon.xml | 2 +-
metadata.albums.merlin.pl/merlin.xml | 16 +++++++++++-
metadata.artists.yoyo.pl/addon.xml | 2 +-
metadata.artists.yoyo.pl/resources/settings.xml | 1 +
metadata.artists.yoyo.pl/yoyo.xml | 28 +++++++++++-----------
5 files changed, 31 insertions(+), 18 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
