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

Blacklist the iOS Reader applications and Marvin XD plugins

Browse Source 
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.
This commit is contained in:
Kovid Goyal 2017-06-24 10:07:32 +05:30
parent 3f091c57a0
commit 5b85a67393
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/customize/ui.py
View File

@ -24,6 +24,7 @@ from calibre.ebooks.metadata.sources.base import Source
from calibre.constants import DEBUG, numeric_version from calibre.constants import DEBUG, numeric_version
builtin_names = frozenset(p.name for p in builtin_plugins) builtin_names = frozenset(p.name for p in builtin_plugins)
BLACKLISTED_PLUGINS = frozenset({'Marvin XD', 'iOS reader applications'})
class NameConflict(ValueError): class NameConflict(ValueError):
@ -680,7 +681,9 @@ def initialize_plugins(perf=False):
builtin_names] builtin_names]
for p in conflicts: for p in conflicts:
remove_plugin(p) 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 ostdout, ostderr = sys.stdout, sys.stderr
if perf: if perf:
from collections import defaultdict from collections import defaultdict