diff --git a/beets/library.py b/beets/library.py index 18c0afb06..df5d7cbf2 100644 --- a/beets/library.py +++ b/beets/library.py @@ -1113,7 +1113,6 @@ class Library(BaseLibrary): directory='~/Music', path_formats=((PF_KEY_DEFAULT, '$artist/$album/$track $title'),), - timeout=5.0, replacements=None, item_fields=ITEM_FIELDS, album_fields=ALBUM_FIELDS): @@ -1127,7 +1126,6 @@ class Library(BaseLibrary): self._memotable = {} # Used for template substitution performance. - self.timeout = timeout self._connections = {} self._tx_stacks = defaultdict(list) # A lock to protect the _connections and _tx_stacks maps, which @@ -1208,7 +1206,10 @@ class Library(BaseLibrary): return self._connections[thread_id] else: # Make a new connection. - conn = sqlite3.connect(self.path, timeout=self.timeout) + conn = sqlite3.connect( + self.path, + timeout=beets.config['timeout'].as_number(), + ) # Access SELECT results like dictionaries. conn.row_factory = sqlite3.Row diff --git a/beets/ui/__init__.py b/beets/ui/__init__.py index e5b78e521..9dd568689 100644 --- a/beets/ui/__init__.py +++ b/beets/ui/__init__.py @@ -729,7 +729,6 @@ def _raw_main(args): dbpath, config['directory'].as_filename(), get_path_formats(), - config['timeout'].as_number(), get_replacements(), ) except sqlite3.OperationalError: