diff options
19 files changed, 83 insertions, 32 deletions
diff --git a/addons/metadata.album.universal/addon.xml b/addons/metadata.album.universal/addon.xml index f710bda01d..d4b6afcb13 100644 --- a/addons/metadata.album.universal/addon.xml +++ b/addons/metadata.album.universal/addon.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.album.universal" name="Universal Album Scraper" version="2.7.3" 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"> diff --git a/addons/metadata.common.allmusic.com/addon.xml b/addons/metadata.common.allmusic.com/addon.xml index 4ad0f28fb0..2c2bf34bf8 100644 --- a/addons/metadata.common.allmusic.com/addon.xml +++ b/addons/metadata.common.allmusic.com/addon.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.common.allmusic.com" name="AllMusic Scraper Library" version="3.1.1" diff --git a/addons/metadata.common.imdb.com/imdb.xml b/addons/metadata.common.imdb.com/imdb.xml index 3432f8cb54..b5a5b35efb 100644 --- a/addons/metadata.common.imdb.com/imdb.xml +++ b/addons/metadata.common.imdb.com/imdb.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?> <scraperfunctions> <GetIMDBGenresById dest="5"> <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBGenres">http://akas.imdb.com/title/$$1/|accept-language=en-us</url></details>" dest="5"> diff --git a/addons/metadata.common.musicbrainz.org/addon.xml b/addons/metadata.common.musicbrainz.org/addon.xml index 200e1d340d..b73d251fc1 100644 --- a/addons/metadata.common.musicbrainz.org/addon.xml +++ b/addons/metadata.common.musicbrainz.org/addon.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.common.musicbrainz.org" name="MusicBrainz Scraper Library" version="2.1.2" diff --git a/addons/metadata.common.theaudiodb.com/addon.xml b/addons/metadata.common.theaudiodb.com/addon.xml index 5504b794ff..b25f09b14c 100644 --- a/addons/metadata.common.theaudiodb.com/addon.xml +++ b/addons/metadata.common.theaudiodb.com/addon.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.common.theaudiodb.com" name="TheAudioDb Scraper Library" version="1.9.1" diff --git a/addons/metadata.themoviedb.org/addon.xml b/addons/metadata.themoviedb.org/addon.xml index 7a914e3819..a5e5bab6d2 100644 --- a/addons/metadata.themoviedb.org/addon.xml +++ b/addons/metadata.themoviedb.org/addon.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.themoviedb.org" name="The Movie Database" - version="5.0.2" + version="5.1.1" provider-name="Team Kodi"> <requires> <import addon="xbmc.metadata" version="2.1.0"/> <import addon="metadata.common.imdb.com" version="2.9.2"/> - <import addon="metadata.common.themoviedb.org" version="2.17.6"/> + <import addon="metadata.common.themoviedb.org" version="3.1.0"/> <import addon="plugin.video.youtube" version="4.4.10" optional="true"/> </requires> <extension point="xbmc.metadata.scraper.movies" diff --git a/addons/metadata.themoviedb.org/changelog.txt b/addons/metadata.themoviedb.org/changelog.txt index 35d33e76be..ac2ccfee59 100644 --- a/addons/metadata.themoviedb.org/changelog.txt +++ b/addons/metadata.themoviedb.org/changelog.txt @@ -1,3 +1,12 @@ +[B]5.1.1[/B] +- changed: more cleanup and fixes + +[B]5.1.0[/B] +- changed: major code clean-up of tmdb common scraper library + +[B]5.0.3[/B] +- changed: made imdb uniqueid default when available + [B]5.0.2[/B] - changed: made tmdb uniqueid consistent with documentation diff --git a/addons/metadata.themoviedb.org/resources/settings.xml b/addons/metadata.themoviedb.org/resources/settings.xml index 6241d2701c..5425952108 100644 --- a/addons/metadata.themoviedb.org/resources/settings.xml +++ b/addons/metadata.themoviedb.org/resources/settings.xml @@ -3,8 +3,8 @@ <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|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-cn|zh-tw" 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="30002" type="select" values="ar-AE|ar-SA|bg|bn-BD|ca-ES|ch-GU|cs|da|de|el|en|eo-EO|es|es-MX|eu-ES|fa|fa-ir|fi|fr|fr-CA|he|hi-IN|hr|hu|id-ID|it|ja|ka-GE|ko|lt-LT|lv-LV|ml-IN|nb|nl|no|pl|pt|pt-br|ro|ru|sk|sl|sr|sv|ta-IN|th|tr|uk|vi-VN|zh-cn|zh-tw" id="language" default="en"/> + <setting label="30006" type="select" values="au|bg|br|ca|cz|ge|de|dk|ee|es|fi|fr|gb|gr|hr|hu|id|il|in|it|ir|jp|kr|lt|lv|mx|nl|no|pl|pt|ru|si|sv|th|tr|ua|us|vn|zh" id="tmdbcertcountry" default="us"/> <setting label="30003" type="labelenum" values="TMDb|IMDb" id="RatingS" default="TMDb"/> <setting label="30007" type="bool" id="imdbanyway" visible="eq(-1,0)" default="false"/> <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 b847267aa3..390ec171d7 100644 --- a/addons/metadata.themoviedb.org/tmdb.xml +++ b/addons/metadata.themoviedb.org/tmdb.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?> <scraper framework="1.1" date="2012-01-16"> <CreateSearchUrl dest="3"> <RegExp input="$$1" output="<url>https://api.tmdb.org/3/search/movie?api_key=ecbc86c92da237cb9faff6d3ddc4be6d&amp;query=\1&amp;year=$$4&amp;language=$INFO[language]</url>" dest="3"> @@ -44,13 +44,13 @@ </GetSearchResults> <GetDetails dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> - <RegExp input="$$1" output="<uniqueid type="tmdb" default="true">$$2</uniqueid>" dest="5"> - <expression/> - </RegExp> <RegExp input="$$1" output="\1" dest="11"> <expression clear="yes" noclean="1">"id":[0-9]*,"imdb_id":"([^"]*)</expression> </RegExp> - <RegExp input="$$11" output="<uniqueid type="imdb">\1</uniqueid>" dest="5+"> + <RegExp input="$$11|default="true"" output="<uniqueid type="tmdb" \1>$$2</uniqueid>" dest="5"> + <expression>^\|(default="true")|tt[0-9]+</expression> + </RegExp> + <RegExp input="$$11" output="<uniqueid type="imdb" default="true">\1</uniqueid>" dest="5+"> <expression>(.+)</expression> </RegExp> <RegExp input="$$1" output="\1" dest="9"> @@ -59,7 +59,7 @@ <RegExp conditional="keeporiginaltitle" input="$$9" output="<title>\1</title>" dest="5+"> <expression/> </RegExp> - <RegExp conditional="!keeporiginaltitle" input="$$2" output="<chain function="GetTMDBTitleByIdChain">$$2</chain>" dest="5+"> + <RegExp conditional="!keeporiginaltitle" input="$$2" output="<chain function="GetTMDBTitleByIdChain">$$2::$INFO[language]</chain>" dest="5+"> <expression /> </RegExp> <RegExp input="$$9" output="<originaltitle>\1</originaltitle>" dest="5+"> @@ -83,13 +83,13 @@ <RegExp input="$$11|$INFO[RatingS]|default|$INFO[imdbanyway]" output="<chain function="GetIMDBRatingsById">$$11\1</chain>" dest="5+"> <expression>tt[0-9]+\|(?:IMDb(\|default)|.*true$)</expression> </RegExp> - <RegExp input="$INFO[RatingS]|default" output="<chain function="GetTMDBRatingsByIdChain">$$2\1</chain>" dest="5+"> + <RegExp input="$INFO[RatingS]|default" output="<chain function="GetTMDBRatingsByIdChain">$$2::$INFO[language]\1</chain>" dest="5+"> <expression>TMDb(\|default)|.*</expression> </RegExp> - <RegExp input="$$2" output="<chain function="GetTMDBStudioByIdChain">$$2</chain>" dest="5+"> + <RegExp input="$$2" output="<chain function="GetTMDBStudioByIdChain">$$2::$INFO[language]</chain>" dest="5+"> <expression /> </RegExp> - <RegExp input="$$2" output="<chain function="GetTMDBCountryByIdChain">$$2</chain>" dest="5+"> + <RegExp input="$$2" output="<chain function="GetTMDBCountryByIdChain">$$2::$INFO[language]</chain>" dest="5+"> <expression /> </RegExp> <RegExp input="$$2" output="<chain function="GetTMDBDirectorsByIdChain">$$2</chain>" dest="5+"> @@ -98,31 +98,31 @@ <RegExp input="$$2" output="<chain function="GetTMDBWitersByIdChain">$$2</chain>" dest="5+"> <expression /> </RegExp> - <RegExp input="$$2" output="<chain function="GetTMDBCertificationsByIdChain">$$2</chain>" dest="5+"> + <RegExp input="$$2" output="<chain function="GetTMDBCertificationsByIdChain">$$2::$INFO[tmdbcertcountry]::$INFO[certprefix]</chain>" dest="5+"> <expression /> </RegExp> - <RegExp input="$$2" output="<chain function="GetTMDBSetByIdChain">$$2</chain>" dest="5+"> + <RegExp input="$$2" output="<chain function="GetTMDBSetByIdChain">$$2::$INFO[language]</chain>" dest="5+"> <expression /> </RegExp> - <RegExp input="$$2" output="<chain function="GetTMDBPlotByIdChain">$$2</chain>" dest="5+"> + <RegExp input="$$2" output="<chain function="GetTMDBPlotByIdChain">$$2::$INFO[language]</chain>" dest="5+"> <expression /> </RegExp> - <RegExp input="$$2" output="<chain function="GetTMDBTaglineByIdChain">$$2</chain>" dest="5+"> + <RegExp input="$$2" output="<chain function="GetTMDBTaglineByIdChain">$$2::$INFO[language]</chain>" dest="5+"> <expression /> </RegExp> <RegExp input="$$2" output="<chain function="GetTMDBCastByIdChain">$$2</chain>" dest="5+"> <expression /> </RegExp> - <RegExp input="$$2" output="<chain function="GetTMDBGenresByIdChain">$$2</chain>" dest="5+"> + <RegExp input="$$2" output="<chain function="GetTMDBGenresByIdChain">$$2::$INFO[language]</chain>" dest="5+"> <expression /> </RegExp> - <RegExp input="$$2" output="<chain function="GetTMDBThumbsByIdChain">$$2</chain>" dest="5+"> + <RegExp input="$$2" output="<chain function="GetTMDBThumbsByIdChain">$$2::$INFO[language]</chain>" dest="5+"> <expression /> </RegExp> - <RegExp conditional="fanart" input="$$2" output="<chain function="GetTMDBFanartByIdChain">$$2</chain>" dest="5+"> + <RegExp conditional="fanart" input="$$2" output="<chain function="GetTMDBFanartByIdChain">$$2::$INFO[language]</chain>" dest="5+"> <expression /> </RegExp> - <RegExp conditional="trailer" input="$$2" output="<chain function="GetTMDBTrailerByIdChain">$$2</chain>" dest="5+"> + <RegExp conditional="trailer" input="$$2" output="<chain function="GetTMDBTrailerByIdChain">$$2::$INFO[language]</chain>" dest="5+"> <expression /> </RegExp> <expression noclean="1" /> diff --git a/addons/service.xbmc.versioncheck/.gitignore b/addons/service.xbmc.versioncheck/.gitignore new file mode 100644 index 0000000000..dd5a590e7c --- /dev/null +++ b/addons/service.xbmc.versioncheck/.gitignore @@ -0,0 +1,7 @@ +*.pyo +.project +.pydevproject +pysrc +*.pyc +.settings +.idea diff --git a/addons/service.xbmc.versioncheck/addon.xml b/addons/service.xbmc.versioncheck/addon.xml index 811aace538..d34201075a 100644 --- a/addons/service.xbmc.versioncheck/addon.xml +++ b/addons/service.xbmc.versioncheck/addon.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="service.xbmc.versioncheck" name="Version Check" - version="0.3.25" + version="0.3.26" provider-name="Team Kodi"> <requires> <import addon="xbmc.python" version="2.1.0"/> diff --git a/addons/service.xbmc.versioncheck/changelog.txt b/addons/service.xbmc.versioncheck/changelog.txt index c5775f48f7..d453632c42 100644 --- a/addons/service.xbmc.versioncheck/changelog.txt +++ b/addons/service.xbmc.versioncheck/changelog.txt @@ -1,3 +1,6 @@ +v0.3.256 +- Update version list + v0.3.25 - fix issue with the older python2.6 diff --git a/addons/service.xbmc.versioncheck/icon.png b/addons/service.xbmc.versioncheck/icon.png Binary files differindex fa8d6b8d34..02476a62b6 100644 --- a/addons/service.xbmc.versioncheck/icon.png +++ b/addons/service.xbmc.versioncheck/icon.png diff --git a/addons/service.xbmc.versioncheck/resources/versions.txt b/addons/service.xbmc.versioncheck/resources/versions.txt index 9e4251f845..a813f13f49 100644 --- a/addons/service.xbmc.versioncheck/resources/versions.txt +++ b/addons/service.xbmc.versioncheck/resources/versions.txt @@ -4,6 +4,15 @@ "stable": [ { "major": "17", + "minor": "6", + "tag": "stable", + "tagversion":"", + "revision": "20171114-a9a7a20", + "extrainfo": "final", + "addon_support": "yes" + }, + { + "major": "17", "minor": "4", "tag": "stable", "tagversion":"", |
