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

Fix #884

Browse Source
This commit is contained in:
Kovid Goyal 2008-07-17 14:42:15 -07:00
parent 6c339c4d4b
commit 669b983d75
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,7 @@ class TOC(list):
break break
if toc is not None: if toc is not None:
if toc.lower() != 'ncx': if toc.lower() not in ('ncx', 'ncxtoc'):
toc = urlparse(unquote(toc))[2] toc = urlparse(unquote(toc))[2]
toc = toc.replace('/', os.sep) toc = toc.replace('/', os.sep)
if not os.path.isabs(toc): if not os.path.isabs(toc):
@ -88,6 +88,10 @@ class TOC(list):
traceback.print_exc(file=sys.stdout) traceback.print_exc(file=sys.stdout)
print 'Continuing anyway' print 'Continuing anyway'
else: else:
path = opfreader.manifest.item(toc.lower())
if path and os.access(path, os.R_OK):
self.read_ncx_toc(path)
return
cwd = os.path.abspath(self.base_path) cwd = os.path.abspath(self.base_path)
m = glob.glob(os.path.join(cwd, '*.ncx')) m = glob.glob(os.path.join(cwd, '*.ncx'))
if m: if m: