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

Fix migrate_preferences to allow downgrades

Browse Source
This commit is contained in:
Kovid Goyal 2010-07-20 10:55:18 -06:00
parent 32293a7660
commit 3d524bf01d
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,14 +145,12 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
# Migrate saved search and user categories to db preference scheme # Migrate saved search and user categories to db preference scheme
def migrate_preference(name, default): def migrate_preference(name, default):
obsolete = '###OBSOLETE--DON\'T USE ME###'
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]
if ans in (None, obsolete): if ans is None:
ans = default ans = default
prefs[name] = obsolete prefs[name] = self.prefs[name] = ans
self.prefs[name] = ans
migrate_preference('user_categories', {}) migrate_preference('user_categories', {})
migrate_preference('saved_searches', {}) migrate_preference('saved_searches', {})