diff --git a/addon.xml b/addon.xml index d2937da..a76cdbe 100755 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + diff --git a/changelog.txt b/changelog.txt index ff44e7d..eaca6b6 100755 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +v.1.6.9~beta2 +- added option to download artist thumbnails from htbackdrops and fanart.tv +- added option to use fanart.tv client API key + v.1.6.9~beta1 - update to current requests module (requests2 depreciated) - updated to v3 of fanart.tv API diff --git a/default.py b/default.py index aa5ef2c..05617ae 100755 --- a/default.py +++ b/default.py @@ -398,11 +398,18 @@ def _get_data( self, site, item ): if success: if site == 'fanarttv': try: - json_data = json_data['artistbackground'] + images = json_data['artistbackground'] except Exception, e: - lw.log( ['error fixing fanart.tv JSON data', e] ) - return data - success, loglines = writeFile( dicttoxml( json_data ).encode('utf-8'), filename ) + lw.log( ['error getting artist backgrounds from fanart.tv', e] ) + images = [] + if self.FANARTTVALLIMAGES == 'true': + try: + thumbs = json_data['artistthumb'] + except Exception, e: + lw.log( ['error getting artist thumbs from fanart.tv', e] ) + thumbs = [] + images = images + thumbs + success, loglines = writeFile( dicttoxml( images ).encode('utf-8'), filename ) lw.log( loglines ) json_data = '' else: @@ -808,8 +815,11 @@ def _get_playing_item( self, item ): def _get_settings( self ): self.FANARTTV = __addon__.getSetting( "fanarttv" ) + self.FANARTTVALLIMAGES = __addon__.getSetting( "fanarttv_all" ) + self.FANARTTVCLIENTAPIKEY = __addon__.getSetting( "fanarttv_clientapikey" ) self.THEAUDIODB = __addon__.getSetting( "theaudiodb" ) self.HTBACKDROPS = __addon__.getSetting( "htbackdrops" ) + self.HTBACKDROPSALLIMAGES = __addon__.getSetting( "htbackdrops_all" ) self.ARTISTINFO = __addon__.getSetting( "artistinfo" ) self.LANGUAGE = __addon__.getSetting( "language" ) for language in LANGUAGES: @@ -888,11 +898,17 @@ def _init_vars( self ): self.LastfmPARAMS = {'autocorrect':'1', 'api_key':LastfmApiKey} self.fanarttvURL = 'https://webservice.fanart.tv/v3/music/' self.fanarttvPARAMS = {'api_key': fanarttvApiKey} + if self.FANARTTVCLIENTAPIKEY: + self.fanarttvPARAMS.update( {'client_key': self.FANARTTVCLIENTAPIKEY} ) theaudiodbURL = 'http://www.theaudiodb.com/api/v1/json/%s/' % theaudiodbApiKey self.theaudiodbARTISTURL = theaudiodbURL + 'artist-mb.php' self.theaudiodbALBUMURL = theaudiodbURL + 'album.php' self.HtbackdropsQueryURL = 'http://htbackdrops.org/api/%s/searchXML' % HtbackdropsApiKey - self.HtbackdropsPARAMS = {'default_operator':'and', 'fields':'title', 'aid':'1'} + if self.HTBACKDROPSALLIMAGES == 'true': + aid = '1,5' + else: + aid = '1' + self.HtbackdropsPARAMS = {'default_operator':'and', 'fields':'title', 'aid':aid} self.HtbackdropsDownloadURL = 'http://htbackdrops.org/api/' + HtbackdropsApiKey + '/download/' diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po index 2f5e363..9a4c2b8 100755 --- a/resources/language/English/strings.po +++ b/resources/language/English/strings.po @@ -54,7 +54,7 @@ msgid "Download images from last.fm" msgstr "" msgctxt "#32002" -msgid "Download images from htbackdrops.com" +msgid "Download images from htbackdrops.org" msgstr "" msgctxt "#32003" @@ -74,7 +74,7 @@ msgid " Preferred language for artist information" msgstr "" msgctxt "#32007" -msgid " Download only 16:9 images" +msgid " Download all images regardless of resolution" msgstr "" msgctxt "#32008" @@ -85,7 +85,11 @@ msgctxt "#32009" msgid "Download images from theaudiodb.com" msgstr "" -#empty strings from id 32010 to 32099 +msgctxt "#32010" +msgid " Client API key" +msgstr "" + +#empty strings from id 32011 to 32099 msgctxt "#32100" msgid "Slideshow" diff --git a/resources/settings.xml b/resources/settings.xml index 5ae8178..720fdd3 100755 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -2,23 +2,26 @@ + + + - + - + - + - +