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

EPUB Input: Handle ncx files that have <navpoint> elements with no content correctly. Fixes #7396 (calibre does not show TOC from attached epub file)

Browse Source
This commit is contained in:
Kovid Goyal 2010-11-03 10:05:26 -06:00
parent 219feadc1e
commit 908c0ce46e
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/calibre/ebooks/metadata/toc.py
View File

@ -182,6 +182,7 @@ class TOC(list):
except:
play_order = 1
href = fragment = text = None
nd = dest
nl = nl_path(np)
if nl:
nl = nl[0]
@ -190,17 +191,14 @@ class TOC(list):
text += etree.tostring(txt, method='text',
encoding=unicode, with_tail=False)
content = content_path(np)
if not content or not text:
return
content = content[0]
src = get_attr(content, attr='src')
if src is None:
return
purl = urlparse(unquote(content.get('src')))
href, fragment = purl[2], purl[5]
nd = dest.add_item(href, fragment, text)
nd.play_order = play_order
if content and text:
content = content[0]
src = get_attr(content, attr='src')
if src:
purl = urlparse(unquote(content.get('src')))
href, fragment = purl[2], purl[5]
nd = dest.add_item(href, fragment, text)
nd.play_order = play_order
for c in np_path(np):
process_navpoint(c, nd)

9
src/calibre/gui2/viewer/main.py
View File

@ -358,10 +358,11 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
def toc_clicked(self, index):
item = self.toc_model.itemFromIndex(index)
url = QUrl.fromLocalFile(item.abspath)
if item.fragment:
url.setFragment(item.fragment)
self.link_clicked(url)
if item.abspath is not None:
url = QUrl.fromLocalFile(item.abspath)
if item.fragment:
url.setFragment(item.fragment)
self.link_clicked(url)
def selection_changed(self, selected_text):
self.selected_text = selected_text.strip()