From 138a0338f73e4389869706fa20ac6be1a515b755 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 16 Mar 2019 10:22:54 +0530
Subject: [PATCH] DRYer

---
 src/calibre/utils/config.py | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/calibre/utils/config.py b/src/calibre/utils/config.py
index 9f02432e2e..b3163e6b49 100644
--- a/src/calibre/utils/config.py
+++ b/src/calibre/utils/config.py
@@ -205,11 +205,14 @@ class DynamicConfig(dict):
         dict.__init__(self, {})
         self.name = name
         self.defaults = {}
-        self.file_path = os.path.join(config_dir, name+'.pickle')
         self.refresh()
 
+    @property
+    def file_path(self):
+        return os.path.join(config_dir, self.name+'.pickle')
+
     def decouple(self, prefix):
-        self.file_path = os.path.join(os.path.dirname(self.file_path), prefix + os.path.basename(self.file_path))
+        self.name = prefix + self.name
         self.refresh()
 
     def refresh(self, clear_current=True):
@@ -221,7 +224,7 @@ class DynamicConfig(dict):
                     d = cPickle.loads(raw) if raw.strip() else {}
                 except SystemError:
                     pass
-                except:
+                except Exception:
                     print('WARNING: Failed to unpickle stored config object, ignoring')
                     if DEBUG:
                         import traceback
@@ -251,14 +254,15 @@ class DynamicConfig(dict):
         self.__setitem__(key, val)
 
     def commit(self):
-        if hasattr(self, 'file_path') and self.file_path:
-            if not os.path.exists(self.file_path):
-                make_config_dir()
-            with ExclusiveFile(self.file_path) as f:
-                raw = cPickle.dumps(self, -1)
-                f.seek(0)
-                f.truncate()
-                f.write(raw)
+        if not getattr(self, 'name', None):
+            return
+        if not os.path.exists(self.file_path):
+            make_config_dir()
+        raw = cPickle.dumps(self, -1)
+        with ExclusiveFile(self.file_path) as f:
+            f.seek(0)
+            f.truncate()
+            f.write(raw)
 
 
 dynamic = DynamicConfig()