[Xbmc-addons] Scrapers branch, eden, updated. 8c975b7a5ccc990769d44f39a9de9d3dcf2fe497

Mon, 18 Jun 2012 12:15:54 -0700 

The branch, eden has been updated
       via  8c975b7a5ccc990769d44f39a9de9d3dcf2fe497 (commit)
      from  b4afd05d8b140ed746a31568e05937078fb7142e (commit)

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

commit 8c975b7a5ccc990769d44f39a9de9d3dcf2fe497
Author: olympia <[email protected]>
Date:   Mon Jun 18 21:15:09 2012 +0200

    [metadata.album.universal] updated to version 1.1.0

diff --git a/metadata.album.universal/addon.xml 
b/metadata.album.universal/addon.xml
index 284d4ed..53b6da2 100644
--- a/metadata.album.universal/addon.xml
+++ b/metadata.album.universal/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.album.universal"
-       name="Universal Scraper"
-       version="1.0.3"
+       name="Universal Album Scraper"
+       version="1.1.0"
        provider-name="Olympia, Team XBMC">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.album.universal/albumuniversal.xml 
b/metadata.album.universal/albumuniversal.xml
index db4a6ef..dcc51de 100644
--- a/metadata.album.universal/albumuniversal.xml
+++ b/metadata.album.universal/albumuniversal.xml
@@ -7,16 +7,25 @@
        </NfoUrl>
        <CreateAlbumSearchUrl dest="3">
                <RegExp input="$$1" 
output="&lt;url&gt;http://search.musicbrainz.org/ws/2/release/?fmt=xml&amp;query=release:&quot;\1&quot;%20AND%20artist:&quot;$$2&quot;&lt;/url&gt;";
 dest="3">
-                       <expression />
+                       <RegExp input="$$2" output="\1" dest="4">
+                               <expression noclean="1">(.+)</expression>
+                       </RegExp>
+                       <RegExp input="$$2" output="\1" dest="6">
+                               <expression 
noclean="1">(.+)(?:Ft%2e|Feat%2e|%26|and)</expression>
+                       </RegExp>
+                       <RegExp input="$$6" output="\1" dest="4">
+                               <expression>(.+)</expression>
+                       </RegExp>
+                       <expression/>
                </RegExp>
        </CreateAlbumSearchUrl>
        <GetAlbumSearchResults dest="8">
                <RegExp input="$$5" output="&lt;results&gt;\1&lt;/results&gt;" 
dest="8">
                        <RegExp input="$$1" 
output="&lt;entity&gt;&lt;year&gt;\5-\4-T#\6&lt;/year&gt;&lt;artist&gt;\3&lt;/artist&gt;&lt;title&gt;\2&lt;/title&gt;&lt;url
 
cache=&quot;mb-\1-album.xml&quot;&gt;http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings&lt;/url&gt;&lt;/entity&gt;";
 dest="5">
-                               <expression 
repeat="yes">id=&quot;([^&quot;]*)&quot;&gt;&lt;title&gt;([^&lt;]*)&lt;/title&gt;&lt;status&gt;Official&lt;/status&gt;&lt;text-representation&gt;&lt;language&gt;[^&lt;]*&lt;/language&gt;&lt;script&gt;[^&lt;]*&lt;/script&gt;&lt;/text-representation&gt;&lt;artist-credit&gt;&lt;name-credit(?:\sjoinphrase=&quot;[^&quot;]*&quot;&gt;&lt;name&gt;[^&lt;]*&lt;/name)*&gt;&lt;artist\sid=&quot;[^&quot;]*&quot;&gt;&lt;name&gt;([^&lt;]*)&lt;/name&gt;(?:&lt;sort-name&gt;[^&lt;]*&lt;/sort-name&gt;)*(?:&lt;disambiguation&gt;[^&lt;]*&lt;/disambiguation&gt;)*(?:&lt;alias-list&gt;.*?&lt;/alias-list&gt;)*&lt;/artist&gt;&lt;/name-credit&gt;&lt;/artist-credit&gt;&lt;release-group\stype=&quot;Album&quot;\sid=&quot;[^&quot;]*&quot;&gt;&lt;primary-type&gt;[^&lt;]*&lt;/primary-type&gt;(?:&lt;secondary-type-list&gt;&lt;secondary-type&gt;[^&lt;]*&lt;/secondary-type&gt;&lt;/secondary-type-list&gt;)*&lt;/release-group&gt;&lt;date&gt;(\d{4})[^&lt;]*&lt;/date&gt;(?:&lt;country&gt;)*([^&lt;]*)?.*?&lt;track-list\scount=&quot;(\d+)</expression>
+                               <expression 
repeat="yes">id=&quot;([^&quot;]*)&quot;&gt;&lt;title&gt;([^&lt;]*)&lt;/title&gt;&lt;status&gt;Official&lt;/status&gt;&lt;text-representation&gt;&lt;language&gt;[^&lt;]*&lt;/language&gt;&lt;script&gt;[^&lt;]*&lt;/script&gt;&lt;/text-representation&gt;&lt;artist-credit&gt;&lt;name-credit(?:&gt;)*(?:\sjoinphrase=&quot;[^&quot;]*&quot;&gt;)*(?:&lt;name&gt;[^&lt;]*&lt;/name)*(?:&gt;)*&lt;artist\sid=&quot;[^&quot;]*&quot;&gt;&lt;name&gt;([^&lt;]*)&lt;/name&gt;(?:&lt;sort-name&gt;[^&lt;]*&lt;/sort-name&gt;)*(?:&lt;disambiguation&gt;[^&lt;]*&lt;/disambiguation&gt;)*(?:&lt;alias-list&gt;.*?&lt;/alias-list&gt;)*&lt;/artist&gt;&lt;/name-credit&gt;(?:&lt;name-credit(?:&gt;)*(?:\sjoinphrase=&quot;[^&quot;]*&quot;&gt;)*(?:&lt;name&gt;[^&lt;]*&lt;/name)*(?:&gt;)*&lt;artist\sid=&quot;[^&quot;]*&quot;&gt;&lt;name&gt;[^&lt;]*&lt;/name&gt;(?:&lt;sort-name&gt;[^&lt;]*&lt;/sort-name&gt;)*(?:&lt;disambiguation&gt;[^&lt;]*&lt;/disambiguation&gt;)*(?:&lt;alias-list&gt;.*?&lt;/alias-list&gt;)*&lt;/artist&gt;&lt;/name-credit&gt;)*&lt;/artist-credit&gt;&lt;release-group(?:\stype=&quot;Album&quot;\sid=&quot;[^&quot;]*&quot;&gt;(?:&lt;primary-type&gt;[^&lt;]*&lt;/primary-type&gt;)*(?:&lt;secondary-type-list&gt;&lt;secondary-type&gt;[^&lt;]*&lt;/secondary-type&gt;&lt;/secondary-type-list&gt;)*&lt;/release-group&gt;&lt;date&gt;(\d{4})[^&lt;]*&lt;/date&gt;(?:&lt;country&gt;)*([^&lt;]*)?.*?&lt;track-list\scount=&quot;(\d+)</expression>
                        </RegExp>
                        <RegExp input="$$1" 
output="&lt;entity&gt;&lt;year&gt;\5-\4-T#\6&lt;/year&gt;&lt;artist&gt;\3&lt;/artist&gt;&lt;title&gt;\2&lt;/title&gt;&lt;url
 
cache=&quot;mb-\1-album.xml&quot;&gt;http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings&lt;/url&gt;&lt;/entity&gt;";
 dest="5+">
-                               <expression 
repeat="yes">id=&quot;([^&quot;]*)&quot;&gt;&lt;title&gt;([^&lt;]*)&lt;/title&gt;&lt;status&gt;Official&lt;/status&gt;&lt;text-representation&gt;&lt;language&gt;[^&lt;]*&lt;/language&gt;&lt;script&gt;[^&lt;]*&lt;/script&gt;&lt;/text-representation&gt;&lt;artist-credit&gt;&lt;name-credit(?:\sjoinphrase=&quot;[^&quot;]*&quot;&gt;&lt;name&gt;[^&lt;]*&lt;/name)*&gt;&lt;artist\sid=&quot;[^&quot;]*&quot;&gt;&lt;name&gt;([^&lt;]*)&lt;/name&gt;(?:&lt;sort-name&gt;[^&lt;]*&lt;/sort-name&gt;)*(?:&lt;disambiguation&gt;[^&lt;]*&lt;/disambiguation&gt;)*(?:&lt;alias-list&gt;.*?&lt;/alias-list&gt;)*&lt;/artist&gt;&lt;/name-credit&gt;&lt;/artist-credit&gt;&lt;release-group\stype=&quot;[^&quot;]*&quot;\sid=&quot;[^&quot;]*&quot;&gt;&lt;primary-type&gt;[^&lt;]*&lt;/primary-type&gt;(?:&lt;secondary-type-list&gt;&lt;secondary-type&gt;[^&lt;]*&lt;/secondary-type&gt;&lt;/secondary-type-list&gt;)*&lt;/release-group&gt;&lt;date&gt;(\d{4})[^&lt;]*&lt;/date&gt;(?:&lt;country&gt;)*([^&lt;]*)?.*?&lt;track-list\scount=&quot;(\d+)</expression>
+                               <expression 
repeat="yes">id=&quot;([^&quot;]*)&quot;&gt;&lt;title&gt;([^&lt;]*)&lt;/title&gt;&lt;status&gt;Official&lt;/status&gt;&lt;text-representation&gt;&lt;language&gt;[^&lt;]*&lt;/language&gt;&lt;script&gt;[^&lt;]*&lt;/script&gt;&lt;/text-representation&gt;&lt;artist-credit&gt;&lt;name-credit(?:&gt;)*(?:\sjoinphrase=&quot;[^&quot;]*&quot;&gt;)*(?:&lt;name&gt;[^&lt;]*&lt;/name)*(?:&gt;)*&lt;artist\sid=&quot;[^&quot;]*&quot;&gt;&lt;name&gt;([^&lt;]*)&lt;/name&gt;(?:&lt;sort-name&gt;[^&lt;]*&lt;/sort-name&gt;)*(?:&lt;disambiguation&gt;[^&lt;]*&lt;/disambiguation&gt;)*(?:&lt;alias-list&gt;.*?&lt;/alias-list&gt;)*&lt;/artist&gt;&lt;/name-credit&gt;(?:&lt;name-credit(?:&gt;)*(?:\sjoinphrase=&quot;[^&quot;]*&quot;&gt;)*(?:&lt;name&gt;[^&lt;]*&lt;/name)*(?:&gt;)*&lt;artist\sid=&quot;[^&quot;]*&quot;&gt;&lt;name&gt;[^&lt;]*&lt;/name&gt;(?:&lt;sort-name&gt;[^&lt;]*&lt;/sort-name&gt;)*(?:&lt;disambiguation&gt;[^&lt;]*&lt;/disambiguation&gt;)*(?:&lt;alias-list&gt;.*?&lt;/alias-list&gt;)*&lt;/artist&gt;&lt;/name-credit&gt;)*&lt;/artist-credit&gt;&lt;release-group(?:\stype=&quot;[^&quot;]*&quot;)*\sid=&quot;[^&quot;]*&quot;&gt;(?:&lt;primary-type&gt;[^&lt;]*&lt;/primary-type&gt;)*(?:&lt;secondary-type-list&gt;&lt;secondary-type&gt;[^&lt;]*&lt;/secondary-type&gt;&lt;/secondary-type-list&gt;)*&lt;/release-group&gt;&lt;date&gt;(\d{4})[^&lt;]*&lt;/date&gt;(?:&lt;country&gt;)*([^&lt;]*)?.*?&lt;track-list\scount=&quot;(\d+)</expression>
                        </RegExp>
                        <expression noclean="1" />
                </RegExp>
@@ -76,14 +85,14 @@
                                <expression>allmusic.com</expression>
                        </RegExp>
                        <RegExp conditional="fanarttvalbumthumbs" input="$$1" 
output="&lt;chain 
function=&quot;GetFanartTvAlbumThumbsByMBID&quot;&gt;$$4&lt;/chain&gt;" 
dest="5+">
-                               <expression noclean="1">(.+)</expression>
-                       </RegExp>
-                       <RegExp conditional="lastfmalbumthumbs" input="$$1" 
output="&lt;chain 
function=&quot;GetLastFMAlbumThumbs&quot;&gt;$$7::$$8::$$7::$$8&lt;/chain&gt;" 
dest="5+">
                                <expression noclean="1" />
                        </RegExp>
                        <RegExp conditional="allmusicalbumthumbs" input="$$1" 
output="&lt;url function=&quot;GetAMGAlbumThumbs&quot; 
cache=&quot;mb-$$4-rg.xml&quot;&gt;http://musicbrainz.org/ws/2/release-group/$$4?inc=url-rels&lt;/url&gt;";
 dest="5+">
                                <expression noclean="1" />
                        </RegExp>
+                       <RegExp conditional="lastfmalbumthumbs" input="$$1" 
output="&lt;chain 
function=&quot;GetLastFMAlbumThumbs&quot;&gt;$$7::$$8::$$7::$$8&lt;/chain&gt;" 
dest="5+">
+                               <expression noclean="1" />
+                       </RegExp>
                        <expression noclean="1" />
                </RegExp>
        </GetAlbumDetails>
diff --git a/metadata.album.universal/changelog.txt 
b/metadata.album.universal/changelog.txt
index dd62f6a..54197ba 100644
--- a/metadata.album.universal/changelog.txt
+++ b/metadata.album.universal/changelog.txt
@@ -1,3 +1,7 @@
+[B]1.1.0[/B]
+Added: trying to get album info when multiple artists are credited (first 
artist will be used)
+Fixed: will not find some albums
+
 [B]1.0.3[/B]
 Fixed: Some Album releases were not found
 

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

Summary of changes:
 metadata.album.universal/addon.xml          |    4 ++--
 metadata.album.universal/albumuniversal.xml |   21 +++++++++++++++------
 metadata.album.universal/changelog.txt      |    4 ++++
 3 files changed, 21 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Scrapers

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to