The branch, dharma has been updated
via 56d88986e1f8998331376e017fec7db43a05860b (commit)
via e8e151099fdfb018fc4a9712ea631c62ac8c32ab (commit)
from 9d501b354eac30cf49d8b90c98f055fe58d8449b (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=56d88986e1f8998331376e017fec7db43a05860b
commit 56d88986e1f8998331376e017fec7db43a05860b
Author: olympia <[email protected]>
Date: Fri Mar 9 21:39:59 2012 +0100
[metadata.artists.yoyo.pl] updated to version 1.1.0
diff --git a/metadata.artists.yoyo.pl/addon.xml
b/metadata.artists.yoyo.pl/addon.xml
index e89d787..93c25a9 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.0.9"
+ version="1.1.0"
provider-name="smuto">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.artists.yoyo.pl/changelog.txt
b/metadata.artists.yoyo.pl/changelog.txt
index c2c9986..a568de2 100644
--- a/metadata.artists.yoyo.pl/changelog.txt
+++ b/metadata.artists.yoyo.pl/changelog.txt
@@ -1,3 +1,5 @@
+[B]1.1.0[/B]
+- MusicBrainz - version 2 of XML web service
[B]1.0.4[/B]
- new icon thx to freezy
[B]1.0.3[/B]
diff --git a/metadata.artists.yoyo.pl/resources/language/English/strings.xml
b/metadata.artists.yoyo.pl/resources/language/English/strings.xml
index 988075a..498dd57 100644
--- a/metadata.artists.yoyo.pl/resources/language/English/strings.xml
+++ b/metadata.artists.yoyo.pl/resources/language/English/strings.xml
@@ -3,5 +3,6 @@
<string id="30000">Powered by
MusicBrainz-Last.fm-Allmusic-htbackdrops</string>
<string id="30002">Language</string>
<string id="30003">Grab artist thumbs from Allmusic.com</string>
+ <string id="30004">Show info about the availability relationship to
Allmusic</string>
<string id="30006">Search by mbid on last.fm</string>
</strings>
diff --git a/metadata.artists.yoyo.pl/resources/settings.xml
b/metadata.artists.yoyo.pl/resources/settings.xml
index 5cc4f6d..3f9357a 100644
--- a/metadata.artists.yoyo.pl/resources/settings.xml
+++ b/metadata.artists.yoyo.pl/resources/settings.xml
@@ -3,8 +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="false"/>
- <setting label="30006" type="bool" id="mbid" default="false"/>
+ <setting label="30004" type="bool" id="relationships" default="false"/>
<setting label="" type="lsep"/>
<setting label="[COLOR=FFe2ff43] pozdr. smuto[/COLOR]" type="lsep"/>
</settings>
diff --git a/metadata.artists.yoyo.pl/yoyo.xml
b/metadata.artists.yoyo.pl/yoyo.xml
index 13b5b13..bb10069 100644
--- a/metadata.artists.yoyo.pl/yoyo.xml
+++ b/metadata.artists.yoyo.pl/yoyo.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
-<scraper framework="1.1" date="2010-09-28">
+<scraper framework="1.1" date="2012-03-08">
<NfoUrl dest="3">
- <RegExp input="$$1"
output="<url>http://musicbrainz.org/ws/1/release-group/?type=xml&artistid=\1&releasetypes=Official</url>";
dest="3">
+ <RegExp input="$$1"
output="<url>http://musicbrainz.org/ws/2/artist/\1?inc=url-rels+release-groups</url>";
dest="3">
<expression>http://musicbrainz.org/artist/(.+?).html</expression>
</RegExp>
</NfoUrl>
<CreateArtistSearchUrl dest="3">
- <RegExp input="$$1"
output="<url>http://musicbrainz.org/ws/1/artist/?type=xml&name=\1</url>";
dest="3">
+ <RegExp input="$$1"
output="<url>http://search.musicbrainz.org/ws/2/artist/?fmt=json&query=artist:"\1"</url>";
dest="3">
<expression />
</RegExp>
</CreateArtistSearchUrl>
<GetArtistSearchResults dest="8">
<RegExp input="$$5" output="<results>\1</results>"
dest="8">
- <RegExp input="$$1"
output="<entity><title>\4\5\6</title><genre>\1</genre><year>\7</year><url>http://musicbrainz.org/ws/1/release-group/?type=xml&artistid=\2&releasetypes=Official</url></entity>";
dest="5+">
- <expression repeat="yes">type="([^"]*)"
id="([^"]*)[^<]*(<name>([^<]*)</name>[^>]*>[^>]*>[^<]*</artist|<name>([^<]*)</name>[^>]*>[^>]*>[^<]*<life|<name>([^<]*)</name>[^>]*>[^>]*>[^<]*<disambiguation>([^<]*)</disambiguation>)</expression>
+ <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>
<expression noclean="1" />
</RegExp>
@@ -21,37 +21,40 @@
<GetArtistDetails dest="3">
<RegExp input="$$5" output="<?xml version="1.0"
encoding="utf-8"
standalone="yes"?><details>\1</details>" dest="3">
<RegExp input="$$1"
output="<name>\1</name>" dest="5">
- <expression
noclean="1"><name>([^<]*)</name></expression>
- </RegExp>
- <RegExp input="$$1" output="\1" dest="7">
- <expression fixchars="1" encode="1"
noclean="1"><name>([^<]*)</name></expression>
- </RegExp>
+ <expression fixchars="1"
noclean="1"><name>([^<]*)</name></expression>
+ </RegExp>
<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 conditional="mbid" input="$$1" output="<url
function="GetBiography">http://ws.audioscrobbler.com/2.0/?method=artist.getinfo&amp;mbid=\1&amp;lang=$INFO[language]&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url>";
dest="5+">
- <expression><artist id="([^"]*)</expression>
- </RegExp>
- <RegExp conditional="!mbid" input="$$7" output="<url
function="GetBiography">http://ws.audioscrobbler.com/2.0/?method=artist.getinfo&amp;artist=\1&amp;lang=$INFO[language]&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url>";
dest="5+">
- <expression />
+ <RegExp input="$$1" output="\2xbmc\1" dest="6">
+ <expression fixchars="1,2" encode="1,2"
noclean="1,2"><name>([^<]+).*?<title>([^<]+)</expression>
</RegExp>
- <RegExp input="$$7" output="<chain
function="GetHTBFanart">\1</chain>" dest="5+">
- <expression/>
+ <RegExp input="$$10" output="\1" dest="5+">
+ <RegExp input="$$6" output="<url
function="ArtistUTFtoASCII">http://www.remove-pl.yoyo.pl/smu4.php?text=$$6&dot=$$6</url>";
dest="10">
+ <expression />
+ </RegExp>
+ <RegExp conditional="relationships" input="$$6"
output="<style>!! !! No Relationships MusicBrainz-Allmusic !!
MusicBrainz-Allmusic !!</style><url
function="ArtistUTFtoASCII">http://www.remove-pl.yoyo.pl/smu4.php?text=$$6&dot=$$6</url>";
dest="10">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1" output="<url
function="ParseAMGArtist">http://www.allmusic.com/artist/p\1/</url>";
dest="10">
+
<expression>allmusic.com/artist/p([0-9]+)</expression>
+ </RegExp>
+ <expression noclean="1"/>
</RegExp>
- <RegExp conditional="!allmusicartistthumbs" input="$$7"
output="<chain
function="GetLastFMArtistThumbsByName">\1</chain>" dest="5+">
- <expression />
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression
noclean="1"><artist.*?id="([^"]+)</expression>
</RegExp>
- <RegExp input="$$7" output="<url
function="ThumbsAsFanart">http://ws.audioscrobbler.com/2.0/?method=artist.getimages&amp;artist=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url>";
dest="5+">
- <expression />
+ <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="$$1" output="\1\3xbmc\2\4" dest="6">
- <expression fixchars="1,2,3,4" encode="1,2,3,4"
noclean="1,2,3,4">type="Album".*?<title>(.*?)</title>.*?<name>(.*?)</name>|type="Compilation".*?<title>(.*?)</title>.*?<name>(.*?)</name></expression>
+ <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="$$6" output="<url
function="ArtistUTFtoASCII">http://www.remove-pl.yoyo.pl/smu4.php?text=$$6&dot=$$6</url>";
dest="5+">
+ <RegExp input="" output="<chain
function="GetLastFMArtistThumbsByID">$$7</chain>" dest="5+">
<expression />
</RegExp>
- <RegExp input="$$7" output="<url
function="GetGenres">http://ws.audioscrobbler.com/2.0/?method=artist.gettoptags&amp;artist=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url>";
dest="5+">
- <expression />
+ <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>
<expression noclean="1" />
</RegExp>
@@ -109,6 +112,48 @@
<expression noclean="1" />
</RegExp>
</AMGArtistSearchResults>
+ <FirstTryFanart dest="5">
+ <RegExp input="$$4" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression noclean="1"><music
id="([^"]+)</expression>
+ </RegExp>
+ <RegExp input="" output="<url
function="SecondTryFanart" post="yes"
cache="htb-images-$$7.xml">http://htbackdrops.com/api/7681a907c805e0670330c694e788e8e8/searchXML?mbid=$$7&aid=1</url>";
dest="4">
+ <expression />
+ </RegExp>
+ <RegExp input="$$11" output="<url
function="GetFanartTV"
cache="ftv-images-$$7.xml">http://fanart.tv/api/music.php?id=$$7&type=background</url>";
dest="4">
+ <RegExp input="$$1" output="\1" dest="11">
+ <expression
noclean="1"><background>(.*?)</background></expression>
+ </RegExp>
+ <expression>(.+)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </FirstTryFanart>
+ <SecondTryFanart dest="5">
+ <RegExp input="$$4" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression
noclean="1"><mbid>([^<]+)</expression>
+ </RegExp>
+ <RegExp input="" output="<url
function="ThumbsAsFanart">http://ws.audioscrobbler.com/2.0/?method=artist.getimages&amp;mbid=$$7&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url>";
dest="4">
+ <expression />
+ </RegExp>
+ <RegExp input="$$11" output="<url
function="ParseHTBFanart" post="yes"
cache="htb-images-$$7.xml">http://htbackdrops.com/api/7681a907c805e0670330c694e788e8e8/searchXML?mbid=$$7&aid=1</url>";
dest="4">
+ <RegExp input="$$1" output="\1" dest="11">
+ <expression
noclean="1"><image>(.*?)</image></expression>
+ </RegExp>
+ <expression>(.+)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </SecondTryFanart>
+ <GetFanartTV dest="5">
+ <RegExp input="$$4"
output="<details><fanart>\1</fanart></details>"
dest="5">
+ <RegExp input="$$1"
output="<thumb>\1</thumb>" dest="4">
+ <expression repeat="yes"
noclean="1"><background>(.*?)</background></expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GetFanartTV>
<ThumbsAsFanart dest="5">
<RegExp input="$$4"
output="<details><fanart>\1</fanart></details>"
dest="5">
<RegExp input="$$1" output="<thumb
preview="\2">\1</thumb>" dest="4">
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=e8e151099fdfb018fc4a9712ea631c62ac8c32ab
commit e8e151099fdfb018fc4a9712ea631c62ac8c32ab
Author: olympia <[email protected]>
Date: Fri Mar 9 21:38:56 2012 +0100
[metadata.albums.merlin.pl] updated to version 1.1.0
diff --git a/metadata.albums.merlin.pl/addon.xml
b/metadata.albums.merlin.pl/addon.xml
index a42fb51..3a6ac0f 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.0.7"
+ version="1.1.0"
provider-name="smuto">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.albums.merlin.pl/changelog.txt
b/metadata.albums.merlin.pl/changelog.txt
index 111450e..bdbd187 100644
--- a/metadata.albums.merlin.pl/changelog.txt
+++ b/metadata.albums.merlin.pl/changelog.txt
@@ -1,3 +1,5 @@
+[B]1.1.0[/B]
+- MusicBrainz - version 2 of XML web service
[B]1.0.4[/B]
- added thumb from amazon
[B]1.0.3[/B]
diff --git a/metadata.albums.merlin.pl/merlin.xml
b/metadata.albums.merlin.pl/merlin.xml
index 93ed940..119a482 100644
--- a/metadata.albums.merlin.pl/merlin.xml
+++ b/metadata.albums.merlin.pl/merlin.xml
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
-<scraper framework="1.1" date="2010-10-27">
+<scraper framework="1.1" date="2012-03-08">
<NfoUrl dest="3">
- <RegExp input="$$1"
output="<url>http://musicbrainz.org/ws/1/release/\1?type=xml&inc=artist+release-events</url>";
dest="3">
-
<expression>http://musicbrainz.org/release/(.+?).html</expression>
+ <RegExp input="$$1"
output="<url>http://musicbrainz.org/ws/2/release-group/\1?inc=url-rels+artist-credits</url>";
dest="3">
+
<expression>http://musicbrainz.org/release-group/(.+?).html</expression>
</RegExp>
</NfoUrl>
<CreateAlbumSearchUrl dest="3">
- <RegExp input="$$1"
output="<url>http://musicbrainz.org/ws/1/release/?type=xml&title=\1&artist=$$2</url>";
dest="3">
+ <RegExp input="$$1"
output="<url>http://search.musicbrainz.org/ws/2/release-group/?fmt=json&query=release:"\1"%20AND%20artist:"$$2"</url>";
dest="3">
<expression />
</RegExp>
</CreateAlbumSearchUrl>
<GetAlbumSearchResults dest="8">
<RegExp input="$$5" output="<results>\1</results>"
dest="8">
- <RegExp input="$$1"
output="<entity><artist>\3</artist><title>\2</title><year>\4</year><url>http://musicbrainz.org/ws/1/release/\1?type=xml&inc=artist+release-events</url></entity>";
dest="5+">
- <expression repeat="yes"><release
type.*?id="([^"]*).*?<title>([^<]*)</title>.*?<name>([^<]*)</name>.*?date="([0-9]+)</expression>
+ <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>
</RegExp>
<expression noclean="1" />
</RegExp>
</GetAlbumSearchResults>
- <GetAlbumDetails dest="3">
+ <GetAlbumDetails clearbuffers="no" dest="3">
<RegExp input="$$5" output="<details>\1</details>"
dest="3">
<RegExp input="$$1"
output="<artist>\1</artist>" dest="5">
<expression
noclean="1"><name>(.*?)</name></expression>
@@ -26,6 +26,9 @@
<RegExp input="$$1"
output="<title>\1</title>" dest="5+">
<expression
noclean="1"><title>(.*?)</title></expression>
</RegExp>
+ <RegExp input="$$1" output="\1" dest="20">
+
<expression>allmusic.com/album/r([0-9]+)</expression>
+ </RegExp>
<RegExp input="$$1" output="\1" dest="7">
<expression
noclean="1"><title>(.*?)</title></expression>
</RegExp>
@@ -43,7 +46,7 @@
</RegExp>
<RegExp input="$$18" output="\1" dest="8">
<RegExp input="$$1" output="\1" dest="18">
- <expression>event
date="([0-9]+)</expression>
+
<expression><first-release-date>([0-9]+)</expression>
</RegExp>
<expression>(.+)</expression>
</RegExp>
@@ -56,7 +59,7 @@
<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="<url
function="GetMBTracks">http://musicbrainz.org/release/\1.html</url>";
dest="5+">
+ <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>
</RegExp>
<expression noclean="1" />
@@ -74,17 +77,23 @@
<expression noclean="1"
encode="1">(.*?)xbmcVarious Artistsxbmc([0-9]+)</expression>
</RegExp>
<RegExp input="$$8" output="<url
function="MerlinLink">http://merlin.pl/xbmc/browse/search/4,,1.html?phrase=&amp;place=4+simple&amp;carrier=3&amp;category=&amp;title=&amp;person=\1&amp;firm=&amp;date=\2&amp;isbn=&amp;sort=tytul&amp;x=40&amp;y=12</url>";
dest="2">
- <expression
noclean="1">10\+000\+Hz\+Legendxbmc(.*?)xbmc([0-9]+)</expression>
+ <expression noclean="1">10 000 Hz
Legendxbmc(.*?)xbmc([0-9]+)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
</AlbumUTFtoASCII>
<MerlinLinkSmu clearbuffers="no" dest="5">
<RegExp input="$$7" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1" output="$$18" dest="7+">
+ <RegExp input="$$1" output="$$18" dest="7">
<RegExp input="$$8" output="<url
function="AMGAlbumSearchResults">http://www.allmusic.com/search/album/\1</url>";
dest="18">
<expression noclean="1"
encode="1">(.*?)xbmc(.*?)xbmc([0-9]+)</expression>
</RegExp>
+ <RegExp conditional="relationships" input="$$8"
output="<style>!! No Relationships MusicBrainz-Allmusic
!!</style><url
function="AMGAlbumSearchResults">http://www.allmusic.com/search/album/\1</url>";
dest="18">
+ <expression noclean="1"
encode="1">(.*?)xbmc(.*?)xbmc([0-9]+)</expression>
+ </RegExp>
+ <RegExp input="$$20" output="<url
function="ParseAMGAlbum">http://www.allmusic.com/album/r\1</url>";
dest="18">
+ <expression>(.+)</expression>
+ </RegExp>
<expression>Liczba
towar[^f]+f="([^"]+)</expression>
</RegExp>
<RegExp input="$$1" output="<url
function="GetMerlinReview">http://merlin.pl\1</url>";
dest="7+">
@@ -101,8 +110,17 @@
</MerlinLinkSmu>
<MerlinLink clearbuffers="no" dest="5">
<RegExp input="$$4" output="<details>\1</details>"
dest="5">
- <RegExp input="$$8" output="<url
function="AMGAlbumSearchResults">http://www.allmusic.com/search/album/\1</url>";
dest="4+">
- <expression noclean="1"
encode="1">(.*?)xbmc(.*?)xbmc([0-9]+)</expression>
+ <RegExp input="$$1" output="$$18" dest="4+">
+ <RegExp input="$$8" output="<url
function="AMGAlbumSearchResults">http://www.allmusic.com/search/album/\1</url>";
dest="18">
+ <expression noclean="1"
encode="1">(.*?)xbmc(.*?)xbmc([0-9]+)</expression>
+ </RegExp>
+ <RegExp conditional="relationships" input="$$8"
output="<style>!! No Relationships MusicBrainz-Allmusic
!!</style><url
function="AMGAlbumSearchResults">http://www.allmusic.com/search/album/\1</url>";
dest="18">
+ <expression noclean="1"
encode="1">(.*?)xbmc(.*?)xbmc([0-9]+)</expression>
+ </RegExp>
+ <RegExp input="$$20" output="<url
function="ParseAMGAlbum">http://www.allmusic.com/album/r\1</url>";
dest="18">
+ <expression>(.+)</expression>
+ </RegExp>
+ <expression noclean="1" />
</RegExp>
<RegExp input="$$9" output="\1_\2" dest="6">
<RegExp input="$$8" output="-\1" dest="9">
@@ -110,21 +128,38 @@
</RegExp>
<expression>\-(.*?)xbmc(.*?)xbmc([0-9]+)</expression>
</RegExp>
+ <RegExp input="$$1" output="\1" dest="17">
+ <expression noclean="1">Wyniki wyszukiwania -
(.*?)Opcje wyszukiwania:</expression>
+ </RegExp>
<RegExp input="$$12" output="\1" dest="4+">
- <RegExp input="$$1" output="<url
function="GetMerlinReview">http://merlin.pl\1</url>";
dest="12">
+ <RegExp input="$$17" output="<url
function="GetMerlinReview">http://merlin.pl\1</url>";
dest="12">
<expression>Liczba
towar[^f]+f="([^"]+)</expression>
</RegExp>
<RegExp input="$$13" output="<url
function="GetMerlinReview">http://merlin.pl/\1</url>";
dest="12">
- <RegExp input="$$1" output="\1"
dest="13">
- <expression
noclean="1">($$6[^"]+)</expression>
+ <RegExp input="$$17" output="\1"
dest="13">
+ <expression
noclean="1">($$6/browse/product/[^"]+)</expression>
</RegExp>
<expression>(.+)</expression>
</RegExp>
+ <RegExp input="$$1" output="$$19" dest="12">
+ <RegExp input="$$8" output="<url
function="GoogleLink">http://www.google.com/search?q=\1+\2+site:merlin.pl</url>";
dest="19">
+ <expression noclean="1,2"
encode="1,2">(.*?)xbmc(.*?)xbmc([0-9]+)</expression>
+ </RegExp>
+ <expression>Wyniki
wyszukiwania.*?class="wyniki".*?Nie
znaleziono.*?<strong>(.*?)</strong></expression>
+ </RegExp>
<expression noclean="1" />
</RegExp>
<expression noclean="1" />
</RegExp>
</MerlinLink>
+ <GoogleLink dest="5">
+ <RegExp input="$$4" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1" output="<url
function="GetMerlinReview">http://merlin.pl/\1.html</url>";
dest="4">
+ <expression
noclean="1">(/[^//]+/browse/product/[^"]+).html</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GoogleLink>
<AMGAlbumSearchResults dest="5">
<RegExp input="$$11" output="<details>\1</details>"
dest="5">
<RegExp input="$$8" output="\3" dest="12">
@@ -148,9 +183,6 @@
</RegExp>
<expression>(.+)</expression>
</RegExp>
- <RegExp input=""
output="<title>$$14</title>" dest="11+">
- <expression noclean="1" />
- </RegExp>
<expression noclean="1" />
</RegExp>
</AMGAlbumSearchResults>
@@ -191,11 +223,11 @@
</GetMerlinReview>
<GetMBTracks dest="5">
<RegExp input="$$4" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1"
output="<track><position>\1</position><title>\2</title><duration>\3</duration></track>"
dest="4">
- <expression repeat="yes"
noclean="1,2,3">class="no">([0-9]+)<.*?"">(.*?)</a>.*?length">&nbsp;(.*?)<</expression>
+ <RegExp input="$$1"
output="<track><position>\1</position><title>\2</title></track>"
dest="4">
+ <expression repeat="yes"
noclean="1,2,3"><track><position>([^<]+).+?<title>([^<]+)</expression>
</RegExp>
<RegExp input="$$1"
output="<thumb>http://ec1.images-amazon.com/images/P/\1.jpg</thumb>";
dest="4+">
- <expression
noclean="1">asin=([^"]+)</expression>
+ <expression
noclean="1"><asin>([^<]+)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
diff --git a/metadata.albums.merlin.pl/resources/language/English/strings.xml
b/metadata.albums.merlin.pl/resources/language/English/strings.xml
index 3314188..6da4ac5 100644
--- a/metadata.albums.merlin.pl/resources/language/English/strings.xml
+++ b/metadata.albums.merlin.pl/resources/language/English/strings.xml
@@ -2,5 +2,6 @@
<strings>
<string id="30000">Powered by MusicBrainz-Merlin-Allmusic</string>
<string id="30002">Grab album thumbs from Allmusic.com</string>
+ <string id="30004">Show info about the availability relationship to
Allmusic</string>
<string id="30005">Search by artist & year on merlin.pl</string>
</strings>
diff --git a/metadata.albums.merlin.pl/resources/settings.xml
b/metadata.albums.merlin.pl/resources/settings.xml
index 65f6032..e54499a 100644
--- a/metadata.albums.merlin.pl/resources/settings.xml
+++ b/metadata.albums.merlin.pl/resources/settings.xml
@@ -3,7 +3,7 @@
<setting label="30000" type="lsep"/>
<setting type="sep"/>
<setting label="30002" type="bool" id="allmusicalbumthumbs"
default="true"/>
- <setting label="30005" type="bool" id="merlinartistonly" default="false"/>
+ <setting label="30004" type="bool" id="relationships" default="false"/>
<setting label="" type="lsep"/>
<setting label="[COLOR=FFe2ff43] pozdr. smuto[/COLOR]" type="lsep"/>
</settings>
-----------------------------------------------------------------------
Summary of changes:
metadata.albums.merlin.pl/addon.xml | 2 +-
metadata.albums.merlin.pl/changelog.txt | 2 +
metadata.albums.merlin.pl/merlin.xml | 76 +++++++++++-----
.../resources/language/English/strings.xml | 1 +
metadata.albums.merlin.pl/resources/settings.xml | 2 +-
metadata.artists.yoyo.pl/addon.xml | 2 +-
metadata.artists.yoyo.pl/changelog.txt | 2 +
.../resources/language/English/strings.xml | 1 +
metadata.artists.yoyo.pl/resources/settings.xml | 3 +-
metadata.artists.yoyo.pl/yoyo.xml | 97 ++++++++++++++-----
10 files changed, 135 insertions(+), 53 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
![http://ec1.images-amazon.com/images/P/\1.jpg</thumb>"](http://ec1.images-amazon.com/images/P/\1.jpg</thumb>"){kind=link}