mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Make get_categories respect a search restriction that finds no books. This is an incompatible change, as [] used to mean no restriction and now it means no books. Tested with tag browser and content server.
This commit is contained in:
parent
4bf6fe6eb4
commit
2ae0cc048d
@ -1442,7 +1442,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
|
|||||||
raise ValueError('sort ' + sort + ' not a valid value')
|
raise ValueError('sort ' + sort + ' not a valid value')
|
||||||
|
|
||||||
self.books_list_filter.change([] if not ids else ids)
|
self.books_list_filter.change([] if not ids else ids)
|
||||||
id_filter = None if not ids else frozenset(ids)
|
id_filter = None if ids is None else frozenset(ids)
|
||||||
|
|
||||||
tb_cats = self.field_metadata
|
tb_cats = self.field_metadata
|
||||||
tcategories = {}
|
tcategories = {}
|
||||||
@ -1520,7 +1520,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
|
|||||||
rating_dex = self.FIELD_MAP['rating']
|
rating_dex = self.FIELD_MAP['rating']
|
||||||
tag_class = LibraryDatabase2.TCat_Tag
|
tag_class = LibraryDatabase2.TCat_Tag
|
||||||
for book in self.data.iterall():
|
for book in self.data.iterall():
|
||||||
if id_filter and book[id_dex] not in id_filter:
|
if id_filter is not None and book[id_dex] not in id_filter:
|
||||||
continue
|
continue
|
||||||
rating = book[rating_dex]
|
rating = book[rating_dex]
|
||||||
# We kept track of all possible category field_map positions above
|
# We kept track of all possible category field_map positions above
|
||||||
|
Loading…
x
Reference in New Issue
Block a user