[Xbmc-addons] Scrapers branch, eden, updated. f037a302a75782f41019e9e0527b2fe71dc2dfc3

[olympia]

The branch, eden has been updated
       via  f037a302a75782f41019e9e0527b2fe71dc2dfc3 (commit)
      from  2087d72a211bd3e24db0a262bc427a11df9ff463 (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=f037a302a75782f41019e9e0527b2fe71dc2dfc3

commit f037a302a75782f41019e9e0527b2fe71dc2dfc3
Author: olympia <olym...@xbmc.org>
Date:   Wed Mar 14 08:18:42 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="&lt;results&gt;\1&lt;/results&gt;" 
dest="8">
                        <RegExp input="$$1" 
output="&lt;entity&gt;&lt;artist&gt;\5&lt;/artist&gt;&lt;title&gt;\4&lt;/title&gt;&lt;url&gt;http://musicbrainz.org/ws/2/release-group/\3?inc=url-rels+artist-credits+releases&lt;/url&gt;&lt;/entity&gt;";
 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="&lt;entity&gt;&lt;artist&gt;\5&lt;/artist&gt;&lt;title&gt;\4&lt;/title&gt;&lt;url&gt;http://musicbrainz.org/ws/2/release-group/\3?inc=url-rels+artist-credits+releases&lt;/url&gt;&lt;/entity&gt;";
 dest="5+">
+                               
<expression>(score":"[^"]+","type":"([^"]+)|score":"[^"]+)","id":"([^"]+)","title":"([^"]+)[^\[]+[^,]+,"name":"([^"]+)</expression>
                        </RegExp>
                        <expression noclean="1" />
                </RegExp>
@@ -59,8 +62,11 @@
                        <RegExp input="$$6" output="&lt;url 
function=&quot;AlbumUTFtoASCII&quot;&gt;http://www.remove-pl.yoyo.pl/smu4.php?text=$$6&amp;dot=$$6&lt;/url&gt;";
 dest="5+">
                                <expression />
                        </RegExp>
+                       <RegExp input="$$1" output="\1" dest="7">
+                               <expression 
noclean="1">&lt;title&gt;(.*?)&lt;/title&gt;</expression>
+                       </RegExp>
                        <RegExp input="$$1" output="&lt;url 
function=&quot;GetMBTracks&quot;&gt;http://musicbrainz.org/ws/2/release/\1?inc=recordings&lt;/url&gt;";
 dest="5+">
-                               <expression noclean="1">release 
id="([^"]+)</expression>
+                               <expression noclean="1">release 
id="([^"]+)[^&lt;]+&lt;title&gt;$$7&lt;/title&gt;</expression>
                        </RegExp>
                        <expression noclean="1" />
                </RegExp>
@@ -194,6 +200,12 @@
                        <RegExp input="$$9" 
output="&lt;thumb&gt;http://merlin.pl/images,images_big\1&lt;/thumb&gt;"; 
dest="10">
                                <expression 
noclean="1">src="[^,]+,[^,]+([^"]+)</expression>
                        </RegExp>
+                       <RegExp input="$$1" output="\1" dest="9">
+                               <expression 
noclean="1">Kategorie:(.+?)&lt;/dd&gt;</expression>
+                       </RegExp>
+                       <RegExp input="$$9" 
output="&lt;genre&gt;\1&lt;/genre&gt;" dest="10+">
+                               <expression repeat="yes" trim="1" 
noclean="1">"&gt;([^&lt;]+)&lt;/a&gt;</expression>
+                       </RegExp>
                        <RegExp input="$$1" 
output="&lt;label&gt;\1&lt;/label&gt;" dest="10+">
                                <expression noclean="1">dt&gt;Firma 
fonograficzna:[^=]+[^&gt;]+&gt; ([^&lt;]*)&lt;</expression>
                        </RegExp>

-----------------------------------------------------------------------

Summary of changes:
 metadata.albums.merlin.pl/addon.xml  |    2 +-
 metadata.albums.merlin.pl/merlin.xml |   16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 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
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons