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

Clean up the new composite splitter API to ignore case and ignore dups. Make Quickview use the new API.

Browse Source
This commit is contained in:
Charles Haley 2022-12-17 17:44:54 +00:00
parent c24f59151c
commit e5b664c162
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/db/cache.py
View File

@ -2351,9 +2351,15 @@ class Cache:
@read_api @read_api
def split_if_is_multiple_composite(self, f, v): def split_if_is_multiple_composite(self, f, v):
'''
If f is a composite column lookup key and the column is is_multiple then
split comma-separated v into unique non-empty values. The uniqueness
comparison is case-insensitive. If values are case-insensitive equals
then the last is returned.
'''
fm = self.field_metadata.get(f, None) fm = self.field_metadata.get(f, None)
if fm and fm['datatype'] == 'composite' and fm['is_multiple']: if fm and fm['datatype'] == 'composite' and fm['is_multiple']:
return [v.strip() for v in v.split(',') if v.strip()] return list({v.strip().lower() : v.strip() for v in v.split(',') if v.strip()}.values())
return v return v
@read_api @read_api

7
src/calibre/gui2/dialogs/quickview.py
View File

@ -542,10 +542,9 @@ class Quickview(QDialog, Ui_Quickview):
self.books_table.setRowCount(0) self.books_table.setRowCount(0)
mi = self.db.new_api.get_proxy_metadata(book_id) mi = self.db.new_api.get_proxy_metadata(book_id)
vals = mi.get(key, None) print('aaa', key, mi.get(key, None))
if self.fm[key]['datatype'] == 'composite' and self.fm[key]['is_multiple']: vals = self.db.new_api.split_if_is_multiple_composite(key, mi.get(key, None))
sep = self.fm[key]['is_multiple'].get('cache_to_list', ',') print('bbb', vals)
vals = [v.strip() for v in vals.split(sep) if v.strip()]
try: try:
# Check if we are in the GridView and there are no values for the # Check if we are in the GridView and there are no values for the
# selected column. In this case switch the column to 'authors' # selected column. In this case switch the column to 'authors'