diff options
author | Rechi <Rechi@users.noreply.github.com> | 2019-04-13 19:57:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-13 19:57:10 +0200 |
commit | 73b6095e7e3691fd6ca988144e68c0f6886b4097 (patch) | |
tree | 0db39738c6ca74d1616dcf1030b40c472c294179 /addons/metadata.artists.universal | |
parent | 8ba1c674004827c364b4caad89d0ceba1fe7cfe4 (diff) | |
parent | 6aee05d2d520fecebee23e873a6cdaaf7fdfc0e1 (diff) |
Merge pull request #15910 from Rechi/addons18.2rc1-Leia
[addons] sync with repo
Diffstat (limited to 'addons/metadata.artists.universal')
-rw-r--r-- | addons/metadata.artists.universal/addon.xml | 2 | ||||
-rw-r--r-- | addons/metadata.artists.universal/artistuniversal.xml | 4 | ||||
-rw-r--r-- | addons/metadata.artists.universal/changelog.txt | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/addons/metadata.artists.universal/addon.xml b/addons/metadata.artists.universal/addon.xml index 0f9ab23270..14614a18f7 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"?> <addon id="metadata.artists.universal" name="Universal Artist Scraper" - version="4.2.1" + version="4.3.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 6131998bbc..30e08a025d 100644 --- a/addons/metadata.artists.universal/artistuniversal.xml +++ b/addons/metadata.artists.universal/artistuniversal.xml @@ -27,8 +27,8 @@ </CreateArtistSearchUrl> <GetArtistSearchResults dest="8"> <RegExp input="$$5" output="<results sorted="yes">\1</results>" dest="8"> - <RegExp input="$$1" output="<entity><title>\2</title><url cache="mb-\1-artist.xml">$INFO[mbsite]/ws/2/artist/\1?inc=url-rels</url></entity>" dest="9"> - <expression repeat="yes" noclean="1">artist\sid="([^"]*)"(?:\stype="[^"]*")*(?:\stype-id="[^"]*")*?\s.*?score="[^"]*"><name>([^<]*)</name>(<sort-name>[^<]*</sort-name>)?</expression> + <RegExp input="$$1" output="<entity><title>\2</title><disambiguation>\4</disambiguation><url cache="mb-\1-artist.xml">$INFO[mbsite]/ws/2/artist/\1?inc=url-rels</url></entity>" dest="9"> + <expression repeat="yes" noclean="1">artist\sid="([^"]*)"(?:\stype="[^"]*")*(?:\stype-id="[^"]*")*?\s.*?score="[^"]*"><name>([^<]*)</name>(<sort-name>[^<]*</sort-name>)?(?:<gender>[^<]*</gender>)*(?:<country>[^<]*</country>)*(?:<area.*?</area>)*(?:<begin-area.*?</begin-area>)*(?:<disambiguation>(.*?)</disambiguation>)*</expression> </RegExp> <RegExp input="$$9" output="\1" dest="5"> <expression noclean="1">(.+)</expression> diff --git a/addons/metadata.artists.universal/changelog.txt b/addons/metadata.artists.universal/changelog.txt index b29163f255..c43c42a937 100644 --- a/addons/metadata.artists.universal/changelog.txt +++ b/addons/metadata.artists.universal/changelog.txt @@ -1,3 +1,7 @@ +[B]4.3.0[/B] +added: fetch disambiguation for GetArtistSearchResults + + [B]4.2.1[/B] fixed: dependency error |