The branch, dharma-pre has been updated
via 679d89cf7b9392df98b5929c30a7a2e99c0cb163 (commit)
via 247235155c5e40f26c2d05b4ae80bb41adf6eeb4 (commit)
from 44a52841726adb7693d0c6b29c718cf03b67c803 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=679d89cf7b9392df98b5929c30a7a2e99c0cb163
commit 679d89cf7b9392df98b5929c30a7a2e99c0cb163
Merge: 2472351 44a5284
Author: olympia <[email protected]>
Date: Thu Oct 7 22:12:26 2010 +0200
Merge branch 'dharma-pre' of
ssh://xbmc.git.sourceforge.net/gitroot/xbmc/scrapers into dharma-pre
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=247235155c5e40f26c2d05b4ae80bb41adf6eeb4
commit 247235155c5e40f26c2d05b4ae80bb41adf6eeb4
Author: olympia <[email protected]>
Date: Thu Oct 7 22:08:19 2010 +0200
Merge and update Merlin and yoyo scrapers
diff --git a/metadata.albums.merlin.pl/addon.xml
b/metadata.albums.merlin.pl/addon.xml
index d526320..30c69a0 100644
--- a/metadata.albums.merlin.pl/addon.xml
+++ b/metadata.albums.merlin.pl/addon.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.albums.merlin.pl"
name="Merlin.pl"
- version="1.0.5"
+ version="1.0.6"
provider-name="smuto">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
- <import addon="metadata.common.last.fm" version="1.0.1"/>
- <import addon="metadata.common.allmusic.com" version="1.0.0"/>
+ <import addon="metadata.common.allmusic.com" version="1.0.3"/>
</requires>
<extension point="xbmc.metadata.scraper.albums"
language="pl"
@@ -15,11 +14,13 @@
<summary lang="en">Merlin.pl Album scraper</summary>
<summary lang="hu">Merlin.pl album információk</summary>
<summary lang="kr">Merlin.pl ìì
ì¤í¬ëí¼</summary>
+ <summary lang="pl">Scraper albumów Merlin.pl</summary>
<summary lang="pt">Scraper de música Merlin.pl</summary>
- <description lang="en">Download music information from merlin.pl. Also
uses info from www.last.fm and www.allmusic.com</description>
- <description lang="kr">Merlin.pl ìì ìì
ì ë³´ ë¤ì´ë¡ë
(last.fm ê³¼ allmusic.com ì ë³´ ì´ì©)</description>
- <description lang="hu">Album információk letöltése a merlin.pl,
valamint a www.last.fm és a www.allmusic.com webhelyekrÅl</description>
- <description lang="pt">Descarregar informação de música de merlin.pl.
Também usa informação de www.last.fm e www.allmusic.com</description>
+ <description lang="en">Download music information from merlin.pl. Also
uses info from MusicBrainz and allmusic.com</description>
+ <description lang="kr">Merlin.pl ìì ìì
ì ë³´ ë¤ì´ë¡ë
(MusicBrainz ê³¼ allmusic.com ì ë³´ ì´ì©)</description>
+ <description lang="hu">Album információk letöltése a merlin.pl,
valamint a MusicBrainz és a allmusic.com webhelyekrÅl</description>
+ <description lang="pl">Pobieraj informacje o albumach. Wyszukiwanie i
pobranie listy utworów z MusicBrainz, opis i okÅdka z merlin.pl, generalne
info z allmusic.</description>
+ <description lang="pt">Descarregar informação de música de merlin.pl.
Também usa informação de MusicBrainz e allmusic.com</description>
<platform>all</platform>
</extension>
</addon>
diff --git a/metadata.albums.merlin.pl/merlin.xml
b/metadata.albums.merlin.pl/merlin.xml
index cd4d8ef..565ee4a 100644
--- a/metadata.albums.merlin.pl/merlin.xml
+++ b/metadata.albums.merlin.pl/merlin.xml
@@ -1,71 +1,185 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.1" date="2010-02-19">
+<?xml version="1.0" encoding="utf-8"?>
+<scraper framework="1.1" date="2010-10-04">
<NfoUrl dest="3">
- <RegExp input="$$1"
output="<url>http://www.\1</url>"; dest="3">
- <expression>(allmusic.com/cg/.*)</expression>
+ <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>
</NfoUrl>
<CreateAlbumSearchUrl dest="3">
- <RegExp input="$$1" output="<url
post="yes">http://www.allmusic.com/cg/amg.dll?P=amg&amp;SQL=\1&amp;OPT1=2</url>";
dest="3">
- <expression/>
+ <RegExp input="$$1"
output="<url>http://musicbrainz.org/ws/1/release/?type=xml&title=\1&artist=$$2</url>";
dest="3">
+ <expression />
</RegExp>
</CreateAlbumSearchUrl>
<GetAlbumSearchResults dest="8">
<RegExp input="$$5" output="<results>\1</results>"
dest="8">
-
- <RegExp input="$$1"
output="<entity><title>\1</title></entity>" dest="5">
- <expression repeat="yes"
noclean="1"><TITLE>allmusic[ (]+ ([^>]*) > Overview</expression>
+ <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>
- <RegExp input="$$1"
output="<entity><year>\1</year><artist>\2</artist><title>\4</title><url
cache="am-\2-\4-album.html">http://www.allmusic.com/cg/amg.dll?p=amg&amp;SQL=\3</url></entity>";
dest="5+">
- <expression repeat="yes"
noclean="1,2,3">>([0-9]+)</.*?>([a-zA-Z0-9].*?)<.*?sql=([0-9:a-z]*)">(.*?)<.</expression>
-
- </RegExp>
- <expression noclean="1"/>
+ <expression noclean="1" />
</RegExp>
</GetAlbumSearchResults>
<GetAlbumDetails dest="3">
<RegExp input="$$5" output="<details>\1</details>"
dest="3">
- <RegExp input="$$1" output="<url
cache="am-$$2-album.html"
function="ParseAMGAlbum">http://www.allmusic.com/cg/amg.dll?p=amg&amp;sql=\1</url>";
dest="5+">
- <expression
noclean="1">sql=([^"]*)">Overview</expression>
-
+ <RegExp input="$$1"
output="<artist>\1</artist>" dest="5">
+ <expression
noclean="1"><name>(.*?)</name></expression>
+ </RegExp>
+ <RegExp input="$$1"
output="<title>\1</title>" dest="5+">
+ <expression
noclean="1"><title>(.*?)</title></expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression
noclean="1"><title>(.*?)</title></expression>
+ </RegExp>
+ <RegExp input="$$7" output="\1" dest="7">
+ <expression noclean="1">([^\(]+)</expression>
</RegExp>
- <RegExp input="$$1" conditional="!merlin"
output="<url cache="am-$$2-album.html"
function="GetAMGReview">http://www.allmusic.com/cg/amg.dll?p=amg&amp;sql=\1</url>";
dest="5+">
- <expression
noclean="1">sql=([^"]*)">Review</expression>
+ <RegExp input="$$19" output="\1" dest="7">
+ <RegExp input="$$7" output="\1 \2" dest="19">
+ <expression>(.*?)The (.+)</expression>
+ </RegExp>
+ <expression>(.+)</expression>
</RegExp>
- <RegExp input="$$1" conditional="merlin"
output="<url
function="MerlinLink">http://merlin.pl/xbmc/browse/search/4,,1.html?phrase=&amp;place=4+simple&amp;carrier=3&amp;offer=O&amp;category=&amp;title=\1&amp;person=\2&amp;firm=&amp;date=&amp;isbn=&amp;sort=rank&amp;x=40&amp;y=12</url>";
dest="5+">
- <expression trim="1,2" encode="1,2"><span
class="title">[ ]*([^<]*)</span>.*<a
href="[^"]+" class="subtitle">[
]*([^<]*)</a></expression>
-
+ <RegExp input="$$1" output="$$7xbmc\1xbmc\2" dest="8">
+ <expression
noclean="1"><name>(.*?)</name>.*?event date="([0-9]+)</expression>
</RegExp>
- <RegExp input="$$1" conditional="lastfmalbumthumbs"
output="<chain
function="GetLastFMAlbumThumbs">\1::\2</chain>" dest="5+">
- <expression trim="1,2" encode="1,2"><span
class="title">[ ]*([^<]*)</span>.*<a
href="[^"]+" class="subtitle">[
]*([^<]*)</a></expression>
-
+ <RegExp input="$$8" output="\1" dest="6">
+ <expression fixchars="1" encode="1"
noclean="1"/>
</RegExp>
- <expression noclean="1"/>
+ <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+">
+ <expression noclean="1">release
id="([^"]+)</expression>
+ </RegExp>
+ <expression noclean="1" />
</RegExp>
</GetAlbumDetails>
- <MerlinLink dest="5">
+ <AlbumUTFtoASCII clearbuffers="no" dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1" output="<url
function="GetMerlinReview">http://merlin.pl\1</url>";
dest="2">
- <expression>Liczba
towar[^f]+f="([^"]+)</expression>
+ <RegExp input="$$1" output="\1" dest="8">
+ <expression
noclean="1"><textarea>(.*?)</textarea></expression>
+ </RegExp>
+ <RegExp input="$$9" output="\1" dest="6">
+ <RegExp input="$$8" output="+\1" dest="9">
+ <expression repeat="yes">([^
]+)</expression>
+ </RegExp>
+ <expression>\+(.*)</expression>
+ </RegExp>
+ <RegExp conditional="!merlinartistonly" input="$$6"
output="<url
function="MerlinLinkSmu">http://merlin.pl/xbmc/browse/search/4,,1.html?phrase=&amp;place=4+simple&amp;carrier=3&amp;category=&amp;title=\1&amp;person=\2&amp;firm=&amp;date=\3&amp;isbn=&amp;sort=nowosc&amp;x=40&amp;y=12</url>";
dest="2">
+ <expression
noclean="1">(.*?)xbmc(.*?)xbmc([0-9]+)</expression>
+ </RegExp>
+ <RegExp conditional="!merlinartistonly" input="$$6"
output="<url
function="MerlinLinkSmu">http://merlin.pl/xbmc/browse/search/4,,1.html?phrase=&amp;place=4+simple&amp;carrier=3&amp;category=&amp;title=\1&amp;person=&amp;firm=&amp;date=\2&amp;isbn=&amp;sort=nowosc&amp;x=40&amp;y=12</url>";
dest="2">
+ <expression
noclean="1">(.*?)xbmcVarious\+Artistsxbmc([0-9]+)</expression>
+ </RegExp>
+ <RegExp conditional="merlinartistonly" input="$$6"
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=\2&amp;firm=&amp;date=\3&amp;isbn=&amp;sort=tytul&amp;x=40&amp;y=12</url>";
dest="2">
+ <expression
noclean="1">(.*?)xbmc(.*?)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="$$6" output="<url
function="AMGAlbumSearchResults"
post="yes">http://www.allmusic.com/cg/amg.dll?P=amg&amp;SQL=\1&amp;OPT1=2</url>";
dest="18">
+ <expression
noclean="1">(.*?)xbmc(.*?)xbmc([0-9]+)</expression>
+ </RegExp>
+ <expression>Liczba
towar[^f]+f="([^"]+)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="<url
function="GetMerlinReview">http://merlin.pl\1</url>";
dest="7+">
+ <expression>Liczba
towar[^f]+f="([^"]+)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="$$19" dest="7+">
+ <RegExp input="$$6" 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=\1&amp;person=\2&amp;firm=&amp;date=&amp;isbn=&amp;sort=tytul&amp;x=40&amp;y=12</url>";
dest="19">
+ <expression
noclean="1">(.*?)xbmc(.*?)xbmc([0-9]+)</expression>
+ </RegExp>
+ <expression>Wyniki
wyszukiwania.*?class="wyniki".*?Nie
znaleziono.*?<strong>(.*?)</strong></expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </MerlinLinkSmu>
+ <MerlinLink clearbuffers="no" dest="5">
+ <RegExp input="$$4" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$6" output="<url
function="AMGAlbumSearchResults"
post="yes">http://www.allmusic.com/cg/amg.dll?P=amg&amp;SQL=\1&amp;OPT1=2</url>";
dest="4+">
+ <expression
noclean="1">(.*?)xbmc(.*?)xbmc([0-9]+)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="<url
function="GetMerlinReview">http://merlin.pl\1</url>";
dest="4+">
+ <expression>Liczba
towar[^f]+f="([^"]+)</expression>
</RegExp>
-
- <expression noclean="1"/>
+ <expression noclean="1" />
</RegExp>
</MerlinLink>
+ <AMGAlbumSearchResults dest="5">
+ <RegExp input="$$11" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1" output="<url
function="ParseAMGAlbum">http://www.allmusic.com/cg/amg.dll?p=amg&amp;SQL=\1</url>";
dest="11">
+ <expression
noclean="1">sql=([^"]*)">Overview</expression>
+ </RegExp>
+ <RegExp input="$$6" output="\3" dest="12">
+ <expression
noclean="1">(.*?)xbmc(.*?)xbmc([0-9]+)</expression>
+ </RegExp>
+ <RegExp input="$$6" output="\5" dest="13">
+ <expression
noclean="1">(.*?)xbmc(.*?)xbmc([0-9]+)xbmc(.*?)xbmc(.*?)xbmc</expression>
+ </RegExp>
+ <RegExp input="$$13" output="\1" dest="14">
+ <expression noclean="1">([^\+]+)</expression>
+ </RegExp>
+ <RegExp input="$$13" output="" dest="14">
+ <expression
noclean="1">Various\+Artis(.*?)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="<url
function="ParseAMGAlbum">http://www.allmusic.com/cg/amg.dll?p=amg&amp;SQL=\1</url>";
dest="11+">
+ <expression
noclean="1,2">word;">$$14.*?sql=([0-9:a-z]*)">(.*?)<.</expression>
+ </RegExp>
+ <RegExp input="$$20" output="<url
function="ParseAMGAlbum">http://www.allmusic.com/cg/amg.dll?p=amg&amp;SQL=\1</url>";
dest="11">
+ <RegExp input="$$1" output="\1" dest="20">
+ <expression
noclean="1,2">>$$12</.*?>$$14.*?sql=([0-9:a-z]*)">(.*?)<.</expression>
+ </RegExp>
+ <expression>(.+)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </AMGAlbumSearchResults>
<GetMerlinReview dest="5">
- <RegExp input="$$2" output="<?xml version="1.0"
encoding="iso-8859-2"
standalone="yes"?><details><review>\1</review></details>"
dest="5">
- <RegExp input="$$1" output="\1" dest="2">
-
<expression>class="productDesc">(.*?)</div></expression>
-
+ <RegExp input="$$10" output="<?xml version="1.0"
encoding="iso-8859-2"
standalone="yes"?><details>\1</details>" dest="5">
+ <RegExp input="$$1" output="\1" dest="9">
+ <expression
noclean="1">prodHead(.+?)prodTitle</expression>
+ </RegExp>
+ <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="<label>\1</label>" dest="10+">
+ <expression noclean="1">dt>Firma
fonograficzna:[^=]+[^>]+> ([^<]*)<</expression>
</RegExp>
- <RegExp input="$$1" output="\1" dest="2+">
-
<expression>piorka_merlina.*?contents">([^<]*)<</expression>
+ <RegExp input="$$16" output="\1" dest="15">
+ <RegExp input="$$1" output="\1 " dest="16">
+
<expression>class="productDesc">(.*?)</div></expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1xbmc" dest="17">
+
<expression>piorka_merlina.*?contents">([^<]*)<</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1xbmc" dest="17+">
+
<expression>contents">([^<]*)<[^=]+="reviewHelpful</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1xbmc" dest="17+">
+
<expression>contents">([^<]*)<</expression>
+ </RegExp>
+ <RegExp input="$$17" output="\1" dest="16+">
+ <expression>(.*?)xbmc</expression>
+ </RegExp>
+ <expression repeat="yes"
noclean="1">([^\n]+)\n?</expression>
</RegExp>
- <RegExp input="$$1" output="\1" dest="2+">
-
<expression>contents">([^<]*)<</expression>
-
+ <RegExp input="$$15"
output="<review>\1</review>" dest="10+">
+ <expression />
</RegExp>
- <expression noclean="1"/>
+ <expression noclean="1" />
</RegExp>
</GetMerlinReview>
-</scraper>
+ <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>
+ <RegExp input="$$1"
output="<thumb>http://ec1.images-amazon.com/images/P/\1.jpg</thumb>";
dest="4+">
+ <expression
noclean="1">asin=([^"]+)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GetMBTracks>
+</scraper>
\ No newline at end of file
diff --git a/metadata.albums.merlin.pl/resources/language/English/strings.xml
b/metadata.albums.merlin.pl/resources/language/English/strings.xml
index 26fd1c6..3314188 100644
--- a/metadata.albums.merlin.pl/resources/language/English/strings.xml
+++ b/metadata.albums.merlin.pl/resources/language/English/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<strings>
- <string id="30000">Biography from lastfm.pl, description from
merlin.pl</string>
- <string id="30001">Album covers from allmusic.com</string>
- <string id="30002">Album covers from last.fm</string>
+ <string id="30000">Powered by MusicBrainz-Merlin-Allmusic</string>
+ <string id="30002">Grab album thumbs from Allmusic.com</string>
+ <string id="30005">Search by artist & year on merlin.pl</string>
</strings>
diff --git a/metadata.albums.merlin.pl/resources/language/Hungarian/strings.xml
b/metadata.albums.merlin.pl/resources/language/Hungarian/strings.xml
index dac6b84..2f81bce 100644
--- a/metadata.albums.merlin.pl/resources/language/Hungarian/strings.xml
+++ b/metadata.albums.merlin.pl/resources/language/Hungarian/strings.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<strings>
- <string id="30000">Ãletrajz letöltése a lastfm.pl-rÅl, leÃrás a
merlin.pl-rÅl</string>
- <string id="30001">Album borÃtó az allmusic.com-ról</string>
- <string id="30002">Album borÃtó a last.fm-rÅl</string>
+ <string id="30000">A MusicBrainz-Merlin-Allmusic jóvoltából</string>
+ <string id="30002">Album bélyegképek letöltése az
Allmusic.com-ról</string>
+ <string id="30005">Keresés elÅadó & év alapján a
merlin.pl-en</string>
</strings>
diff --git a/metadata.albums.merlin.pl/resources/language/Polish/strings.xml
b/metadata.albums.merlin.pl/resources/language/Polish/strings.xml
index 46d6f74..d3d4603 100644
--- a/metadata.albums.merlin.pl/resources/language/Polish/strings.xml
+++ b/metadata.albums.merlin.pl/resources/language/Polish/strings.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<strings>
- <string id="30000">Biografia z Last.fm.pl, opis pÅyty z Merlin.pl</string>
- <string id="30001">OkÅadka albumu z Allmusic.com</string>
- <string id="30002">OkÅadka albumu z Last.fm</string>
+ <string id="30000">Powered by MusicBrainz-Merlin-Allmusic</string>
+ <string id="30002">OkÅadka z Allmusic.com</string>
+ <string id="30005">Szukaj tylko wedÅug nazwy artysty i roku
wydania</string>
</strings>
diff --git
a/metadata.albums.merlin.pl/resources/language/Portuguese/strings.xml
b/metadata.albums.merlin.pl/resources/language/Portuguese/strings.xml
index bce8d76..a52f37e 100644
--- a/metadata.albums.merlin.pl/resources/language/Portuguese/strings.xml
+++ b/metadata.albums.merlin.pl/resources/language/Portuguese/strings.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Portuguese strings.xml by hudo (hudokkow [AT] gmail [DOT] com) -->
<strings>
- <string id="30000">Biografia de lastfm.pl, descrição de
merlin.pl</string>
- <string id="30001">Capas de álbum de allmusic.com</string>
- <string id="30002">Capas de álbum de last.fm</string>
+ <string id="30000">Corre sobre MusicBrainz-Merlin-Allmusic</string>
+ <string id="30002">Descarregar miniaturas de álbuns de
Allmusic.com</string>
+ <string id="30005">Procurar por artista & ano em merlin.pl</string>
</strings>
diff --git a/metadata.albums.merlin.pl/resources/settings.xml
b/metadata.albums.merlin.pl/resources/settings.xml
index 73c53a6..65f6032 100644
--- a/metadata.albums.merlin.pl/resources/settings.xml
+++ b/metadata.albums.merlin.pl/resources/settings.xml
@@ -1,6 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<settings>
- <setting label="30000" type="bool" id="merlin" default="true"/>
- <setting label="30001" type="bool" id="allmusicalbumthumbs"
default="true"/>
- <setting label="30002" type="bool" id="lastfmalbumthumbs" default="false"/>
+ <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="" type="lsep"/>
+ <setting label="[COLOR=FFe2ff43] pozdr. smuto[/COLOR]" type="lsep"/>
</settings>
diff --git a/metadata.artists.yoyo.pl/addon.xml
b/metadata.artists.yoyo.pl/addon.xml
index aab578e..28831fa 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.pl"
- version="1.0.5"
+<addon id="metadata.artists.yoyo"
+ name="YoYo-MusicBrainz"
+ version="1.0.6"
provider-name="smuto">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
@@ -19,7 +19,7 @@
<summary lang="pt">Scraper de artistas YoYo</summary>
<description lang="en">MusicBrainz scraper. Also uses info from last.fm
and allmusic.com</description>
<description lang="hu">ElÅadó információk letöltése a MusicBrainz,
last.fm és az allmusic.com webhelyekrÅl</description>
- <description lang="pl">YoYo scraper - wyszukiwanie na bazie MusicBrainz,
biografia z last.fm, dyskografia z MusicBrainz, generalne info z allmusic,
fanart z htbackdrops (domyÅlnie) - w przeciwnym wypadku zdjÄcia z
lastfm</description>
+ <description lang="pl">YoYo scraper - wyszukiwanie na bazie MusicBrainz,
biografia z last.fm, dyskografia z MusicBrainz, generalne info z allmusic,
fanart z htbackdrops (jak sÄ
) - w przeciwnym wypadku zdjÄcia z
lastfm</description>
<description lang="pt">Scraper YoYo. Além de utilizar o MusicBrainz,
também conta com os recursos disponÃveis em last.fm e
allmusic.com.</description>
<platform>all</platform>
</extension>
diff --git a/metadata.artists.yoyo.pl/resources/language/English/strings.xml
b/metadata.artists.yoyo.pl/resources/language/English/strings.xml
index 96e61fc..988075a 100644
--- a/metadata.artists.yoyo.pl/resources/language/English/strings.xml
+++ b/metadata.artists.yoyo.pl/resources/language/English/strings.xml
@@ -4,8 +4,4 @@
<string id="30002">Language</string>
<string id="30003">Grab artist thumbs from Allmusic.com</string>
<string id="30006">Search by mbid on last.fm</string>
- <!-- Possible values for id="30009" -->
- <!-- ========================= -->
- <!-- en|de|es|fr|it|jp|pl|pt|ru|sv|tr|zh -->
- <string id="30009">en</string>
</strings>
diff --git a/metadata.artists.yoyo.pl/resources/language/Polish/strings.xml
b/metadata.artists.yoyo.pl/resources/language/Polish/strings.xml
index 36eac41..be917f1 100644
--- a/metadata.artists.yoyo.pl/resources/language/Polish/strings.xml
+++ b/metadata.artists.yoyo.pl/resources/language/Polish/strings.xml
@@ -4,5 +4,4 @@
<string id="30002">JÄzyk</string>
<string id="30003">Artysta - zdjÄcia z Allmusic.com</string>
<string id="30006">Last.fm - szukaj na bazie mbid</string>
- <string id="30009">pl</string>
</strings>
diff --git a/metadata.artists.yoyo.pl/resources/language/Portuguese/strings.xml
b/metadata.artists.yoyo.pl/resources/language/Portuguese/strings.xml
index 8e1503d..724985d 100644
--- a/metadata.artists.yoyo.pl/resources/language/Portuguese/strings.xml
+++ b/metadata.artists.yoyo.pl/resources/language/Portuguese/strings.xml
@@ -6,5 +6,4 @@
<string id="30002">Lingua</string>
<string id="30003">Descarregar miniaturas de artistas de
Allmusic.com</string>
<string id="30006">Porcurar por 'mbid' no site last.fm</string>
- <string id="30009">pt</string>
</strings>
diff --git a/metadata.artists.yoyo.pl/resources/settings.xml
b/metadata.artists.yoyo.pl/resources/settings.xml
index 1aa2f95..5cc4f6d 100644
--- a/metadata.artists.yoyo.pl/resources/settings.xml
+++ b/metadata.artists.yoyo.pl/resources/settings.xml
@@ -2,7 +2,7 @@
<settings>
<setting label="30000" type="lsep"/>
<setting type="sep"/>
- <setting label="30002" type="labelenum" lvalues="30009" id="language"
default=""/>
+ <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="" type="lsep"/>
diff --git a/metadata.artists.yoyo.pl/yoyo.xml
b/metadata.artists.yoyo.pl/yoyo.xml
index eac0133..cf5e1ca 100644
--- a/metadata.artists.yoyo.pl/yoyo.xml
+++ b/metadata.artists.yoyo.pl/yoyo.xml
@@ -19,42 +19,33 @@
</RegExp>
</GetArtistSearchResults>
<GetArtistDetails dest="3">
- <RegExp input="$$5" output="<details>\1</details>"
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>
<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="$$2" 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+">
+ <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>
- <RegExp input="$$2" output="<chain
function="GetHTBFanart">\1</chain>" dest="5+">
+ <RegExp input="$$7" output="<chain
function="GetHTBFanart">\1</chain>" dest="5+">
<expression/>
</RegExp>
- <RegExp conditional="!allmusicartistthumbs" input="$$2"
output="<chain
function="GetLastFMArtistThumbs">\1</chain>" dest="5+">
+ <RegExp conditional="!allmusicartistthumbs" input="$$7"
output="<chain
function="GetLastFMArtistThumbs">\1</chain>" dest="5+">
<expression />
</RegExp>
- <RegExp input="$$2" output="<url
function="ThumbsAsFanart">http://ws.audioscrobbler.com/2.0/?method=artist.getimages&amp;artist=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url>";
dest="5+">
+ <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>
- <RegExp input="$$1" output="\1\3xbmc\2\4" dest="8">
- <expression
noclean="1">type="Album".*?<title>(.*?)</title>.*?<name>(.*?)</name>|type="Compilation".*?<title>(.*?)</title>.*?<name>(.*?)</name></expression>
- </RegExp>
- <RegExp input="$$9" output="\1" dest="8">
- <RegExp input="$$8" output="\1 \2" dest="9">
-
<expression>(.*?)&amp;(.+)</expression>
- </RegExp>
- <expression>(.+)</expression>
- </RegExp>
- <RegExp input="$$9" output="\1" dest="6">
- <RegExp input="$$8" output="+\1" dest="9">
- <expression repeat="yes">([^
]+)</expression>
- </RegExp>
- <expression>\+(.*)</expression>
+ <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>
<RegExp input="$$6" output="<url
function="ArtistUTFtoASCII">http://www.remove-pl.yoyo.pl/smu4.php?text=$$6&dot=$$6</url>";
dest="5+">
<expression />
@@ -75,7 +66,7 @@
</GetBiography>
<ArtistUTFtoASCII clearbuffers="no" dest="5">
<RegExp input="$$1" output="<details><url
function="AMGArtistAlbumSearchResults"
post="yes">http://www.allmusic.com/cg/amg.dll?P=amg&amp;SQL=\1&amp;OPT1=2</url></details>";
dest="5">
- <expression
noclean="1"><textarea>(.*?)xbmc(.*?)</textarea></expression>
+ <expression encode="1"
noclean="1"><textarea>(.*?)xbmc(.*?)</textarea></expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="6">
<expression
noclean="1"><textarea>(.*?)</textarea></expression>
@@ -86,17 +77,8 @@
<RegExp input="$$1" output="<url
function="ParseAMGArtist">http://www.allmusic.com/cg/amg.dll?p=amg&amp;SQL=\1</url>";
dest="11">
<expression
noclean="1"><span>Artist</span>[^;]*[^>]*>[^>]*sql=([^"]*)"></expression>
</RegExp>
- <RegExp input="$$6" output="\2" dest="15">
- <expression
noclean="1">(.*?)xbmc(.*?)xbmc(.*?)xbmc(.+)</expression>
- </RegExp>
- <RegExp input="$$16" output="\1" dest="17">
- <RegExp input="$$15" output="+\1" dest="16">
- <expression repeat="yes">([^
]+)</expression>
- </RegExp>
- <expression>\+(.*)</expression>
- </RegExp>
- <RegExp input="$$6" output="<url
function="AMGArtistDetails"
post="yes">http://www.allmusic.com/cg/amg.dll?P=amg&amp;SQL=$$17&amp;OPT1=1</url>";
dest="11+">
- <expression
noclean="1">(.*?)xbmc(.*?)xbmc(.*?)xbmc(.+)</expression>
+ <RegExp input="$$6" output="<url
function="AMGArtistDetails"
post="yes">http://www.allmusic.com/cg/amg.dll?P=amg&amp;SQL=\2&amp;OPT1=1</url>";
dest="11+">
+ <expression encode="2"
noclean="2">(.*?)xbmc(.*?)xbmc(.*?)xbmc(.+)</expression>
</RegExp>
<RegExp input="$$6" output="\4" dest="13">
<expression
noclean="1">(.*?)xbmc(.*?)xbmc(.*?)xbmc(.+)</expression>
@@ -106,7 +88,7 @@
</RegExp>
<RegExp input="$$9" output="<url
function="AMGAlbumArtistDetails">http://www.allmusic.com/cg/amg.dll?p=amg&amp;SQL=\1</url>";
dest="11">
<RegExp input="$$1" output="\1" dest="9">
- <expression
noclean="1,2">word;">$$14.*?sql=([0-9:a-z]*)">(.*?)<.</expression>
+ <expression
noclean="1">word;">$$14.+?sql=([0-9:a-z]*)"</expression>
</RegExp>
<expression>(.+)</expression>
</RegExp>
-----------------------------------------------------------------------
Summary of changes:
.../LICENSE.txt | 0
metadata.albums.merlin.pl/addon.xml | 17 +-
.../changelog.txt | 1 -
metadata.albums.merlin.pl/merlin.xml | 198 +++++++++++++++----
.../resources/language/English/strings.xml | 6 +-
.../resources/language/Hungarian/strings.xml | 8 +-
.../resources/language/Polish/strings.xml | 8 +-
.../resources/language/Portuguese/strings.xml | 7 +-
metadata.albums.merlin.pl/resources/settings.xml | 11 +-
metadata.albums.yoyo.pl/addon.xml | 24 ---
metadata.albums.yoyo.pl/icon.png | Bin 41542 -> 0 bytes
.../resources/language/English/strings.xml | 6 -
.../resources/language/Hungarian/strings.xml | 6 -
.../resources/language/Polish/strings.xml | 6 -
.../resources/language/Portuguese/strings.xml | 7 -
metadata.albums.yoyo.pl/resources/settings.xml | 9 -
metadata.albums.yoyo.pl/yoyo.xml | 200 --------------------
metadata.artists.merlin.pl/addon.xml | 26 ---
metadata.artists.merlin.pl/icon.png | Bin 6203 -> 0 bytes
metadata.artists.merlin.pl/merlin.xml | 65 -------
.../resources/language/English/strings.xml | 8 -
.../resources/language/Hungarian/strings.xml | 8 -
.../resources/language/Polish/strings.xml | 8 -
.../resources/language/Portuguese/strings.xml | 8 -
metadata.artists.merlin.pl/resources/settings.xml | 8 -
metadata.artists.yoyo.pl/addon.xml | 8 +-
.../language/Chinese (Simple)/strings.xml | 4 -
.../resources/language/English/strings.xml | 4 -
.../resources/language/French/strings.xml | 4 -
.../resources/language/German/strings.xml | 4 -
.../resources/language/Italian/strings.xml | 4 -
.../resources/language/Japanese/strings.xml | 4 -
.../resources/language/Polish/strings.xml | 1 -
.../resources/language/Portuguese/strings.xml | 1 -
.../resources/language/Russian/strings.xml | 4 -
.../resources/language/Spanish/strings.xml | 4 -
.../resources/language/Swedish/strings.xml | 4 -
.../resources/language/Turkish/strings.xml | 4 -
metadata.artists.yoyo.pl/resources/settings.xml | 2 +-
metadata.artists.yoyo.pl/yoyo.xml | 46 ++---
40 files changed, 206 insertions(+), 537 deletions(-)
rename {metadata.albums.yoyo.pl => metadata.albums.merlin.pl}/LICENSE.txt
(100%)
rename {metadata.albums.yoyo.pl => metadata.albums.merlin.pl}/changelog.txt
(83%)
delete mode 100644 metadata.albums.yoyo.pl/addon.xml
delete mode 100644 metadata.albums.yoyo.pl/icon.png
delete mode 100644
metadata.albums.yoyo.pl/resources/language/English/strings.xml
delete mode 100644
metadata.albums.yoyo.pl/resources/language/Hungarian/strings.xml
delete mode 100644
metadata.albums.yoyo.pl/resources/language/Polish/strings.xml
delete mode 100644
metadata.albums.yoyo.pl/resources/language/Portuguese/strings.xml
delete mode 100644 metadata.albums.yoyo.pl/resources/settings.xml
delete mode 100644 metadata.albums.yoyo.pl/yoyo.xml
delete mode 100644 metadata.artists.merlin.pl/addon.xml
delete mode 100644 metadata.artists.merlin.pl/icon.png
delete mode 100644 metadata.artists.merlin.pl/merlin.xml
delete mode 100644
metadata.artists.merlin.pl/resources/language/English/strings.xml
delete mode 100644
metadata.artists.merlin.pl/resources/language/Hungarian/strings.xml
delete mode 100644
metadata.artists.merlin.pl/resources/language/Polish/strings.xml
delete mode 100644
metadata.artists.merlin.pl/resources/language/Portuguese/strings.xml
delete mode 100644 metadata.artists.merlin.pl/resources/settings.xml
delete mode 100644 metadata.artists.yoyo.pl/resources/language/Chinese
(Simple)/strings.xml
delete mode 100644
metadata.artists.yoyo.pl/resources/language/French/strings.xml
delete mode 100644
metadata.artists.yoyo.pl/resources/language/German/strings.xml
delete mode 100644
metadata.artists.yoyo.pl/resources/language/Italian/strings.xml
delete mode 100644
metadata.artists.yoyo.pl/resources/language/Japanese/strings.xml
delete mode 100644
metadata.artists.yoyo.pl/resources/language/Russian/strings.xml
delete mode 100644
metadata.artists.yoyo.pl/resources/language/Spanish/strings.xml
delete mode 100644
metadata.artists.yoyo.pl/resources/language/Swedish/strings.xml
delete mode 100644
metadata.artists.yoyo.pl/resources/language/Turkish/strings.xml
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
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}