mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Fix #2067437 [[Content Server Viewer] Filename when downloading highlights](https://bugs.launchpad.net/calibre/+bug/2067437)
This commit is contained in:
parent
36625c9dcd
commit
0b5b93bcfe
@ -614,7 +614,7 @@ class ChapterGroup:
|
|||||||
sg.render_as_text(lines, link_prefix, current_query, as_markdown)
|
sg.render_as_text(lines, link_prefix, current_query, as_markdown)
|
||||||
|
|
||||||
|
|
||||||
def show_export_dialog(annotations_manager):
|
def show_export_dialog(annotations_manager, book_metadata):
|
||||||
sd = get_session_data()
|
sd = get_session_data()
|
||||||
fmt = sd.get('highlights_export_format')
|
fmt = sd.get('highlights_export_format')
|
||||||
if v"['text', 'markdown', 'calibre_annotations_collection']".indexOf(fmt) < 0:
|
if v"['text', 'markdown', 'calibre_annotations_collection']".indexOf(fmt) < 0:
|
||||||
@ -682,7 +682,8 @@ def show_export_dialog(annotations_manager):
|
|||||||
text = document.getElementById(ta_id).textContent
|
text = document.getElementById(ta_id).textContent
|
||||||
ext = 'md' if fmt is 'markdown' else ('txt' if fmt is 'text' else 'json')
|
ext = 'md' if fmt is 'markdown' else ('txt' if fmt is 'text' else 'json')
|
||||||
mt = 'text/markdown' if fmt is 'markdown' else ('text/plain' if fmt is 'text' else 'application/json')
|
mt = 'text/markdown' if fmt is 'markdown' else ('text/plain' if fmt is 'text' else 'application/json')
|
||||||
filename = f'highlights.{ext}'
|
title = book_metadata?.title or _('Unknown')
|
||||||
|
filename = _('{title} - highlights').format(title=title) + f'.{ext}'
|
||||||
file = new Blob([text], {'type': mt})
|
file = new Blob([text], {'type': mt})
|
||||||
url = window.URL.createObjectURL(file)
|
url = window.URL.createObjectURL(file)
|
||||||
a = E.a(href=url, download=filename)
|
a = E.a(href=url, download=filename)
|
||||||
@ -956,7 +957,7 @@ def create_highlights_panel(annotations_manager, hide_panel, book, container, on
|
|||||||
_('All'), 'plus', select_all, _('Select all highlights'),
|
_('All'), 'plus', select_all, _('Select all highlights'),
|
||||||
class_='ac-button sel-button')
|
class_='ac-button sel-button')
|
||||||
export_button = create_button(
|
export_button = create_button(
|
||||||
_('Export'), 'cloud-download', show_export_dialog.bind(None, annotations_manager), _('Export all or selected highlights'),
|
_('Export'), 'cloud-download', show_export_dialog.bind(None, annotations_manager, book.metadata), _('Export all or selected highlights'),
|
||||||
class_='ac-button')
|
class_='ac-button')
|
||||||
c = E.div(
|
c = E.div(
|
||||||
style='padding: 1rem',
|
style='padding: 1rem',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user