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

Read aloud: Keep going when reaching end of internal file

Browse Source
This commit is contained in:
Kovid Goyal 2020-12-04 06:01:24 +05:30
parent 129a18d2c3
commit 1966b790d2
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pyj/read_book/read_aloud.pyj
View File

@ -174,7 +174,9 @@ class ReadAloud:
elif which is 'begin': elif which is 'begin':
self.state = PLAYING self.state = PLAYING
elif which is 'end': elif which is 'end':
pass self.state = STOPPED
if not self.view.show_next_spine_item():
self.hide()
def send_message(self, type, **kw): def send_message(self, type, **kw):
self.view.iframe_wrapper.send_message('tts', type=type, **kw) self.view.iframe_wrapper.send_message('tts', type=type, **kw)

15
src/pyj/read_book/view.pyj
View File

@ -1107,19 +1107,23 @@ class View:
self.selection_bar.notes_edited(uuid) self.selection_bar.notes_edited(uuid)
self.selection_bar.update_position() self.selection_bar.update_position()
def on_next_spine_item(self, data): def show_next_spine_item(self, previous):
spine = self.book.manifest.spine spine = self.book.manifest.spine
idx = spine.indexOf(self.currently_showing.name) idx = spine.indexOf(self.currently_showing.name)
if data.previous: if previous:
if idx is 0: if idx is 0:
return return False
idx = min(spine.length - 1, max(idx - 1, 0)) idx = min(spine.length - 1, max(idx - 1, 0))
self.show_name(spine[idx], initial_position={'type':'frac', 'frac':1, 'replace_history':True}) self.show_name(spine[idx], initial_position={'type':'frac', 'frac':1, 'replace_history':True})
else: else:
if idx is spine.length - 1: if idx is spine.length - 1:
return return False
idx = max(0, min(spine.length - 1, idx + 1)) idx = max(0, min(spine.length - 1, idx + 1))
self.show_name(spine[idx], initial_position={'type':'frac', 'frac':0, 'replace_history':True}) self.show_name(spine[idx], initial_position={'type':'frac', 'frac':0, 'replace_history':True})
return True
def on_next_spine_item(self, data):
self.show_next_spine_item(data.previous)
def on_next_section(self, data): def on_next_section(self, data):
toc_node = get_next_section(data.forward) toc_node = get_next_section(data.forward)
@ -1272,7 +1276,6 @@ class View:
def on_content_loaded(self, data): def on_content_loaded(self, data):
self.selection_bar.hide() self.selection_bar.hide()
self.read_aloud.hide()
self.processing_spine_item_display = False self.processing_spine_item_display = False
self.currently_showing.loading = False self.currently_showing.loading = False
self.hide_loading() self.hide_loading()
@ -1286,6 +1289,8 @@ class View:
ui_operations.clear_history() ui_operations.clear_history()
if ui_operations.content_file_changed: if ui_operations.content_file_changed:
ui_operations.content_file_changed(self.currently_showing.name) ui_operations.content_file_changed(self.currently_showing.name)
if self.read_aloud.is_visible:
self.read_aloud.play()
def set_progress_frac(self, progress_frac, file_progress_frac, page_counts): def set_progress_frac(self, progress_frac, file_progress_frac, page_counts):
self.current_progress_frac = progress_frac or 0 self.current_progress_frac = progress_frac or 0