diff options
| author | Martijn Kaijser <mcm.kaijser@gmail.com> | 2018-02-10 10:51:09 +0100 |
|---|---|---|
| committer | Martijn Kaijser <mcm.kaijser@gmail.com> | 2018-02-10 10:56:58 +0100 |
| commit | d7676e63f40374c8d0bb79ab146cd6daa43817b0 (patch) | |
| tree | 796b662c41e639e9ea670d555a5a35171b73affb /addons/metadata.artists.universal | |
| parent | 8c7f8bd3a45401d87486c9f3d3c4f586552bdb9f (diff) | |
[addons] sync with repo
Diffstat (limited to 'addons/metadata.artists.universal')
5 files changed, 28 insertions, 5 deletions
diff --git a/addons/metadata.artists.universal/addon.xml b/addons/metadata.artists.universal/addon.xml index fa7fb383d3..08fcd89de3 100644 --- a/addons/metadata.artists.universal/addon.xml +++ b/addons/metadata.artists.universal/addon.xml @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.artists.universal" name="Universal Artist Scraper" - version="3.7.3" + version="4.1.0" provider-name="Olympia, Team Kodi"> <requires> <import addon="xbmc.metadata" version="2.1.0"/> diff --git a/addons/metadata.artists.universal/artistuniversal.xml b/addons/metadata.artists.universal/artistuniversal.xml index f6f33b7a84..252334b23f 100644 --- a/addons/metadata.artists.universal/artistuniversal.xml +++ b/addons/metadata.artists.universal/artistuniversal.xml @@ -2,7 +2,7 @@ <scraper framework="1.1" date="2013-05-29"> <NfoUrl dest="3"> <RegExp input="$$1" output="<url>$INFO[mbsite]/ws/2/artist/\1?inc=url-rels</url>" dest="3"> - <expression>http://musicbrainz.org/artist/(.+)</expression> + <expression>musicbrainz.org/artist/(.+)</expression> </RegExp> </NfoUrl> <ResolveIDToUrl dest="3"> @@ -58,12 +58,24 @@ <RegExp input="$$1" output="\2" dest="9"> <expression noclean="1">>http://(www.)?allmusic.com/artist/([^<]*)</expression> </RegExp> - <RegExp input="$$1" output="<musicBrainzArtistID>$$8</musicBrainzArtistID><name>\2</name>" dest="5"> - <expression noclean="1"><artist(.*?)<name>([^<]*)</expression> + <RegExp input="$$1" output="<musicBrainzArtistID>$$8</musicBrainzArtistID><name>\1</name>" dest="5"> + <expression noclean="1"><artist.*?<name>([^<]*)</expression> + </RegExp> + <RegExp input="$$1" output="<type>\1</type>" dest="5+"> + <expression noclean="1"><artist.*?type="([^"]*)</expression> + </RegExp> + <RegExp input="$$1" output="<gender>\1</gender>" dest="5+"> + <expression noclean="1"><gender.*?>([^<]*)</expression> + </RegExp> + <RegExp input="$$1" output="<disambiguation>\1</disambiguation>" dest="5+"> + <expression noclean="1"><disambiguation>([^<]*)</expression> </RegExp> <RegExp input="$$8" conditional="fanarttvthumbs" output="<chain function="GetFanartTvArtistThumbsByMBID">\1</chain>" dest="5+"> <expression noclean="1">(.+)</expression> </RegExp> + <RegExp input="$$8" conditional="fanarttvartistcl" output="<chain function="GetFanartTvArtistClearlogoByMBID">\1</chain>" dest="5+"> + <expression noclean="1">(.+)</expression> + </RegExp> <RegExp input="$$8" conditional="tadbthumbs" output="<chain function="GetTADBArtistThumbsByMBID">$$8</chain>" dest="5+"> <expression noclean="1">(.+)</expression> </RegExp> diff --git a/addons/metadata.artists.universal/changelog.txt b/addons/metadata.artists.universal/changelog.txt index 6019756b59..cd3ea4e720 100644 --- a/addons/metadata.artists.universal/changelog.txt +++ b/addons/metadata.artists.universal/changelog.txt @@ -1,3 +1,9 @@ +[B]4.1.0[/B] +added: Artist type, gender and disambiguation from MusicBrainz + +[B]4.0.0[/B] +added: Artist Clearlogo from fanart.tv; bump version for Leia + [B]3.7.3[/B] cleanup: sources and options what won't work diff --git a/addons/metadata.artists.universal/resources/language/English/strings.po b/addons/metadata.artists.universal/resources/language/English/strings.po index fff6edc775..4a1e97a38a 100644 --- a/addons/metadata.artists.universal/resources/language/English/strings.po +++ b/addons/metadata.artists.universal/resources/language/English/strings.po @@ -120,4 +120,8 @@ msgstr "" msgctxt "#30026" msgid "MusicBrainz Mirror" +msgstr "" + +msgctxt "#30027" +msgid "Enable Artist Clearlogo from fanart.tv" msgstr ""
\ No newline at end of file diff --git a/addons/metadata.artists.universal/resources/settings.xml b/addons/metadata.artists.universal/resources/settings.xml index 9b86027f1b..6a021a430d 100644 --- a/addons/metadata.artists.universal/resources/settings.xml +++ b/addons/metadata.artists.universal/resources/settings.xml @@ -32,6 +32,7 @@ <setting type="lsep" label="Fanart Sources"/> <setting label="30004" type="bool" id="fanarttvfanart" default="true"/> <setting label="30023" type="bool" id="tadbfanart" default="true"/> + <setting label="30027" type="bool" id="fanarttvartistcl" default="false"/> </category> <category label="30025"> |