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

More for moving preferences to the DB

Browse Source
This commit is contained in:
Charles Haley 2010-07-19 10:22:07 +01:00
parent dd1ef60d1d
commit 2159a2de85
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,16 +148,13 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
ans = self.prefs.get(name, None) ans = self.prefs.get(name, None)
if ans is None: if ans is None:
ans = prefs[name] ans = prefs[name]
try: if ans is None:
del prefs[name] raise ValueError('Preference %s is None!'%name)
except: prefs[name] = '###OBSOLETE--DON\'T USE ME###'
pass self.prefs[name] = ans
if ans is not None:
self.prefs[name] = ans
migrate_preference('user_categories') migrate_preference('user_categories')
migrate_preference('saved_searches') migrate_preference('saved_searches')
set_saved_searches(self, 'saved_searches') set_saved_searches(self, 'saved_searches')
self.conn.executescript(''' self.conn.executescript('''