Permalink
Browse files

fix for Windows bug where once fallback or override are set they coul…

…d not be unset
  • Loading branch information...
1 parent 33e9244 commit 6b7adf8b0d47e1fbe9f402a05641d7e5c75462ed @pkscout committed Feb 18, 2013
Showing with 13 additions and 6 deletions.
  1. +1 −0 changelog.txt
  2. +4 −2 default.py
  3. +4 −2 resources/language/English/strings.xml
  4. +4 −2 resources/settings.xml
View
@@ -1,4 +1,5 @@
v.1.5.1
+- fixed bug on Windows where once override or fallback were set they could not be unset
- changed artist bio download so it downloads even if just showing the override images
- updated artist bio infolabel to filter out link to READ MORE on last.fm
- new language files for Danish and Italian
View
@@ -167,7 +167,7 @@ def _use_correct_artwork( self ):
log('current artist is %s' % artist.decode("utf-8"))
self.ARTISTNUM += 1
self.NAME = artist
- if(not self.OVERRIDEPATH == ''):
+ if(self.USEOVERRIDE == 'true'):
log('using override directory for images')
self._set_property("ArtistSlideshow", self.OVERRIDEPATH)
if(self.ARTISTNUM == 1):
@@ -191,7 +191,7 @@ def _use_correct_artwork( self ):
log('no remote artist artwork found, looking for local artwork')
self._get_local_images()
if(not (self.LocalImagesFound or self.CachedImagesFound or self.ImageDownloaded or self.MergedImagesFound)):
- if (not self.FALLBACKPATH == ''):
+ if (self.USEFALLBACK == 'true'):
log('no images found for artist, using fallback slideshow')
log('fallbackdir = ' + self.FALLBACKPATH)
self.UsingFallback = True
@@ -235,7 +235,9 @@ def _get_settings( self ):
break
self.LOCALARTISTPATH = __addon__.getSetting( "local_artist_path" )
self.PRIORITY = __addon__.getSetting( "priority" )
+ self.USEFALLBACK = __addon__.getSetting( "fallback" )
self.FALLBACKPATH = __addon__.getSetting( "fallback_path" )
+ self.USEOVERRIDE = __addon__.getSetting( "slideshow" )
self.OVERRIDEPATH = __addon__.getSetting( "slideshow_path" )
self.RESTRICTCACHE = __addon__.getSetting( "restrict_cache" )
try:
@@ -70,8 +70,10 @@
<string id="32100">Slideshow</string>
<string id="32101">Local artist folder</string>
<string id="32102"> Image Priority</string>
- <string id="32103">Fallback slideshow folder</string>
- <string id="32104">Override slideshow folder</string>
+ <string id="32103">Fallback folder</string>
+ <string id="32104">Override folder</string>
+ <string id="32105">Use fallback slideshow</string>
+ <string id="32106">Use override slideshow</string>
<string id="32200">Advanced</string>
<string id="32201">Limit size of download cache</string>
<string id="32202"> Maximum cache size (in megabytes)</string>
@@ -12,8 +12,10 @@
<category label="32100">
<setting id="local_artist_path" type="folder" label="32101" default="" />
<setting id="priority" type="enum" label="32102" lvalues="32901|32902|32903" default="0" />
- <setting id="fallback_path" type="folder" label="32103" default="" />
- <setting id="slideshow_path" type="folder" label="32104" default="" />
+ <setting id="fallback" type="bool" label="32105" default="false" />
+ <setting id="fallback_path" type="folder" label="32103" default="" enable="eq(-1,true)" />
+ <setting id="slideshow" type="bool" label="32106" default="false" />
+ <setting id="slideshow_path" type="folder" label="32104" default="" enable="eq(-1,true)" />
</category>
<category label="32200">
<setting id="restrict_cache" type="bool" label="32201" default="false" />

0 comments on commit 6b7adf8

Please sign in to comment.