Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 10:44:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix composite column searching to make #x:false. Before, books with an empty column were not returned. With this change it returns None.

Browse Source
This commit is contained in:
Charles Haley 2022-09-25 13:24:06 +01:00
parent 270f503775
commit e2f34bc386
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/db/fields.py
View File

@ -345,9 +345,16 @@ class CompositeField(OneToOneField):
for book_id in candidates: for book_id in candidates:
vals = self.get_value_with_cache(book_id, get_metadata) vals = self.get_value_with_cache(book_id, get_metadata)
vals = (vv.strip() for vv in vals.split(splitter)) if splitter else (vals,) vals = (vv.strip() for vv in vals.split(splitter)) if splitter else (vals,)
found = False
for v in vals: for v in vals:
if v: if v:
val_map[v].add(book_id) val_map[v].add(book_id)
found = True
if not found:
# Convert columns with no value to None to ensure #x:false
# searches work. We do it outside the loop to avoid generating
# None for is_multiple columns containing text like "a,,,b".
val_map[None].add(book_id)
yield from iteritems(val_map) yield from iteritems(val_map)
def iter_counts(self, candidates, get_metadata=None): def iter_counts(self, candidates, get_metadata=None):