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

Support direct editing of bookpos in the URL

Browse Source
This commit is contained in:
Kovid Goyal 2017-02-15 20:17:10 +05:30
parent 5b03d668ec
commit 65ab46c72c
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pyj/read_book/ui.pyj
View File

@ -415,6 +415,7 @@ class ReadUI:
same = False same = False
break break
if same: if same:
pass # TODO: Implement this to move book position if different from current if current_state.bookpos is not current_query.bookpos and current_query.bookpos:
self.view.goto_bookpos(current_query.bookpos)
else: else:
self.load_book(int(current_query.book_id), current_query.fmt, library_data.metadata[current_query.book_id]) self.load_book(int(current_query.book_id), current_query.fmt, library_data.metadata[current_query.book_id])

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

@ -265,6 +265,20 @@ class View:
def hide_loading(self): def hide_loading(self):
self.overlay.hide_loading_message() self.overlay.hide_loading_message()
def parse_cfi(self, encoded_cfi, book):
name = cfi = None
if encoded_cfi and encoded_cfi.startswith('epubcfi(/'):
cfi = encoded_cfi[len('epubcfi(/'):-1]
snum, rest = cfi.partition('/')[::2]
try:
snum = int(snum)
except Exception:
print('Invalid spine number in CFI:', snum)
if jstype(snum) is 'number':
name = book.manifest.spine[(int(snum) // 2) - 1] or name
cfi = '/' + rest
return name, cfi
def display_book(self, book): def display_book(self, book):
self.book = current_book.book = book self.book = current_book.book = book
self.ui.db.update_last_read_time(book) self.ui.db.update_last_read_time(book)
@ -278,16 +292,10 @@ class View:
cfi = q.bookpos cfi = q.bookpos
elif book.last_read_position and book.last_read_position[unkey]: elif book.last_read_position and book.last_read_position[unkey]:
cfi = book.last_read_position[unkey] cfi = book.last_read_position[unkey]
if cfi and cfi.startswith('epubcfi(/'): cfiname, internal_cfi = self.parse_cfi(cfi, book)
cfi = cfi[len('epubcfi(/'):-1] if cfiname and internal_cfi:
snum, rest = cfi.partition('/')[::2] name = cfiname
try: pos.type, pos.cfi = 'cfi', internal_cfi
snum = int(snum)
except Exception:
print('Invalid spine number in CFI:', snum)
if jstype(snum) == 'number':
name = book.manifest.spine[(int(snum) // 2) - 1] or name
pos.type, pos.cfi = 'cfi', '/' + rest
self.show_name(name, initial_position=pos) self.show_name(name, initial_position=pos)
def redisplay_book(self): def redisplay_book(self):
@ -323,6 +331,14 @@ class View:
def on_scroll_to_anchor(self, data): def on_scroll_to_anchor(self, data):
self.show_name(data.name, initial_position={'type':'anchor', 'anchor':data.frag, 'replace_history':False}) self.show_name(data.name, initial_position={'type':'anchor', 'anchor':data.frag, 'replace_history':False})
def goto_bookpos(self, bookpos):
cfiname, internal_cfi = self.parse_cfi(bookpos, self.book)
if cfiname and internal_cfi:
pos = {}
name = cfiname
pos.type, pos.cfi = 'cfi', internal_cfi
self.show_name(name, initial_position=pos)
def goto_named_destination(self, name, frag): def goto_named_destination(self, name, frag):
if self.currently_showing.name is name: if self.currently_showing.name is name:
self.send_message('scroll_to_anchor', frag=frag) self.send_message('scroll_to_anchor', frag=frag)