From 5b85a6739359a80875e7a07b07fc001c8789ec02 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 24 Jun 2017 10:07:32 +0530 Subject: [PATCH] Blacklist the iOS Reader applications and Marvin XD plugins They cause calibre to not startup on 32bit windows and as far as I know they dont work anyway sicne Apple restricted USB access to their iOS devices. --- src/calibre/customize/ui.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/calibre/customize/ui.py b/src/calibre/customize/ui.py index eaa97e7c72..cea6dee046 100644 --- a/src/calibre/customize/ui.py +++ b/src/calibre/customize/ui.py @@ -24,6 +24,7 @@ from calibre.ebooks.metadata.sources.base import Source from calibre.constants import DEBUG, numeric_version builtin_names = frozenset(p.name for p in builtin_plugins) +BLACKLISTED_PLUGINS = frozenset({'Marvin XD', 'iOS reader applications'}) class NameConflict(ValueError): @@ -680,7 +681,9 @@ def initialize_plugins(perf=False): builtin_names] for p in conflicts: remove_plugin(p) - external_plugins = config['plugins'] + external_plugins = config['plugins'].copy() + for name in BLACKLISTED_PLUGINS: + external_plugins.pop(name, None) ostdout, ostderr = sys.stdout, sys.stderr if perf: from collections import defaultdict