diff options
| author | Martijn Kaijser <mcm.kaijser@gmail.com> | 2016-12-18 11:04:24 +0100 |
|---|---|---|
| committer | Martijn Kaijser <mcm.kaijser@gmail.com> | 2016-12-18 11:04:24 +0100 |
| commit | 99ee755f914e7cb1ca624139ec5eb198397a954e (patch) | |
| tree | 2b5b7fdb557e77cf761c3e50159c92c534eb510d /addons/metadata.artists.universal | |
| parent | 27efd7189e142a46bb9739cc86f0ce05df6a498d (diff) | |
[addons] update scrapers
Diffstat (limited to 'addons/metadata.artists.universal')
5 files changed, 34 insertions, 13 deletions
diff --git a/addons/metadata.artists.universal/addon.xml b/addons/metadata.artists.universal/addon.xml index 09b7e1ff42..ac0657bb96 100644 --- a/addons/metadata.artists.universal/addon.xml +++ b/addons/metadata.artists.universal/addon.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.artists.universal" name="Universal Artist Scraper" - version="3.6.2" + version="3.7.2" provider-name="Olympia, Team Kodi"> <requires> <import addon="xbmc.metadata" version="2.1.0"/> <import addon="metadata.common.allmusic.com" version="3.1.0"/> <import addon="metadata.common.fanart.tv" version="3.1.0"/> <import addon="metadata.common.htbackdrops.com" version="1.3.2"/> - <import addon="metadata.common.musicbrainz.org" version="2.0.2"/> + <import addon="metadata.common.musicbrainz.org" version="2.1.0"/> <import addon="metadata.common.theaudiodb.com" version="1.8.1"/> </requires> <extension point="xbmc.metadata.scraper.artists" diff --git a/addons/metadata.artists.universal/artistuniversal.xml b/addons/metadata.artists.universal/artistuniversal.xml index 7328695964..2ebe836da7 100644 --- a/addons/metadata.artists.universal/artistuniversal.xml +++ b/addons/metadata.artists.universal/artistuniversal.xml @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <scraper framework="1.1" date="2013-05-29"> <NfoUrl dest="3"> - <RegExp input="$$1" output="<url>http://musicbrainz.org/ws/2/artist/\1?inc=url-rels</url>" 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> </RegExp> </NfoUrl> <ResolveIDToUrl dest="3"> - <RegExp input="$$1" output="<url>http://musicbrainz.org/ws/2/artist/\1?inc=url-rels</url>" dest="3"> + <RegExp input="$$1" output="<url>$INFO[mbsite]/ws/2/artist/\1?inc=url-rels</url>" dest="3"> <expression>(.+)</expression> </RegExp> </ResolveIDToUrl> <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>$INFO[mbsite]/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> @@ -33,10 +33,10 @@ </CreateArtistSearchUrl> <GetArtistSearchResults dest="8"> <RegExp input="$$5" output="<results sorted="yes">\1</results>" dest="8"> - <RegExp input="$$1" output="<entity><title>\2</title><genre>\7</genre><url cache="mb-\1-artist.xml">http://musicbrainz.org/ws/2/artist/\1?inc=url-rels</url></entity>" dest="9"> + <RegExp input="$$1" output="<entity><title>\2</title><genre>\7</genre><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 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://musicbrainz.org/ws/2/artist/\1?inc=url-rels</url></entity>" dest="9"> + <RegExp input="$$1" output="<entity><title>\2</title><genre>\7</genre><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 ext:score="[^"]*"(?:\stype="[^"]*")* id="([^"]*)"><name>([^<]*)</name>(<sort-name>[^<]*</sort-name>)?(<gender>[^<]*</gender>)?(<country>[^<]*</country>)?(<disambiguation>([^<]*))?</expression> </RegExp> <RegExp input="$$9" output="\1" dest="5"> @@ -48,18 +48,18 @@ <GetArtistDetails dest="3" clearbuffers="no"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> <!--MBID - Artist--> - <RegExp input="$$1" output="\1" dest="8"> - <expression noclean="1"><artist(?:\stype="[^"]*")*\sid="([^"]*)"><name>([^<]*)</expression> + <RegExp input="$$1" output="\1" dest="5"> + <expression noclean="1"><artist(.*?)<name>([^<]*)</expression> </RegExp> - <RegExp input="$$1" output="\1" dest="8+"> - <expression noclean="1"><artist\sid="([^"]*)"(?:\stype="[^"]*")*><name>([^<]*)</expression> + <RegExp input="$$5" output="\1" dest="8"> + <expression noclean="1">\sid="([^"]*)"</expression> </RegExp> <!--AMGID - Artist--> <RegExp input="$$1" output="\2" dest="9"> <expression noclean="1">>http://(www.)?allmusic.com/artist/([^<]*)</expression> </RegExp> - <RegExp input="$$1" output="<musicBrainzArtistID>\1</musicBrainzArtistID><name>\2</name>" dest="5"> - <expression noclean="1"><artist(?:\stype="[^"]*")* id="([^"]*)"><name>([^<]*)</expression> + <RegExp input="$$1" output="<musicBrainzArtistID>$$8</musicBrainzArtistID><name>\2</name>" dest="5"> + <expression noclean="1"><artist(.*?)<name>([^<]*)</expression> </RegExp> <RegExp input="$$8" conditional="fanarttvthumbs" output="<chain function="GetFanartTvArtistThumbsByMBID">\1</chain>" dest="5+"> <expression noclean="1">(.+)</expression> diff --git a/addons/metadata.artists.universal/changelog.txt b/addons/metadata.artists.universal/changelog.txt index 8ae6ae499f..e68e38ed66 100644 --- a/addons/metadata.artists.universal/changelog.txt +++ b/addons/metadata.artists.universal/changelog.txt @@ -1,3 +1,12 @@ +[B]3.7.2[/B] +Fixed: another try to fix all scenarios for mbid resolution + +[B]3.7.1[/B] +Fixed: mbid resolution under certain scenarios + +[B]3.7.0[/B] +Added: ability to define MusicBrainz mirror + [B]3.6.2[/B] Update author name diff --git a/addons/metadata.artists.universal/resources/language/English/strings.po b/addons/metadata.artists.universal/resources/language/English/strings.po index 039915e21b..fff6edc775 100644 --- a/addons/metadata.artists.universal/resources/language/English/strings.po +++ b/addons/metadata.artists.universal/resources/language/English/strings.po @@ -112,4 +112,12 @@ msgstr "" msgctxt "#30024" msgid "Fallback to Artist Moods from" +msgstr "" + +msgctxt "#30025" +msgid "MB Mirror" +msgstr "" + +msgctxt "#30026" +msgid "MusicBrainz Mirror" 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 97e381f165..2afc9f934d 100644 --- a/addons/metadata.artists.universal/resources/settings.xml +++ b/addons/metadata.artists.universal/resources/settings.xml @@ -36,5 +36,9 @@ <setting label="30023" type="bool" id="tadbfanart" default="true"/> <setting label="30000" type="bool" id="htbfanart" default="true"/> </category> + + <category label="30025"> + <setting label="30026" type="text" id="mbsite" default="http://musicbrainz.org"/> + </category> </settings> |