diff options
Diffstat (limited to 'addons/metadata.artists.universal/artistuniversal.xml')
| -rw-r--r-- | addons/metadata.artists.universal/artistuniversal.xml | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/addons/metadata.artists.universal/artistuniversal.xml b/addons/metadata.artists.universal/artistuniversal.xml index ec474e1e70..2f8e84f1c3 100644 --- a/addons/metadata.artists.universal/artistuniversal.xml +++ b/addons/metadata.artists.universal/artistuniversal.xml @@ -6,12 +6,12 @@ </RegExp> </NfoUrl> <CreateArtistSearchUrl 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="<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|Ft.|Feat.|%20and%20)</expression> + <expression noclean="1">(.+)(?:Ft%2e|Feat%2e|%20Ft\.|%20Feat\.|%20and%20)</expression> </RegExp> <RegExp input="$$6" output="\1" dest="4"> <expression>(.+)</expression> @@ -22,6 +22,9 @@ <GetArtistSearchResults dest="8"> <RegExp input="$$5" output="<results>\1</results>" dest="8"> <RegExp input="$$1" output="<entity><title>\2</title><genre>\7</genre><url cache="mb-\1-artist.xml">http://www.musicbrainz.org/ws/2/artist/\1?inc=url-rels</url></entity>" dest="9"> + <expression repeat="yes" noclean="1">artist id="([^"]*)"(?:\stype="[^"]*")* ext:score="[^"]*"><name>([^<]*)</name>(<sort-name>[^<]*</sort-name>)?(<gender>[^<]*</gender>)?(<country>[^<]*</country>)?(<disambiguation>([^<]*))?</expression> + </RegExp> + <RegExp input="$$1" output="<entity><title>\2</title><genre>\7</genre><url cache="mb-\1-artist.xml">http://www.musicbrainz.org/ws/2/artist/\1?inc=url-rels</url></entity>" dest="9"> <expression repeat="yes" noclean="1">artist ext:score="[^"]*"(?:\stype="[^"]*")* id="([^"]*)"><name>([^<]*)</name>(<sort-name>[^<]*</sort-name>)?(<gender>[^<]*</gender>)?(<country>[^<]*</country>)?(<disambiguation>([^<]*))?</expression> </RegExp> <RegExp input="$$9" output="\1" dest="5"> @@ -40,6 +43,9 @@ <RegExp input="$$1" output="\2" dest="9"> <expression noclean="1">><relation type="allmusic"><target>http://(www.)?allmusic.com/artist/([^<]*)</expression> </RegExp> + <RegExp input="$$1" output="<name>\1</name>" dest="5"> + <expression noclean="1"><artist(?:\stype="[^"]*")* id="[^"]*"><name>([^<]*)</expression> + </RegExp> <RegExp input="$$8" conditional="fanarttvthumbs" output="<chain function="GetFanartTvArtistThumbsByMBID">\1</chain>" dest="5+"> <expression/> </RegExp> @@ -79,6 +85,9 @@ <RegExp input="$INFO[stylessource]" output="<chain function="GetLastFMArtistStylesByMBID">$$8</chain>" dest="5+"> <expression>last.fm</expression> </RegExp> + <RegExp input="$INFO[biogsource]" output="<chain function="GetTADBBiographyByMBID">$$8</chain>" dest="5+"> + <expression>TheAudioDb.com</expression> + </RegExp> <expression noclean="1"/> </RegExp> </GetArtistDetails> |