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

Browse Source
This commit is contained in:
Charles Haley 2022-09-18 15:14:30 +01:00
parent 16c2d73037
commit ec578eb4ae
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/db/search.py
View File

@ -472,6 +472,8 @@ class Parser(SearchQueryParser): # {{{
self.virtual_fields = virtual_fields or {} self.virtual_fields = virtual_fields or {}
if 'marked' not in self.virtual_fields: if 'marked' not in self.virtual_fields:
self.virtual_fields['marked'] = self self.virtual_fields['marked'] = self
if 'in_tag_browser' not in self.virtual_fields:
self.virtual_fields['in_tag_browser'] = self
SearchQueryParser.__init__(self, locations, optimize=True, lookup_saved_search=lookup_saved_search, parse_cache=parse_cache) SearchQueryParser.__init__(self, locations, optimize=True, lookup_saved_search=lookup_saved_search, parse_cache=parse_cache)
@property @property

10
src/calibre/library/caches.py
View File

@ -938,6 +938,10 @@ class ResultCache(SearchQueryParser): # {{{
except: except:
pass pass
in_tag_browser_col = self.FIELD_MAP['in_tag_browser']
for r in self.iterall():
r[in_tag_browser_col] = None
def get_marked(self, idx, index_is_id=True, default_value=None): def get_marked(self, idx, index_is_id=True, default_value=None):
id_ = idx if index_is_id else self[idx][0] id_ = idx if index_is_id else self[idx][0]
return self.marked_ids_dict.get(id_, default_value) return self.marked_ids_dict.get(id_, default_value)
@ -1056,7 +1060,7 @@ class ResultCache(SearchQueryParser): # {{{
if item is not None: if item is not None:
item.append(db.book_on_device_string(item[0])) item.append(db.book_on_device_string(item[0]))
# Temp mark and series_sort columns # Temp mark and series_sort columns
item.extend((None, None)) item.extend((None, None, None))
marked_col = self.FIELD_MAP['marked'] marked_col = self.FIELD_MAP['marked']
for id_,val in iteritems(self.marked_ids_dict): for id_,val in iteritems(self.marked_ids_dict):
@ -1065,6 +1069,10 @@ class ResultCache(SearchQueryParser): # {{{
except: except:
pass pass
in_tag_browser_col = self.FIELD_MAP['in_tag_browser']
for r in self.iterall():
r[in_tag_browser_col] = None
self._map = [i[0] for i in self._data if i is not None] self._map = [i[0] for i in self._data if i is not None]
if field is not None: if field is not None:
self.sort(field, ascending) self.sort(field, ascending)

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

@ -462,6 +462,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
self.field_metadata.set_field_record_index('marked', base, prefer_custom=False) self.field_metadata.set_field_record_index('marked', base, prefer_custom=False)
self.FIELD_MAP['series_sort'] = base = base+1 self.FIELD_MAP['series_sort'] = base = base+1
self.field_metadata.set_field_record_index('series_sort', base, prefer_custom=False) self.field_metadata.set_field_record_index('series_sort', base, prefer_custom=False)
self.FIELD_MAP['in_tag_browser'] = base = base+1
self.field_metadata.set_field_record_index('in_tag_browser', base, prefer_custom=False)
script = ''' script = '''
DROP VIEW IF EXISTS meta2; DROP VIEW IF EXISTS meta2;