From 517f25920c6287d354249d301658e07734260c83 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 9 Jan 2016 21:03:18 +0530 Subject: [PATCH] Refactor to make set of formats allowed for auto-adding easily re-useable --- src/calibre/gui2/auto_add.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/calibre/gui2/auto_add.py b/src/calibre/gui2/auto_add.py index 5fd10f5fe9..44df81876c 100644 --- a/src/calibre/gui2/auto_add.py +++ b/src/calibre/gui2/auto_add.py @@ -28,6 +28,15 @@ class AllAllowed(object): def __contains__(self, x): return x not in self.disallowed + +def allowed_formats(): + ' Return an object that can be used to test if a format (lowercase) is allowed for auto-adding ' + if gprefs['auto_add_everything']: + allowed = AllAllowed() + else: + allowed = AUTO_ADDED - frozenset(gprefs['blocked_auto_formats']) + return allowed + class Worker(Thread): def __init__(self, path, callback): @@ -37,10 +46,7 @@ class Worker(Thread): self.wake_up = Event() self.path, self.callback = path, callback self.staging = set() - if gprefs['auto_add_everything']: - self.allowed = AllAllowed() - else: - self.allowed = AUTO_ADDED - frozenset(gprefs['blocked_auto_formats']) + self.allowed = allowed_formats() def run(self): self.tdir = PersistentTemporaryDirectory('_auto_adder')