The branch, dharma-pre has been updated
via 751ca7759bcfc4167ec2ab326f9f1f06a58cf014 (commit)
from 7a59b206d74e73095bddf7a364cf93aa51b9768d (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=751ca7759bcfc4167ec2ab326f9f1f06a58cf014
commit 751ca7759bcfc4167ec2ab326f9f1f06a58cf014
Author: olympia <[email protected]>
Date: Wed Oct 27 06:47:22 2010 +0200
[metadata.albums.merlin.pl] updated to version 1.0.7
diff --git a/metadata.albums.merlin.pl/addon.xml
b/metadata.albums.merlin.pl/addon.xml
index 30c69a0..a42fb51 100644
--- a/metadata.albums.merlin.pl/addon.xml
+++ b/metadata.albums.merlin.pl/addon.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.albums.merlin.pl"
name="Merlin.pl"
- version="1.0.6"
+ version="1.0.7"
provider-name="smuto">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
- <import addon="metadata.common.allmusic.com" version="1.0.3"/>
+ <import addon="metadata.common.allmusic.com" version="1.8.1"/>
</requires>
<extension point="xbmc.metadata.scraper.albums"
language="pl"
diff --git a/metadata.albums.merlin.pl/merlin.xml
b/metadata.albums.merlin.pl/merlin.xml
index 565ee4a..93ed940 100644
--- a/metadata.albums.merlin.pl/merlin.xml
+++ b/metadata.albums.merlin.pl/merlin.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<scraper framework="1.1" date="2010-10-04">
+<scraper framework="1.1" date="2010-10-27">
<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>
@@ -38,10 +38,19 @@
</RegExp>
<expression>(.+)</expression>
</RegExp>
- <RegExp input="$$1" output="$$7xbmc\1xbmc\2" dest="8">
- <expression
noclean="1"><name>(.*?)</name>.*?event date="([0-9]+)</expression>
+ <RegExp input="" output="2010" dest="8">
+ <expression noclean="1" />
</RegExp>
- <RegExp input="$$8" output="\1" dest="6">
+ <RegExp input="$$18" output="\1" dest="8">
+ <RegExp input="$$1" output="\1" dest="18">
+ <expression>event
date="([0-9]+)</expression>
+ </RegExp>
+ <expression>(.+)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="$$7xbmc\1xbmc$$8" dest="9">
+ <expression
noclean="1"><name>(.*?)</name></expression>
+ </RegExp>
+ <RegExp input="$$9" output="\1" dest="6">
<expression fixchars="1" encode="1"
noclean="1"/>
</RegExp>
<RegExp input="$$6" output="<url
function="AlbumUTFtoASCII">http://www.remove-pl.yoyo.pl/smu4.php?text=$$6&dot=$$6</url>";
dest="5+">
@@ -58,20 +67,14 @@
<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 input="$$8" 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"
encode="1,2">(.*?)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=\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 input="$$8" 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"
encode="1">(.*?)xbmcVarious Artistsxbmc([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 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>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -79,8 +82,8 @@
<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 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>
<expression>Liczba
towar[^f]+f="([^"]+)</expression>
</RegExp>
@@ -88,8 +91,8 @@
<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 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=\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,2"
encode="1,2">(.*?)xbmc(.*?)xbmc([0-9]+)</expression>
</RegExp>
<expression>Wyniki
wyszukiwania.*?class="wyniki".*?Nie
znaleziono.*?<strong>(.*?)</strong></expression>
</RegExp>
@@ -98,41 +101,56 @@
</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 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>
- <RegExp input="$$1" output="<url
function="GetMerlinReview">http://merlin.pl\1</url>";
dest="4+">
- <expression>Liczba
towar[^f]+f="([^"]+)</expression>
+ <RegExp input="$$9" output="\1_\2" dest="6">
+ <RegExp input="$$8" output="-\1" dest="9">
+ <expression repeat="yes">([^
]+)</expression>
+ </RegExp>
+
<expression>\-(.*?)xbmc(.*?)xbmc([0-9]+)</expression>
+ </RegExp>
+ <RegExp input="$$12" output="\1" dest="4+">
+ <RegExp input="$$1" 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>
+ <expression>(.+)</expression>
+ </RegExp>
+ <expression noclean="1" />
</RegExp>
<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">
+ <RegExp input="$$8" output="\3" dest="12">
<expression
noclean="1">(.*?)xbmc(.*?)xbmc([0-9]+)</expression>
</RegExp>
- <RegExp input="$$6" output="\5" dest="13">
+ <RegExp input="$$8" 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>
+ <expression noclean="1">([^ ]+)</expression>
</RegExp>
<RegExp input="$$13" output="" dest="14">
- <expression
noclean="1">Various\+Artis(.*?)</expression>
+ <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 input="$$1" output="<url
function="ParseAMGAlbum">http://www.allmusic.com/album/r\1</url>";
dest="11">
+ <expression
noclean="1">r([0-9]+)[^<]+</a></td>[^>]+>$$14</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="$$20" output="<url
function="ParseAMGAlbum">http://www.allmusic.com/album/r\1</url>";
dest="11">
<RegExp input="$$1" output="\1" dest="20">
- <expression
noclean="1,2">>$$12</.*?>$$14.*?sql=([0-9:a-z]*)">(.*?)<.</expression>
+ <expression
noclean="1,2">r([0-9]+)[^<]+</a></td>[^>]+>$$14[^>]+[^\/]+[^0-9]+$$12</expression>
</RegExp>
<expression>(.+)</expression>
</RegExp>
+ <RegExp input=""
output="<title>$$14</title>" dest="11+">
+ <expression noclean="1" />
+ </RegExp>
<expression noclean="1" />
</RegExp>
</AMGAlbumSearchResults>
-----------------------------------------------------------------------
Summary of changes:
metadata.albums.merlin.pl/addon.xml | 4 +-
metadata.albums.merlin.pl/merlin.xml | 88 ++++++++++++++++++++-------------
2 files changed, 55 insertions(+), 37 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
