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 failing tests that compare olddb to newdb results

Browse Source
This commit is contained in:
Kovid Goyal 2017-05-14 21:17:17 +05:30
parent bd000c52f4
commit ea39c2f7e6
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,19 @@ SPOOL_SIZE = 30*1024*1024
ProxyMetadata = namedtuple('ProxyMetadata', 'book_size ondevice_col db_approx_formats') ProxyMetadata = namedtuple('ProxyMetadata', 'book_size ondevice_col db_approx_formats')
class DBPrefsWrapper(object):
def __init__(self, db):
self.db = db
self.new_api = self
def pref(self, name, default=None):
return self.db.prefs.get(name, default)
def set_pref(self, name, val):
self.db.prefs[name] = val
class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
''' '''
An ebook metadata database that stores references to ebook files on disk. An ebook metadata database that stores references to ebook files on disk.
@ -274,7 +287,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
migrate_preference('user_categories', {}) migrate_preference('user_categories', {})
migrate_preference('saved_searches', {}) migrate_preference('saved_searches', {})
if not self.is_second_db: if not self.is_second_db:
set_saved_searches(self, 'saved_searches') set_saved_searches(DBPrefsWrapper(self), 'saved_searches')
# migrate grouped_search_terms # migrate grouped_search_terms
if self.prefs.get('grouped_search_terms', None) is None: if self.prefs.get('grouped_search_terms', None) is None:
@ -3807,5 +3820,3 @@ books_series_link feeds
if auts: if auts:
ans.add(auts) ans.add(auts)
return ans return ans