The branch, eden has been updated
via a341f728651751a6f41c26a578cadb56aad553ac (commit)
from 5862fa47eef9774ac2bef05b3cf9c80aaa236116 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=a341f728651751a6f41c26a578cadb56aad553ac
commit a341f728651751a6f41c26a578cadb56aad553ac
Author: olympia <[email protected]>
Date: Sat Jun 16 21:17:47 2012 +0200
[metadata.artists.universal] updated to version 2.0.0
diff --git a/metadata.artists.universal/addon.xml
b/metadata.artists.universal/addon.xml
index 3d0fd63..cf996e2 100644
--- a/metadata.artists.universal/addon.xml
+++ b/metadata.artists.universal/addon.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.artists.universal"
- name="Universal Scraper"
- version="1.2.1"
+ name="Universal Artist Scraper"
+ version="2.0.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
- <import addon="metadata.common.last.fm" version="1.1.0"/>
- <import addon="metadata.common.allmusic.com" version="2.2.0"/>
- <import addon="metadata.common.musicbrainz.org" version="1.1.2"/>
- <import addon="metadata.common.htbackdrops.com" version="1.0.7"/>
- <import addon="metadata.common.fanart.tv" version="1.0.0"/>
+ <import addon="metadata.common.last.fm" version="1.4.0"/>
+ <import addon="metadata.common.allmusic.com" version="2.4.0"/>
+ <import addon="metadata.common.musicbrainz.org" version="1.2.0"/>
+ <import addon="metadata.common.htbackdrops.com" version="1.2.0"/>
+ <import addon="metadata.common.fanart.tv" version="1.1.0"/>
</requires>
<extension point="xbmc.metadata.scraper.artists"
language="en"
diff --git a/metadata.artists.universal/artistuniversal.xml
b/metadata.artists.universal/artistuniversal.xml
index 8cfa97e..5cc4073 100644
--- a/metadata.artists.universal/artistuniversal.xml
+++ b/metadata.artists.universal/artistuniversal.xml
@@ -6,7 +6,16 @@
</RegExp>
</NfoUrl>
<CreateArtistSearchUrl dest="3">
- <RegExp input="$$1"
output="<url>http://search.musicbrainz.org/ws/2/artist/?fmt=xml&query=artist:"\1"&limit=100</url>";
dest="3">
+ <RegExp input="$$1"
output="<url>http://search.musicbrainz.org/ws/2/artist/?fmt=xml&query=artist:"$$4"&limit=100</url>";
dest="3">
+ <RegExp input="$$1" output="\1" dest="4">
+ <expression noclean="1">(.+)</expression>
+ </RegExp>
+ <RegExp input="$$1" 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>
</CreateArtistSearchUrl>
@@ -23,73 +32,115 @@
</GetArtistSearchResults>
<GetArtistDetails dest="3" clearbuffers="no">
<RegExp input="$$5" output="<details>\1</details>"
dest="3">
- <RegExp input="$$1" output="\2" dest="7">
- <expression
noclean="1">type="[^"]*"
id="([^"]*)"><name>([^<]*)</expression>
- </RegExp>
+ <!--MBID - Artist-->
<RegExp input="$$1" output="\1" dest="8">
<expression
noclean="1">type="[^"]*"
id="([^"]*)"><name>([^<]*)</expression>
</RegExp>
+ <!--AMGID - Artist-->
<RegExp input="$$1" output="\2" dest="9">
<expression noclean="1">><relation
type="allmusic"><target>http://(www.)?allmusic.com/artist/([^<]*)</expression>
</RegExp>
- <RegExp input="$INFO[biogsource]" output="<chain
function="GetLastFMBiographyByMBID">$$8</chain>" dest="5+">
- <expression>last.fm</expression>
+ <RegExp input="$$8" conditional="fanarttvthumbs"
output="<chain
function="GetFanartTvArtistThumbsByMBID">\1</chain>"
dest="5+">
+ <expression/>
</RegExp>
- <RegExp input="$INFO[biogsource]" output="<chain
function="GetAMGBiographyByAMGID">$$9</chain>" dest="5+">
- <expression>allmusic.com</expression>
+ <RegExp input="$$8" conditional="htbthumbs"
output="<chain function="GetHTBThumbsByMBID">\1</chain>"
dest="5+">
+ <expression/>
</RegExp>
- <RegExp input="$INFO[discogsource]" output="<chain
function="GetMBDiscographyByMBID">$$8</chain>" dest="5+">
- <expression>MusicBrainz</expression>
+ <RegExp input="$$8" conditional="lastfmartistthumbs"
output="<chain
function="GetLastFMArtistThumbsByMBID">\1</chain>" dest="5+">
+ <expression/>
</RegExp>
- <RegExp input="$INFO[discogsource]" output="<chain
function="GetLastFMDiscographyByMBID">$$8</chain>" dest="5+">
- <expression>last.fm</expression>
+ <RegExp input="$$8" conditional="fanarttvfanart"
output="<chain
function="GetFanartTvArtistFanartsByMBID">\1</chain>"
dest="5+">
+ <expression/>
</RegExp>
- <RegExp input="$INFO[discogsource]" output="<chain
function="GetAMGDiscographyByAMGID">$$9</chain>" dest="5+">
- <expression>allmusic.com</expression>
+ <RegExp input="$$8" conditional="htbfanart"
output="<chain function="GetHTBFanartByMBID">\1</chain>"
dest="5+">
+ <expression/>
</RegExp>
- <RegExp input="$INFO[lifespansource]" output="<chain
function="GetAMGArtistLifeSpanByAMGID">$$9</chain>"
dest="5+">
- <expression>allmusic.com</expression>
+ <RegExp input="$$9" output="<chain
function="GetAMGData">\1</chain>" dest="5+">
+ <expression noclean="1">(.+)</expression>
+ </RegExp>
+ <RegExp input="$$9" output="<chain
function="AMGFallback">\1</chain>" dest="5+">
+ <expression noclean="1">^$</expression>
+ </RegExp>
+ <RegExp input="$INFO[discogsource]" output="<chain
function="GetMBDiscographyByMBID">$$8</chain>" dest="5+">
+ <expression>MusicBrainz</expression>
</RegExp>
<RegExp input="$INFO[lifespansource]" output="<chain
function="GetMBLafeSpanByMBID">$$8</chain>" dest="5+">
<expression>MusicBrainz</expression>
</RegExp>
- <RegExp input="$INFO[genressource]" output="<chain
function="GetLastFMArtistGenresByMBID">$$8</chain>"
dest="5+">
+ <RegExp input="$INFO[biogsource]" output="<chain
function="GetLastFMBiographyByMBID">$$8</chain>" dest="5+">
<expression>last.fm</expression>
</RegExp>
- <RegExp input="$INFO[genressource]" output="<chain
function="GetAMGArtistGenresByAMGID">$$9</chain>" dest="5+">
- <expression>allmusic.com</expression>
+ <RegExp input="$INFO[discogsource]" output="<chain
function="GetLastFMDiscographyByMBID">$$8</chain>" dest="5+">
+ <expression>last.fm</expression>
+ </RegExp>
+ <RegExp input="$INFO[genressource]" output="<chain
function="GetLastFMArtistGenresByMBID">$$8</chain>"
dest="5+">
+ <expression>last.fm</expression>
</RegExp>
<RegExp input="$INFO[stylessource]" output="<chain
function="GetLastFMArtistStylesByMBID">$$8</chain>"
dest="5+">
<expression>last.fm</expression>
</RegExp>
- <RegExp input="$INFO[stylessource]" output="<chain
function="GetAMGArtistStylesByAMGID">$$9</chain>" dest="5+">
+ <expression noclean="1"/>
+ </RegExp>
+ </GetArtistDetails>
+
+ <GetAMGData dest="5" clearbuffers="no">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1" output="\1" dest="9">
+ <expression/>
+ </RegExp>
+ <RegExp input="" output="" dest="2">
+ <expression />
+ </RegExp>
+ <RegExp input="$INFO[discogsource]" output="<chain
function="GetAMGDiscographyByAMGID">$$9</chain>" dest="2">
<expression>allmusic.com</expression>
</RegExp>
- <RegExp input="$INFO[moodssource]" output="<chain
function="GetAMGArtistMoodsByAMGID">$$9</chain>" dest="5+">
+ <RegExp input="$INFO[lifespansource]" output="<chain
function="GetAMGArtistLifeSpanByAMGID">$$9</chain>"
dest="2+">
<expression>allmusic.com</expression>
</RegExp>
- <RegExp input="$INFO[yearsasource]" output="<chain
function="GetAMGArtistYearsActiveByAMGID">$$9</chain>"
dest="5+">
+ <RegExp input="$INFO[biogsource]" output="<chain
function="GetAMGBiographyByAMGID">$$9</chain>" dest="2+">
<expression>allmusic.com</expression>
</RegExp>
- <RegExp input="$$8" conditional="fanarttvthumbs"
output="<chain
function="GetFanartTvArtistThumbsByMBID">\1</chain>"
dest="5+">
- <expression/>
+ <RegExp input="$INFO[genressource]" output="<chain
function="GetAMGArtistGenresByAMGID">$$9</chain>" dest="2+">
+ <expression>allmusic.com</expression>
</RegExp>
- <RegExp input="$$8" conditional="htbthumbs"
output="<chain function="GetHTBThumbsByMBID">\1</chain>"
dest="5+">
- <expression/>
+ <RegExp input="$INFO[stylessource]" output="<chain
function="GetAMGArtistStylesByAMGID">$$9</chain>" dest="2+">
+ <expression>allmusic.com</expression>
</RegExp>
- <RegExp input="$$8" conditional="lastfmartistthumbs"
output="<chain
function="GetLastFMArtistThumbsByMBID">\1</chain>" dest="5+">
- <expression/>
+ <RegExp input="$INFO[moodssource]" output="<chain
function="GetAMGArtistMoodsByAMGID">$$9</chain>" dest="2+">
+ <expression>allmusic.com</expression>
</RegExp>
- <RegExp input="$$9" conditional="allmusicartistthumbs"
output="<chain
function="GetAMGArtistThumbsByAMGID">\1</chain>" dest="5+">
- <expression/>
+ <RegExp input="$INFO[yearsasource]" output="<chain
function="GetAMGArtistYearsActiveByAMGID">$$9</chain>"
dest="2+">
+ <expression>allmusic.com</expression>
</RegExp>
- <RegExp input="$$8" conditional="fanarttvfanart"
output="<chain
function="GetFanartTvArtistFanartsByMBID">\1</chain>"
dest="5+">
+ <RegExp input="$$9" conditional="allmusicartistthumbs"
output="<chain
function="GetAMGArtistThumbsByAMGID">\1</chain>" dest="2+">
<expression/>
</RegExp>
- <RegExp input="$$8" conditional="htbfanart"
output="<chain function="GetHTBFanartByMBID">\1</chain>"
dest="5+">
- <expression/>
+ <expression noclean="1" />
+ </RegExp>
+ </GetAMGData>
+
+ <AMGFallback dest="5" clearbuffers="no">
+ <RegExp input="$$11" output="<details>\1</details>"
dest="5">
+ <RegExp input="$INFO[biogfbsource]" output="<chain
function="GetLastFMBiographyByMBID">$$8</chain>" dest="11+">
+ <expression>last.fm</expression>
</RegExp>
- <expression noclean="1"/>
+ <RegExp input="$INFO[discogfbsource]" output="<chain
function="GetLastFMDiscographyByMBID">$$8</chain>"
dest="11+">
+ <expression>last.fm</expression>
+ </RegExp>
+ <RegExp input="$INFO[discogfbsource]" output="<chain
function="GetMBDiscographyByMBID">$$8</chain>" dest="11+">
+ <expression>MusicBrainz</expression>
+ </RegExp>
+ <RegExp input="$INFO[genresfbsource]" output="<chain
function="GetLastFMArtistGenresByMBID">$$8</chain>"
dest="11+">
+ <expression>last.fm</expression>
+ </RegExp>
+ <RegExp input="$INFO[stylesfbsource]" output="<chain
function="GetLastFMArtistStylesByMBID">$$8</chain>"
dest="11+">
+ <expression>last.fm</expression>
+ </RegExp>
+ <RegExp input="$INFO[lifespanfbsource]"
output="<chain
function="GetMBLafeSpanByMBID">$$8</chain>" dest="11+">
+ <expression>MusicBrainz</expression>
+ </RegExp>
+ <expression noclean="1" />
</RegExp>
- </GetArtistDetails>
+ </AMGFallback>
+
</scraper>
diff --git a/metadata.artists.universal/changelog.txt
b/metadata.artists.universal/changelog.txt
index f5043ee..25df3bb 100644
--- a/metadata.artists.universal/changelog.txt
+++ b/metadata.artists.universal/changelog.txt
@@ -1,3 +1,8 @@
+[B]2.0.0[/B]
+Added: Fallback per field
+Added: scraping in case of multiple artists (feat., ft., &, and)
+Added: other improvements
+
[B]1.2.1[/B]
Added: Enable all source for artwork by default
diff --git a/metadata.artists.universal/resources/language/English/strings.xml
b/metadata.artists.universal/resources/language/English/strings.xml
index cfbe02a..ae97b79 100644
--- a/metadata.artists.universal/resources/language/English/strings.xml
+++ b/metadata.artists.universal/resources/language/English/strings.xml
@@ -16,4 +16,9 @@
<string id="30014">Get Artist Years Active from</string>
<string id="30015"> Preferred Language</string>
<string id="30016">Fallback to Artist Biography from</string>
+ <string id="30017">Fallback to Artist Discography from</string>
+ <string id="30018">Fallback to Artist Genres from</string>
+ <string id="30019">Fallback to Artist Styles from</string>
+ <string id="30020">Fallback to Artist Life-Span from</string>
+ <string id="30021">Fallbacks</string>
</strings>
diff --git a/metadata.artists.universal/resources/settings.xml
b/metadata.artists.universal/resources/settings.xml
index 37b5eca..c91d6c5 100644
--- a/metadata.artists.universal/resources/settings.xml
+++ b/metadata.artists.universal/resources/settings.xml
@@ -3,7 +3,6 @@
<category label="128">
<setting label="30006" type="labelenum" values="last.fm|None"
id="biogsource" default="last.fm"/>
<setting label="30015" type="labelenum"
values="en|de|es|fr|it|jp|pl|pt|ru|sv|tr|zh" id="lastfmlanguage" default="en"
visible="eq(-1,0)"/>
- <setting label="30016" type="labelenum"
values="last.fm|allmusic.com|None" id="biogfbsource" default="None"
visible="false"/>
<setting type="sep"/>
<setting label="30008" type="labelenum"
values="last.fm|MusicBrainz|allmusic.com|None" id="discogsource"
default="MusicBrainz"/>
<setting type="sep"/>
@@ -14,6 +13,16 @@
<setting label="30014" type="labelenum" values="allmusic.com|None"
id="yearsasource" default="allmusic.com"/>
</category>
+ <category label="30021">
+ <setting label="30016" type="labelenum" values="last.fm|None"
id="biogfbsource" default="None"/>
+ <setting label="30015" type="labelenum"
values="en|de|es|fr|it|jp|pl|pt|ru|sv|tr|zh" id="lastfmlanguage" default="en"
visible="eq(-1,0)"/>
+ <setting type="sep"/>
+ <setting label="30017" type="labelenum"
values="last.fm|MusicBrainz|None" id="discogfbsource" default="None"
visible="false"/>
+ <setting label="30018" type="labelenum"
values="last.fm|allmusic.com|None" id="genresfbsource" default="None"/>
+ <setting label="30019" type="labelenum"
values="last.fm|allmusic.com|None" id="stylesfbsource" default="None"/>
+ <setting label="30020" type="labelenum"
values="MusicBrainz|allmusic.com|None" id="lifespanfbsource" default="None"/>
+ </category>
+
<category label="30007">
<setting type="lsep" label="Thumb Sources"/>
<setting label="30005" type="bool" id="fanarttvthumbs" default="true"/>
-----------------------------------------------------------------------
Summary of changes:
metadata.artists.universal/addon.xml | 14 +-
metadata.artists.universal/artistuniversal.xml | 121 ++++++++++++++------
metadata.artists.universal/changelog.txt | 5 +
.../resources/language/English/strings.xml | 5 +
metadata.artists.universal/resources/settings.xml | 11 ++-
5 files changed, 113 insertions(+), 43 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
