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

Dont call __setitem__ while holding db connection open

Browse Source
This commit is contained in:
Kovid Goyal 2020-09-01 09:26:19 +05:30
parent 4d992eaa69
commit 13259a4c9c
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/db/backend.py
View File

@ -120,6 +120,7 @@ class DBPrefs(dict): # {{{
def __setitem__(self, key, val): def __setitem__(self, key, val):
if not self.disable_setting: if not self.disable_setting:
raw = self.to_raw(val) raw = self.to_raw(val)
do_set = False
with self.db.conn: with self.db.conn:
try: try:
dbraw = next(self.db.execute('SELECT id,val FROM preferences WHERE key=?', (key,))) dbraw = next(self.db.execute('SELECT id,val FROM preferences WHERE key=?', (key,)))
@ -130,7 +131,9 @@ class DBPrefs(dict): # {{{
self.db.execute('INSERT INTO preferences (key,val) VALUES (?,?)', (key, raw)) self.db.execute('INSERT INTO preferences (key,val) VALUES (?,?)', (key, raw))
else: else:
self.db.execute('UPDATE preferences SET val=? WHERE id=?', (raw, dbraw[0])) self.db.execute('UPDATE preferences SET val=? WHERE id=?', (raw, dbraw[0]))
dict.__setitem__(self, key, val) do_set = True
if do_set:
dict.__setitem__(self, key, val)
def set(self, key, val): def set(self, key, val):
self.__setitem__(key, val) self.__setitem__(key, val)