The branch, eden has been updated
       via  825a5e4c1913ea90fb121aab611b1c6e27b60e16 (commit)
      from  f037a302a75782f41019e9e0527b2fe71dc2dfc3 (commit)

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

commit 825a5e4c1913ea90fb121aab611b1c6e27b60e16
Author: olympia <[email protected]>
Date:   Wed Mar 14 08:20:02 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="&lt;results&gt;\1&lt;/results&gt;" 
dest="8">
-                       <RegExp input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\5\7\9&lt;/title&gt;&lt;genre&gt;\2&lt;/genre&gt;&lt;year&gt;\6\8&lt;/year&gt;&lt;url&gt;http://musicbrainz.org/ws/2/artist/\3?inc=url-rels+release-groups&lt;/url&gt;&lt;/entity&gt;";
 dest="5">
-                               <expression 
repeat="yes">(score":"[^"]+","type":"([^"]+)|score":"[^"]+)","id":"([^"]+)","(name":"([^"]+)",[^,]+,[^,]+,"disambiguation":"([^"]+)|name":"([^"]+)",[^,]+,"disambiguation":"([^"]+)|name":"([^"]+))</expression>
+                       <RegExp input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\4&lt;/title&gt;&lt;genre&gt;\2&lt;/genre&gt;&lt;year&gt;\6\7\8&lt;/year&gt;&lt;url&gt;http://musicbrainz.org/ws/2/artist/\3?inc=url-rels+release-groups&lt;/url&gt;&lt;/entity&gt;";
 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="&lt;album&gt;&lt;title&gt;\1\2\3&lt;/title&gt;&lt;/album&gt;" dest="5+">
                                <expression 
repeat="yes">type="Album"[^&lt;]*&lt;title&gt;([^&lt;]*)&lt;/title&gt;|type="Compilation"[^&lt;]*&lt;title&gt;([^&lt;]*)&lt;/title&gt;|type="Soundtrack"[^&lt;]*&lt;title&gt;([^&lt;]*)&lt;/title&gt;</expression>
                        </RegExp>
+                       <RegExp input="$$1" output="\1" dest="7">
+                               <expression 
noclean="1">&lt;artist.*?id=&quot;([^&quot;]+)</expression>
+                       </RegExp>
+                       <RegExp input="" output="&lt;url 
function=&quot;FirstTryFanart&quot; 
cache=&quot;ftv-images-$$7.xml&quot;&gt;http://fanart.tv/api/music.php?id=$$7&amp;type=background&lt;/url&gt;";
 dest="5+">
+                               <expression/>
+                       </RegExp>
+                       <RegExp input="" output="&lt;url 
function=&quot;GetBiography&quot;&gt;http://ws.audioscrobbler.com/2.0/?method=artist.getinfo&amp;amp;mbid=$$7&amp;amp;lang=$INFO[language]&amp;amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lt;/url&gt;";
 dest="5+">
+                               <expression/>
+                       </RegExp>
+                       <RegExp input="" output="&lt;chain 
function=&quot;GetLastFMArtistThumbsByID&quot;&gt;$$7&lt;/chain&gt;" dest="5+">
+                               <expression />
+                       </RegExp>
                        <RegExp input="$$1" output="\2xbmc\1" dest="6">
                                <expression fixchars="1,2" encode="1,2" 
noclean="1,2">&lt;name&gt;([^&lt;]+).*?&lt;title&gt;([^&lt;]+)</expression>
                        </RegExp>
@@ -41,18 +53,6 @@
                                </RegExp>
                                <expression noclean="1"/>
                        </RegExp>
-                       <RegExp input="$$1" output="\1" dest="7">
-                               <expression 
noclean="1">&lt;artist.*?id=&quot;([^&quot;]+)</expression>
-                       </RegExp>
-                       <RegExp input="" output="&lt;url 
function=&quot;FirstTryFanart&quot; 
cache=&quot;ftv-images-$$7.xml&quot;&gt;http://fanart.tv/api/music.php?id=$$7&amp;type=background&lt;/url&gt;";
 dest="5+">
-                               <expression/>
-                       </RegExp>
-                       <RegExp input="" output="&lt;url 
function=&quot;GetBiography&quot;&gt;http://ws.audioscrobbler.com/2.0/?method=artist.getinfo&amp;amp;mbid=$$7&amp;amp;lang=$INFO[language]&amp;amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lt;/url&gt;";
 dest="5+">
-                               <expression/>
-                       </RegExp>
-                       <RegExp input="" output="&lt;chain 
function=&quot;GetLastFMArtistThumbsByID&quot;&gt;$$7&lt;/chain&gt;" dest="5+">
-                               <expression />
-                       </RegExp>
                        <RegExp input="" output="&lt;url 
function=&quot;GetGenres&quot;&gt;http://ws.audioscrobbler.com/2.0/?method=artist.gettoptags&amp;amp;mbid=$$7&amp;amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lt;/url&gt;";
 dest="5+">
                                <expression/>
                        </RegExp>

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

Summary of changes:
 metadata.artists.yoyo.pl/addon.xml              |    2 +-
 metadata.artists.yoyo.pl/resources/settings.xml |    1 +
 metadata.artists.yoyo.pl/yoyo.xml               |   28 +++++++++++-----------
 3 files changed, 16 insertions(+), 15 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

Reply via email to