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

E-book viewer: When displaying highlights dont group highlights from different chapters when the chapter titles are identical. Fixes #1988590 [Private bug](https://bugs.launchpad.net/calibre/+bug/1988590)

Browse Source
This commit is contained in:
Kovid Goyal 2022-09-15 11:01:26 +05:30
parent cc19a77298
commit fdf1fca556
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/calibre/gui2/viewer/highlights.py
View File

@ -220,35 +220,53 @@ class Highlights(QTreeWidget):
self.clear() self.clear()
self.uuid_map = {} self.uuid_map = {}
highlights = (h for h in highlights if not h.get('removed') and h.get('highlighted_text')) highlights = (h for h in highlights if not h.get('removed') and h.get('highlighted_text'))
section_map = defaultdict(list) smap = {}
section_tt_map = {} title_counts = defaultdict(lambda : 0)
for h in self.sorted_highlights(highlights):
tfam = h.get('toc_family_titles') or () @lru_cache
if tfam: def tooltip_for(tfam):
tsec = tfam[0] tooltip = ''
lsec = tfam[-1]
else:
tsec = h.get('top_level_section_title')
lsec = h.get('lowest_level_section_title')
sec = lsec or tsec or _('Unknown')
if len(tfam) > 1: if len(tfam) > 1:
lines = [] lines = []
for i, node in enumerate(tfam): for i, node in enumerate(tfam):
lines.append('\xa0\xa0' * i + '➤ ' + node) lines.append('\xa0\xa0' * i + '➤ ' + node)
tt = ngettext('Table of Contents section:', 'Table of Contents sections:', len(lines)) tooltip = ngettext('Table of Contents section:', 'Table of Contents sections:', len(lines))
tt += '\n' + '\n'.join(lines) tooltip += '\n' + '\n'.join(lines)
section_tt_map[sec] = tt return tooltip
section_map[sec].append(h)
for secnum, (sec, items) in enumerate(section_map.items()): for h in self.sorted_highlights(highlights):
section = QTreeWidgetItem([sec], 1) tfam = tuple(h.get('toc_family_titles') or ())
if tfam:
tsec = tfam[0]
lsec = tfam[-1]
key = tfam
else:
tsec = h.get('top_level_section_title')
lsec = h.get('lowest_level_section_title')
key = (tsec or '', lsec or '')
short_title = lsec or tsec or _('Unknown')
title_counts[short_title] += 1
section = {
'title': short_title, 'tfam': tfam, 'tsec': tsec, 'lsec': lsec, 'items': [], 'tooltip': tooltip_for(tfam), 'key': key,
}
smap.setdefault(key, section)['items'].append(h)
for section in smap.values():
if title_counts[section['title']] > 1:
if section['tfam']:
section['title'] = ' ➤ '.join(section['tfam'])
elif section['tsec'] and section['lsec']:
section['title'] = ' ➤ '.join((section['tsec'], section['lsec']))
for secnum, (sec_key, sec) in enumerate(smap.items()):
section = QTreeWidgetItem([sec['title']], 1)
section.setFlags(Qt.ItemFlag.ItemIsEnabled) section.setFlags(Qt.ItemFlag.ItemIsEnabled)
section.setFont(0, self.section_font) section.setFont(0, self.section_font)
tt = section_tt_map.get(sec) if sec['tooltip']:
if tt: section.setToolTip(0, sec['tooltip'])
section.setToolTip(0, tt)
self.addTopLevelItem(section) self.addTopLevelItem(section)
section.setExpanded(not preserve_state or sec in expanded_chapters) section.setExpanded(not preserve_state or sec['title'] in expanded_chapters)
for itemnum, h in enumerate(items): for itemnum, h in enumerate(sec['items']):
txt = h.get('highlighted_text') txt = h.get('highlighted_text')
txt = txt.replace('\n', ' ') txt = txt.replace('\n', ' ')
if h.get('notes'): if h.get('notes'):