Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 10:14:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Prevent generate cover from failing if the user disables all styles or color themes.

Browse Source
This commit is contained in:
Kovid Goyal 2014-09-14 17:43:20 +05:30
parent 1cb3e02ab8
commit ba8ea3bbae
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/calibre/ebooks/covers.py
View File

@ -270,7 +270,11 @@ def load_color_themes(prefs):
t = default_color_themes.copy() t = default_color_themes.copy()
t.update(prefs.color_themes) t.update(prefs.color_themes)
disabled = frozenset(prefs.disabled_color_themes) disabled = frozenset(prefs.disabled_color_themes)
return [theme_to_colors(v) for k, v in t.iteritems() if k not in disabled] ans = [theme_to_colors(v) for k, v in t.iteritems() if k not in disabled]
if not ans:
# Ignore disabled and return only the builtin color themes
ans = [theme_to_colors(v) for k, v in default_color_themes.iteritems()]
return ans
def color(color_theme, name): def color(color_theme, name):
ans = getattr(color_theme, name) ans = getattr(color_theme, name)
@ -431,10 +435,15 @@ def all_styles():
isinstance(x, type) and issubclass(x, Style) and x is not Style isinstance(x, type) and issubclass(x, Style) and x is not Style
) )
def load_styles(prefs): def load_styles(prefs, respect_disabled=True):
disabled = frozenset(prefs.disabled_styles) disabled = frozenset(prefs.disabled_styles) if respect_disabled else ()
return tuple(x for x in globals().itervalues() if ans = tuple(x for x in globals().itervalues() if
isinstance(x, type) and issubclass(x, Style) and x is not Style and x.NAME not in disabled) isinstance(x, type) and issubclass(x, Style) and x is not Style and x.NAME not in disabled)
if not ans and disabled:
# If all styles have been disabled, ignore the disabling and return all
# the styles
ans = load_styles(prefs, respect_disabled=False)
return ans
# }}} # }}}