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

Merge branch 'master' of https://github.com/cbhaley/calibre

Browse Source 
Fixes #1909293 [Composite tag-like column: list_re_group is case-sensitive?](https://bugs.launchpad.net/calibre/+bug/1909293)
Fixes #1909258 [Enhancement Request: Quickview: Dropdown menu for all selectable columns](https://bugs.launchpad.net/calibre/+bug/1909258)
This commit is contained in:
Kovid Goyal 2020-12-26 08:49:07 +05:30
commit 1e7fe201d1
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -490,7 +490,9 @@ class Quickview(QDialog, Ui_Quickview):
self.indicate_no_items() self.indicate_no_items()
def is_category(self, key): def is_category(self, key):
return key is not None and self.fm[key]['is_category'] return key is not None and (self.fm[key]['is_category'] or
(self.fm[key]['datatype'] == 'composite' and
self.fm[key]['display'].get('make_category', False)))
def _refresh(self, book_id, key): def _refresh(self, book_id, key):
''' '''

13
src/calibre/utils/formatter_functions.py
View File

@ -1306,16 +1306,9 @@ class BuiltinListUnion(BuiltinFormatterFunction):
aliases = ['merge_lists'] aliases = ['merge_lists']
def evaluate(self, formatter, kwargs, mi, locals, list1, list2, separator): def evaluate(self, formatter, kwargs, mi, locals, list1, list2, separator):
res = [l.strip() for l in list1.split(separator) if l.strip()] res = {icu_lower(l.strip()): l.strip() for l in list2.split(separator) if l.strip()}
l2 = [l.strip() for l in list2.split(separator) if l.strip()] res.update({icu_lower(l.strip()): l.strip() for l in list1.split(separator) if l.strip()})
lcl1 = {icu_lower(l) for l in res} return separator.join(res.values())
for i in l2:
if icu_lower(i) not in lcl1 and i not in res:
res.append(i)
if separator == ',':
return ', '.join(res)
return separator.join(res)
class BuiltinListDifference(BuiltinFormatterFunction): class BuiltinListDifference(BuiltinFormatterFunction):