diff options
| author | Martijn Kaijser <mcm.kaijser@gmail.com> | 2016-12-18 10:49:51 +0100 |
|---|---|---|
| committer | Martijn Kaijser <mcm.kaijser@gmail.com> | 2016-12-18 11:14:31 +0100 |
| commit | 06c564b5aaa0e6442a18c5ab55525f47124f0a07 (patch) | |
| tree | 998cb9bcf72e187228ba8b13f1c257e118469bb3 | |
| parent | 88fe1ce591f5473b688c275d5ce120784e1a6edb (diff) | |
[addons] update scrapers
21 files changed, 115 insertions, 61 deletions
diff --git a/addons/metadata.album.universal/addon.xml b/addons/metadata.album.universal/addon.xml index 236fca39bb..7e73eafa36 100644 --- a/addons/metadata.album.universal/addon.xml +++ b/addons/metadata.album.universal/addon.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.album.universal" name="Universal Album Scraper" - version="2.6.0" + version="2.7.0" 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.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.albums" diff --git a/addons/metadata.album.universal/albumuniversal.xml b/addons/metadata.album.universal/albumuniversal.xml index 64e752aa34..b9c6e69ab0 100644 --- a/addons/metadata.album.universal/albumuniversal.xml +++ b/addons/metadata.album.universal/albumuniversal.xml @@ -1,17 +1,17 @@ <?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/release/\1?inc=recordings+release-groups+artists+labels+ratings</url>" dest="3"> + <RegExp input="$$1" output="<url>$INFO[mbsite]/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url>" dest="3"> <expression>release/(.+)</expression> </RegExp> </NfoUrl> <ResolveIDToUrl dest="3"> - <RegExp input="$$1" output="<url>http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url>" dest="3"> + <RegExp input="$$1" output="<url>$INFO[mbsite]/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url>" dest="3"> <expression>(.+)</expression> </RegExp> </ResolveIDToUrl> <CreateAlbumSearchUrl dest="3"> - <RegExp input="$$1" output="<url>http://search.musicbrainz.org/ws/2/release/?fmt=xml&query=release:%22\1%22%20AND%20(artistname:%22$$4%22%20OR%20artist:%22$$4%22)</url>" dest="3"> + <RegExp input="$$1" output="<url>$INFO[mbsite]/ws/2/release/?fmt=xml&query=release:%22\1%22%20AND%20(artistname:%22$$4%22%20OR%20artist:%22$$4%22)</url>" dest="3"> <RegExp input="$$2" output="\1" dest="4"> <expression noclean="1">(.+)</expression> </RegExp> @@ -26,28 +26,28 @@ </CreateAlbumSearchUrl> <GetAlbumSearchResults dest="8"> <RegExp input="$$5" output="<results sorted="yes">\1</results>" dest="8"> - <RegExp input="$$1" output="<entity><year>\5-\4-T#\6</year><artist>\3</artist><title>\2</title><url cache="mb-\1-album.xml">http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></entity>" dest="5"> + <RegExp input="$$1" output="<entity><year>\5-\4-T#\6</year><artist>\3</artist><title>\2</title><url cache="mb-\1-album.xml">$INFO[mbsite]/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></entity>" dest="5"> <expression repeat="yes">id="([^"]*)"><title>([^<]*)</title><status>Official</status>(?:<packaging>[^<]*</packaging>)?<text-representation>(?:<language>[^<]*</language>)*(?:<script>[^<]*</script>)*</text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>)*</artist-credit><release-group\stype="Album"\sid="[^"]*">(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list>(?:<secondary-type>[^<]*</secondary-type>)+</secondary-type-list>)*</release-group><date>(\d{4})[^<]*</date>(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+)</expression> </RegExp> - <RegExp input="$$1" output="<entity><year>\5-\4-T#\6</year><artist>\3</artist><title>\2</title><url cache="mb-\1-album.xml">http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></entity>" dest="5+"> + <RegExp input="$$1" output="<entity><year>\5-\4-T#\6</year><artist>\3</artist><title>\2</title><url cache="mb-\1-album.xml">$INFO[mbsite]/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></entity>" dest="5+"> <expression repeat="yes">id="([^"]*)"><title>([^<]*)</title><status>Official</status>(?:<packaging>[^<]*</packaging>)?<text-representation>(?:<language>[^<]*</language>)*(?:<script>[^<]*</script>)*</text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>)*</artist-credit><release-group(?:\stype="[^"]*")*\sid="[^"]*">(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list>(?:<secondary-type>[^<]*</secondary-type>)+</secondary-type-list>)*</release-group><date>(\d{4})[^<]*</date>(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+)</expression> </RegExp> - <RegExp input="$$1" output="<entity><year>\5-\4-T#\6</year><artist>\3</artist><title>\2</title><url cache="mb-\1-album.xml">http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></entity>" dest="5+"> + <RegExp input="$$1" output="<entity><year>\5-\4-T#\6</year><artist>\3</artist><title>\2</title><url cache="mb-\1-album.xml">$INFO[mbsite]/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></entity>" dest="5+"> <expression repeat="yes">id="([^"]*)" ext:score="[^"]*"><title>([^<]*)</title><status>Official</status>(?:<disambiguation>[^<]*</disambiguation>)*(?:<packaging>[^<]*</packaging>)?<text-representation>(?:<language>[^<]*</language>)*(?:<script>[^<]*</script>)*</text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>)*</artist-credit><release-group\sid="[^"]*"\stype="Album">(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list>(?:<secondary-type>[^<]*</secondary-type>)+</secondary-type-list>)*</release-group><date>(\d{4})[^<]*</date>(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+)</expression> </RegExp> - <RegExp input="$$1" output="<entity><year>\5-\4-T#\6</year><artist>\3</artist><title>\2</title><url cache="mb-\1-album.xml">http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></entity>" dest="5+"> + <RegExp input="$$1" output="<entity><year>\5-\4-T#\6</year><artist>\3</artist><title>\2</title><url cache="mb-\1-album.xml">$INFO[mbsite]/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></entity>" dest="5+"> <expression repeat="yes">id="([^"]*)" ext:score="[^"]*"><title>([^<]*)</title><status>Official</status>(?:<disambiguation>[^<]*</disambiguation>)*(?:<packaging>[^<]*</packaging>)?<text-representation>(?:<language>[^<]*</language>)*(?:<script>[^<]*<)*/script></text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>)*</artist-credit><release-group\sid="[^"]*"(?:\stype="[^"]*")*>(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list>(?:<secondary-type>[^<]*</secondary-type>)+</secondary-type-list>)*</release-group><date>(\d{4})[^<]*</date>(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+)</expression> </RegExp> - <RegExp input="$$1" output="<entity><year>\5-\4-T#\6</year><artist>\3</artist><title>\2</title><url cache="mb-\1-album.xml">http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></entity>" dest="5+"> + <RegExp input="$$1" output="<entity><year>\5-\4-T#\6</year><artist>\3</artist><title>\2</title><url cache="mb-\1-album.xml">$INFO[mbsite]/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></entity>" dest="5+"> <expression repeat="yes">id="([^"]*)"><title>([^<]*)</title><status>(?!Official)[^<]*</status>(?:<disambiguation>[^<]*</disambiguation>)*(?:<packaging>[^<]*</packaging>)?<text-representation>(?:<language>[^<]*</language>)*(?:<script>[^<]*</script>)*</text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>)*</artist-credit><release-group\stype="Album"\sid="[^"]*">(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list>(?:<secondary-type>[^<]*</secondary-type>)+</secondary-type-list>)*</release-group><date>(\d{4})[^<]*</date>(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+)</expression> </RegExp> - <RegExp input="$$1" output="<entity><year>\5-\4-T#\6</year><artist>\3</artist><title>\2</title><url cache="mb-\1-album.xml">http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></entity>" dest="5+"> + <RegExp input="$$1" output="<entity><year>\5-\4-T#\6</year><artist>\3</artist><title>\2</title><url cache="mb-\1-album.xml">$INFO[mbsite]/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></entity>" dest="5+"> <expression repeat="yes">id="([^"]*)"><title>([^<]*)</title><status>(?!Official)[^<]*</status>(?:<disambiguation>[^<]*</disambiguation>)*(?:<packaging>[^<]*</packaging>)?<text-representation>(?:<language>[^<]*</language>)*(?:<script>[^<]*</script>)*</text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>)*</artist-credit><release-group(?:\stype="[^"]*")*\sid="[^"]*">(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list>(?:<secondary-type>[^<]*</secondary-type>)+</secondary-type-list>)*</release-group><date>(\d{4})[^<]*</date>(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+)</expression> </RegExp> - <RegExp input="$$1" output="<entity><year>\5-\4-T#\6</year><artist>\3</artist><title>\2</title><url cache="mb-\1-album.xml">http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></entity>" dest="5+"> + <RegExp input="$$1" output="<entity><year>\5-\4-T#\6</year><artist>\3</artist><title>\2</title><url cache="mb-\1-album.xml">$INFO[mbsite]/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></entity>" dest="5+"> <expression repeat="yes">id="([^"]*)" ext:score="[^"]*"><title>([^<]*)</title><status>(?!Official)[^<]*</status>(?:<disambiguation>[^<]*</disambiguation>)*(?:<packaging>[^<]*</packaging>)?<text-representation>(?:<language>[^<]*</language>)*(?:<script>[^<]*</script>)*</text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>)*</artist-credit><release-group\sid="[^"]*"\stype="Album">(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list>(?:<secondary-type>[^<]*</secondary-type>)+</secondary-type-list>)*</release-group><date>(\d{4})[^<]*</date>(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+)</expression> </RegExp> - <RegExp input="$$1" output="<entity><year>\5-\4-T#\6</year><artist>\3</artist><title>\2</title><url cache="mb-\1-album.xml">http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></entity>" dest="5+"> + <RegExp input="$$1" output="<entity><year>\5-\4-T#\6</year><artist>\3</artist><title>\2</title><url cache="mb-\1-album.xml">$INFO[mbsite]/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></entity>" dest="5+"> <expression repeat="yes">id="([^"]*)" ext:score="[^"]*"><title>([^<]*)</title><status>(?!Official)[^<]*</status>(?:<disambiguation>[^<]*</disambiguation>)*(?:<packaging>[^<]*</packaging>)?<text-representation>(?:<language>[^<]*</language>)*(?:<script>[^<]*</script>)*</text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>)*</artist-credit><release-group\sid="[^"]*"(?:\stype="[^"]*")*>(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list>(?:<secondary-type>[^<]*</secondary-type>)+</secondary-type-list>)*</release-group><date>(\d{4})[^<]*</date>(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+)</expression> </RegExp> <expression noclean="1" /> @@ -92,7 +92,7 @@ <RegExp input="$$3" output="<chain function="GetMBAlbumTracksByMBID">\1</chain>" dest="5+"> <expression noclean="1">(.+)</expression> </RegExp> - <RegExp input="$INFO[albumreviewsource]" output="<url function="GetAMGAlbumReview" cache="mb-$$4-rg.xml">http://musicbrainz.org/ws/2/release-group/$$4?inc=url-rels</url>" dest="5+"> + <RegExp input="$INFO[albumreviewsource]" output="<url function="GetAMGAlbumReview" cache="mb-$$4-rg.xml">$INFO[mbsite]/ws/2/release-group/$$4?inc=url-rels</url>" dest="5+"> <expression>allmusic.com</expression> </RegExp> <RegExp input="$INFO[albumreviewsource]" output="<chain function="GetTADBAlbumReviewByMBID">$$4</chain>" dest="5+"> @@ -101,25 +101,25 @@ <RegExp input="$INFO[albumratingsource]" output="<chain function="GetMBAlbumRatingByMBID">$$3</chain>" dest="5+"> <expression>MusicBrainz</expression> </RegExp> - <RegExp input="$INFO[albumratingsource]" output="<url function="GetAMGAlbumRating" cache="mb-$$4-rg.xml">http://musicbrainz.org/ws/2/release-group/$$4?inc=url-rels</url>" dest="5+"> + <RegExp input="$INFO[albumratingsource]" output="<url function="GetAMGAlbumRating" cache="mb-$$4-rg.xml">$INFO[mbsite]/ws/2/release-group/$$4?inc=url-rels</url>" dest="5+"> <expression>allmusic.com</expression> </RegExp> <RegExp input="$INFO[albumratingsource]" output="<chain function="GetTADBAlbumRatingByMBID">$$4</chain>" dest="5+"> <expression>TheAudioDb.com</expression> </RegExp> - <RegExp input="$INFO[albumstylessource]" output="<url function="GetAMGAlbumStyles" cache="mb-$$4-rg.xml">http://musicbrainz.org/ws/2/release-group/$$4?inc=url-rels</url>" dest="5+"> + <RegExp input="$INFO[albumstylessource]" output="<url function="GetAMGAlbumStyles" cache="mb-$$4-rg.xml">$INFO[mbsite]/ws/2/release-group/$$4?inc=url-rels</url>" dest="5+"> <expression>allmusic.com</expression> </RegExp> <RegExp input="$INFO[albumstylessource]" output="<chain function="GetTADBAlbumStylesByMBID">$$4</chain>" dest="5+"> <expression>TheAudioDb.com</expression> </RegExp> - <RegExp input="$INFO[albummoodssource]" output="<url function="GetAMGAlbumMoods" cache="mb-$$4-rg.xml">http://musicbrainz.org/ws/2/release-group/$$4?inc=url-rels</url>" dest="5+"> + <RegExp input="$INFO[albummoodssource]" output="<url function="GetAMGAlbumMoods" cache="mb-$$4-rg.xml">$INFO[mbsite]/ws/2/release-group/$$4?inc=url-rels</url>" dest="5+"> <expression>allmusic.com</expression> </RegExp> <RegExp input="$INFO[albummoodssource]" output="<chain function="GetTADBAlbumMoodsByMBID">$$4</chain>" dest="5+"> <expression>TheAudioDb.com</expression> </RegExp> - <RegExp input="$INFO[albumthemessource]" output="<url function="GetAMGAlbumThemes" cache="mb-$$4-rg.xml">http://musicbrainz.org/ws/2/release-group/$$4?inc=url-rels</url>" dest="5+"> + <RegExp input="$INFO[albumthemessource]" output="<url function="GetAMGAlbumThemes" cache="mb-$$4-rg.xml">$INFO[mbsite]/ws/2/release-group/$$4?inc=url-rels</url>" dest="5+"> <expression>allmusic.com</expression> </RegExp> <RegExp input="$INFO[albumthemessource]" output="<chain function="GetTADBAlbumThemeByMBID">$$4</chain>" dest="5+"> @@ -131,7 +131,7 @@ <RegExp conditional="tadbalbumthumbs" input="$$4" output="<chain function="GetTADBAlbumThumbsByMBID">\1</chain>" dest="5+"> <expression noclean="1">(.+)</expression> </RegExp> - <RegExp conditional="allmusicalbumthumbs" input="$$4" output="<url function="GetAMGAlbumThumbs" cache="mb-\1-rg.xml">http://musicbrainz.org/ws/2/release-group/\1?inc=url-rels</url>" dest="5+"> + <RegExp conditional="allmusicalbumthumbs" input="$$4" output="<url function="GetAMGAlbumThumbs" cache="mb-\1-rg.xml">$INFO[mbsite]/ws/2/release-group/\1?inc=url-rels</url>" dest="5+"> <expression noclean="1">(.+)</expression> </RegExp> <expression noclean="1" /> diff --git a/addons/metadata.album.universal/changelog.txt b/addons/metadata.album.universal/changelog.txt index 990eb44a66..ad402b1d37 100644 --- a/addons/metadata.album.universal/changelog.txt +++ b/addons/metadata.album.universal/changelog.txt @@ -1,3 +1,6 @@ +[B]2.7.0[/B] +Added: ability to define MusicBrainz mirror + [B]2.6.0[/B] Added: Theme support from theaudiodb.com diff --git a/addons/metadata.album.universal/resources/language/English/strings.po b/addons/metadata.album.universal/resources/language/English/strings.po index 214aa300c3..95dc7344a8 100644 --- a/addons/metadata.album.universal/resources/language/English/strings.po +++ b/addons/metadata.album.universal/resources/language/English/strings.po @@ -59,3 +59,11 @@ msgstr "" msgctxt "#30010" msgid "Grab Album Thumbs from theaudiodb.com" msgstr "" + +msgctxt "#30011" +msgid "MB Mirror" +msgstr "" + +msgctxt "#30012" +msgid "MusicBrainz Mirror" +msgstr ""
\ No newline at end of file diff --git a/addons/metadata.album.universal/resources/settings.xml b/addons/metadata.album.universal/resources/settings.xml index 740312789d..05467b8903 100644 --- a/addons/metadata.album.universal/resources/settings.xml +++ b/addons/metadata.album.universal/resources/settings.xml @@ -17,4 +17,8 @@ <setting label="30010" type="bool" id="tadbalbumthumbs" default="true"/> <setting label="30008" type="bool" id="allmusicalbumthumbs" default="false"/> </category> + + <category label="30011"> + <setting label="30012" type="text" id="mbsite" default="http://musicbrainz.org"/> + </category> </settings> 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> diff --git a/addons/metadata.common.fanart.tv/addon.xml b/addons/metadata.common.fanart.tv/addon.xml index 6645e6bbd8..60270c382a 100644 --- a/addons/metadata.common.fanart.tv/addon.xml +++ b/addons/metadata.common.fanart.tv/addon.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.common.fanart.tv" name="fanart.tv Scraper Library" - version="3.1.3" + version="3.1.4" provider-name="Team Kodi"> <requires> <import addon="xbmc.metadata" version="2.1.0"/> diff --git a/addons/metadata.common.fanart.tv/fanarttv.xml b/addons/metadata.common.fanart.tv/fanarttv.xml index b046e070aa..7acac7dde3 100644 --- a/addons/metadata.common.fanart.tv/fanarttv.xml +++ b/addons/metadata.common.fanart.tv/fanarttv.xml @@ -16,8 +16,8 @@ <RegExp input="$$1" output="\1" dest="16"> <expression noclean="1">"artistthumb":\s\[(.*?)\}\s*\]</expression> </RegExp> - <RegExp input="$$16" output="<thumb preview="\1/preview">\1</thumb>" dest="13"> - <expression repeat="yes" noclean="1">"id":\s"\d*",\s*"url":\s"([^"]*)</expression> + <RegExp input="$$16" output="<thumb preview="http://\1/preview/\2">http://\1/fanart/\2</thumb>" dest="13"> + <expression repeat="yes" noclean="1">"id":\s"\d*",\s*"url":\s"http://([^/]*)/fanart/([^"]*)</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -42,8 +42,8 @@ <RegExp input="$$1" output="\1" dest="16"> <expression noclean="1">"artistbackground":\s\[(.*?)\}\s*\]</expression> </RegExp> - <RegExp input="$$16" output="<thumb preview="\1/preview">\1</thumb>" dest="14"> - <expression repeat="yes" noclean="1">"id":\s"\d*",\s*"url":\s"([^"]*)</expression> + <RegExp input="$$16" output="<thumb preview="http://\1/preview/\2">http://\1/fanart/\2</thumb>" dest="14"> + <expression repeat="yes" noclean="1">"id":\s"\d*",\s*"url":\s"http://([^/]*)/fanart/([^"]*)</expression> </RegExp> <RegExp input="$$14" output="\1" dest="13"> <expression noclean="1">(.+)</expression> @@ -68,8 +68,8 @@ <RegExp input="$$1" output="\1" dest="16"> <expression noclean="1">"albumcover":\s\[(.*?)\}\s*\]</expression> </RegExp> - <RegExp input="$$16" output="<thumb preview="\1/preview">\1</thumb>" dest="13"> - <expression repeat="yes" noclean="1">"id":\s"\d*",\s*"url":\s"([^"]*)</expression> + <RegExp input="$$16" output="<thumb preview="http://\1/preview/\2">http://\1/fanart/\2</thumb>" dest="13"> + <expression repeat="yes" noclean="1">"id":\s"\d*",\s*"url":\s"http://([^/]*)/fanart/([^"]*)</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -97,8 +97,8 @@ <RegExp input="$$1" output="\1" dest="16"> <expression noclean="1">"moviebackground":\s\[(.*?)\}\s*\]</expression> </RegExp> - <RegExp input="$$16" output="<thumb preview="\1/preview">\1</thumb>" dest="14"> - <expression repeat="yes" noclean="1">"id":\s"\d*",\s*"url":\s"([^"]*)</expression> + <RegExp input="$$16" output="<thumb preview="http://\1/preview/\2">http://\1/fanart/\2</thumb>" dest="14"> + <expression repeat="yes" noclean="1">"id":\s"\d*",\s*"url":\s"http://([^/]*)/fanart/([^"]*)</expression> </RegExp> <RegExp input="$$14" output="\1" dest="13"> <expression noclean="1">(.+)</expression> @@ -126,8 +126,8 @@ <RegExp input="$$1" output="\1" dest="16"> <expression noclean="1">"movieposter":\s\[(.*?)\}\s*\]</expression> </RegExp> - <RegExp input="$$16" output="<thumb preview="\1/preview">\1</thumb>" dest="13"> - <expression repeat="yes" noclean="1">"id":\s"\d*",\s*"url":\s"([^"]*)</expression> + <RegExp input="$$16" output="<thumb preview="http://\1/preview/\2">http://\1/fanart/\2</thumb>" dest="13"> + <expression repeat="yes" noclean="1">"id":\s"\d*",\s*"url":\s"http://([^/]*)/fanart/([^"]*)</expression> </RegExp> <expression noclean="1" /> </RegExp> diff --git a/addons/metadata.common.imdb.com/addon.xml b/addons/metadata.common.imdb.com/addon.xml index e5223d095f..2d3b3d0ad8 100644 --- a/addons/metadata.common.imdb.com/addon.xml +++ b/addons/metadata.common.imdb.com/addon.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.common.imdb.com" name="IMDB Scraper Library" - version="2.8.5" + version="2.8.7" provider-name="Team Kodi"> <requires> <import addon="xbmc.metadata" version="2.1.0"/> diff --git a/addons/metadata.common.imdb.com/changelog.txt b/addons/metadata.common.imdb.com/changelog.txt index 59c8e21022..9d4ea1ba8f 100644 --- a/addons/metadata.common.imdb.com/changelog.txt +++ b/addons/metadata.common.imdb.com/changelog.txt @@ -1,3 +1,9 @@ +[B]2.8.7[/B] +- fixed: IMDb countries + +[B]2.8.6[/B] +- fixed: metacritic rating in further scenarios + [B]2.8.5[/B] - fixed: metacritic rating diff --git a/addons/metadata.common.imdb.com/imdb.xml b/addons/metadata.common.imdb.com/imdb.xml index 4268d75231..81c3d577be 100644 --- a/addons/metadata.common.imdb.com/imdb.xml +++ b/addons/metadata.common.imdb.com/imdb.xml @@ -63,8 +63,11 @@ </GetIMDBCountryById> <ParseIMDBCountry dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> - <RegExp input="$$1" output="<country>\1</country>" dest="2"> - <expression repeat="yes">"/country/[^>]+>([^<]+)</a></expression> + <RegExp input="$$1" output="\1" dest="6"> + <expression clear="yes" noclean="1">Country:[^>]+>(.*?)</div></expression> + </RegExp> + <RegExp input="$$6" output="<country>\1</country>" dest="2"> + <expression repeat="yes">itemprop='url'>([^<]+)</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -78,7 +81,7 @@ <ParseMetaCriticRating dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<rating>\1.\2</rating>" dest="2"> - <expression><div\sclass="metacriticScore\sscore_favorable\stitleReviewBarSubItem">.*?<span>(\d*)(\d)</expression> + <expression><div\sclass="metacriticScore\sscore_[^\s]+\stitleReviewBarSubItem">.*?<span>(\d*)(\d)</expression> </RegExp> <expression noclean="1" /> </RegExp> diff --git a/addons/metadata.common.musicbrainz.org/addon.xml b/addons/metadata.common.musicbrainz.org/addon.xml index ee77fbfbe9..0a3eaeb92a 100644 --- a/addons/metadata.common.musicbrainz.org/addon.xml +++ b/addons/metadata.common.musicbrainz.org/addon.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.common.musicbrainz.org" name="MusicBrainz Scraper Library" - version="2.0.5" + version="2.1.1" provider-name="Team Kodi"> <requires> <import addon="xbmc.metadata" version="2.1.0"/> diff --git a/addons/metadata.common.musicbrainz.org/musicbrainz.xml b/addons/metadata.common.musicbrainz.org/musicbrainz.xml index 61e39e4e1e..1159e75f53 100644 --- a/addons/metadata.common.musicbrainz.org/musicbrainz.xml +++ b/addons/metadata.common.musicbrainz.org/musicbrainz.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <scraperfunctions> <GetMBDiscographyByMBID dest="5" clearbuffers="no"> - <RegExp input="$$1" output="<details><url function="ParseMBDiscography" cache="mb-\1-discog.xml">http://musicbrainz.org/ws/2/release-group?artist=\1&amp;limit=100&amp;type=album</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url function="ParseMBDiscography" cache="mb-\1-discog.xml">$INFO[mbsite]/ws/2/release-group?artist=\1&amp;limit=100&amp;type=album</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetMBDiscographyByMBID> @@ -11,14 +11,14 @@ <expression /> </RegExp> <RegExp input="$$1" output="<album><year>\5</year><title>\3</title><label>\1\2</label></album>" dest="2"> - <expression repeat="yes" clear="yes" fixchars="1,2,3" noclean="1,2,3">(?: id="([^"]*)")? type="Album"(?: id="([^"]*)")?><title>([^<]*)</title><first-release-date(\s/)?>(\d{4})?</expression> + <expression repeat="yes" clear="yes" noclean="1,2,3">(?:\stype-id="[^"]*")?(?:\sid="([^"]*)")?\stype="Album"(?:\stype-id="[^"]*")?(?:\sid="([^"]*)")?><title>([^<]*)</title><first-release-date(\s/)?>(\d{4})?</expression> </RegExp> <expression noclean="1" /> </RegExp> </ParseMBDiscography> <GetMBLafeSpanByMBID dest="5" clearbuffers="no"> - <RegExp input="$$1" output="<details><url function="ParseMBLifeSpan" cache="mb-\1-artist.xml">http://musicbrainz.org/ws/2/artist/\1?inc=url-rels</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url function="ParseMBLifeSpan" cache="mb-\1-artist.xml">$INFO[mbsite]/ws/2/artist/\1?inc=url-rels</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetMBLafeSpanByMBID> @@ -59,7 +59,7 @@ </ParseMBLifeSpan> <GetMBFallbackLafeSpanByMBID dest="5" clearbuffers="no"> - <RegExp input="$$1" output="<details><url function="ParseFallbackMBLifeSpan" cache="mb-\1-artist.xml">http://musicbrainz.org/ws/2/artist/\1?inc=url-rels</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url function="ParseFallbackMBLifeSpan" cache="mb-\1-artist.xml">$INFO[mbsite]/ws/2/artist/\1?inc=url-rels</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetMBFallbackLafeSpanByMBID> @@ -85,7 +85,7 @@ </ParseFallbackMBLifeSpan> <GetMBAlbumTitleByMBID dest="5"> - <RegExp input="$$1" output="<details><url function="ParseMBAlbumTitle" cache="mb-\1-album.xml">http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url function="ParseMBAlbumTitle" cache="mb-\1-album.xml">$INFO[mbsite]/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetMBAlbumTitleByMBID> @@ -99,7 +99,7 @@ </ParseMBAlbumTitle> <GetMBAlbumArtistsByMBID dest="5"> - <RegExp input="$$1" output="<details><url function="ParseMBAlbumArtists" cache="mb-\1-album.xml">http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url function="ParseMBAlbumArtists" cache="mb-\1-album.xml">$INFO[mbsite]/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetMBAlbumArtistsByMBID> @@ -113,7 +113,7 @@ </ParseMBAlbumArtists> <GetMBAlbumArtistByMBID dest="5"> - <RegExp input="$$1" output="<details><url function="ParseMBAlbumArtist" cache="mb-\1-album.xml">http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url function="ParseMBAlbumArtist" cache="mb-\1-album.xml">$INFO[mbsite]/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetMBAlbumArtistByMBID> @@ -127,7 +127,7 @@ </ParseMBAlbumArtist> <GetMBAlbumRatingByMBID dest="5"> - <RegExp input="$$1" output="<details><url function="ParseMBAlbumRating" cache="mb-\1-album.xml">http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url function="ParseMBAlbumRating" cache="mb-\1-album.xml">$INFO[mbsite]/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetMBAlbumRatingByMBID> @@ -141,7 +141,7 @@ </ParseMBAlbumRating> <GetMBAlbumLabelByMBID dest="5"> - <RegExp input="$$1" output="<details><url function="ParseMBAlbumLabel" cache="mb-\1-album.xml">http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url function="ParseMBAlbumLabel" cache="mb-\1-album.xml">$INFO[mbsite]/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetMBAlbumLabelByMBID> @@ -155,7 +155,7 @@ </ParseMBAlbumLabel> <GetMBAlbumDateByMBID dest="5"> - <RegExp input="$$1" output="<details><url function="ParseMBAlbumDate" cache="mb-\1-album.xml">http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url function="ParseMBAlbumDate" cache="mb-\1-album.xml">$INFO[mbsite]/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetMBAlbumDateByMBID> @@ -172,7 +172,7 @@ </ParseMBAlbumDate> <GetMBAlbumTracksByMBID dest="5"> - <RegExp input="$$1" output="<details><url function="ParseMBAlbumTracks" cache="mb-\1-album.xml">http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url function="ParseMBAlbumTracks" cache="mb-\1-album.xml">$INFO[mbsite]/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetMBAlbumTracksByMBID> diff --git a/addons/metadata.themoviedb.org/addon.xml b/addons/metadata.themoviedb.org/addon.xml index bcb1ccd333..042bde1023 100644 --- a/addons/metadata.themoviedb.org/addon.xml +++ b/addons/metadata.themoviedb.org/addon.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.themoviedb.org" name="The Movie Database" - version="3.9.0" + version="3.9.2" provider-name="Team Kodi"> <requires> <import addon="xbmc.metadata" version="2.1.0"/> diff --git a/addons/metadata.themoviedb.org/changelog.txt b/addons/metadata.themoviedb.org/changelog.txt index 785e6455a6..c407bdcf1e 100644 --- a/addons/metadata.themoviedb.org/changelog.txt +++ b/addons/metadata.themoviedb.org/changelog.txt @@ -1,3 +1,9 @@ +[B]3.9.2[/B] +- added: some new languages + +[B]3.9.1[/B] +- added: premiered tag with full release date + [B]3.9.0[/B] - Update diff --git a/addons/metadata.themoviedb.org/resources/settings.xml b/addons/metadata.themoviedb.org/resources/settings.xml index 45ce0c7e19..e59a57950d 100644 --- a/addons/metadata.themoviedb.org/resources/settings.xml +++ b/addons/metadata.themoviedb.org/resources/settings.xml @@ -3,7 +3,7 @@ <setting label="30005" type="bool" id="keeporiginaltitle" default="false"/> <setting label="30000" type="bool" id="fanart" default="true"/> <setting label="30004" type="bool" id="trailer" default="true"/> - <setting label="30002" type="select" values="bg|cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nb|nl|no|pl|pt|ro|ru|sk|sl|sr|sv|th|tr|uk|zh" id="language" default="en"/> + <setting label="30002" type="select" values="bg|cs|da|de|el|en|es|fa|fa-ir|fi|fr|he|hr|hu|it|ja|ko|nb|nl|no|pl|pt|pt-br|ro|ru|sk|sl|sr|sv|th|tr|uk|zh" id="language" default="en"/> <setting label="30006" type="select" values="au|bg|cs|da|de|el|es|fi|fr|gb|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|th|tr|us|zh" id="tmdbcertcountry" default="us"/> <setting label="30003" type="labelenum" values="TMDb|IMDb" id="RatingS" default="TMDb"/> <setting label="certprefix" type="text" id="certprefix" default="Rated " visible="false"/> diff --git a/addons/metadata.themoviedb.org/tmdb.xml b/addons/metadata.themoviedb.org/tmdb.xml index d41dd09ebb..4004b6eeb7 100644 --- a/addons/metadata.themoviedb.org/tmdb.xml +++ b/addons/metadata.themoviedb.org/tmdb.xml @@ -56,6 +56,9 @@ <RegExp input="$$1" output="<year>\1</year>" dest="5+"> <expression noclean="1">"release_date":"([0-9]+)-</expression> </RegExp> + <RegExp input="$$1" output="<premiered>\1</premiered>" dest="5+"> + <expression noclean="1">"release_date":"([^"]*)</expression> + </RegExp> <RegExp input="$$1" output="\1" dest="10"> <expression clear="yes" noclean="1">"runtime":([0-9]+)</expression> </RegExp> |