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

Small cleanups.

Browse Source
This commit is contained in:
Charles Haley 2012-06-20 08:51:08 +02:00
parent 7d3b89cc2a
commit f1e48dc42e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/library/database2.py
View File

@ -215,7 +215,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
if not restore_all_prefs and key in frozenset(['news_to_be_synced']):
continue
dbprefs[key] = default_prefs[key]
progress_callback(_('Restored preference ') + key, i+1)
progress_callback(_('restored preference ') + key, i+1)
if 'field_metadata' in default_prefs:
fmvals = [f for f in default_prefs['field_metadata'].values() if f['is_custom']]
progress_callback(None, len(fmvals))

16
src/calibre/library/prefs.py
View File

@ -81,7 +81,7 @@ class DBPrefs(dict):
traceback.print_exc()
@classmethod
def read_serialized(self, library_path, recreate_prefs=False):
def read_serialized(cls, library_path, recreate_prefs=False):
try:
from_filename = os.path.join(library_path,
'metadata_db_prefs_backup.json')
@ -89,15 +89,15 @@ class DBPrefs(dict):
d = json.load(f, object_hook=from_json)
if not recreate_prefs:
return d
self.clear()
self.db.conn.execute('DELETE FROM preferences')
cls.clear()
cls.db.conn.execute('DELETE FROM preferences')
for k,v in d.iteritems():
raw = self.to_raw(v)
self.db.conn.execute(
raw = cls.to_raw(v)
cls.db.conn.execute(
'INSERT INTO preferences (key,val) VALUES (?,?)', (k, raw))
self.db.conn.commit()
self.clear()
self.update(d)
cls.db.conn.commit()
cls.clear()
cls.update(d)
return d
except:
import traceback