From bfa9c26c682085e7a4984333725fe2a390eca71f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 26 Dec 2016 16:13:42 +0530 Subject: [PATCH] E-book viewer; Fix a bug preventing the viewer from working when the temporary directory is a symlink (common on OS X). Fixes #1652541 [e-book viewer does not work w/Mac OS 10.12.3 Beta](https://bugs.launchpad.net/calibre/+bug/1652541) --- src/calibre/ebooks/oeb/iterator/book.py | 2 +- src/calibre/gui2/viewer/fake_net.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/ebooks/oeb/iterator/book.py b/src/calibre/ebooks/oeb/iterator/book.py index f419c000cb..08208c9150 100644 --- a/src/calibre/ebooks/oeb/iterator/book.py +++ b/src/calibre/ebooks/oeb/iterator/book.py @@ -139,7 +139,7 @@ class EbookIterator(BookmarksMixin): self.delete_on_exit = [] self._tdir = TemporaryDirectory('_ebook_iter') - self.base = self._tdir.__enter__() + self.base = os.path.realpath(self._tdir.__enter__()) self.book_format, self.pathtoopf, input_fmt = run_extract_book( self.pathtoebook, self.base, only_input_plugin=only_input_plugin, view_kepub=view_kepub, processed=processed) self.opf = OPF(self.pathtoopf, os.path.dirname(self.pathtoopf)) diff --git a/src/calibre/gui2/viewer/fake_net.py b/src/calibre/gui2/viewer/fake_net.py index c7b46749c2..318bc54f72 100644 --- a/src/calibre/gui2/viewer/fake_net.py +++ b/src/calibre/gui2/viewer/fake_net.py @@ -76,7 +76,7 @@ class NetworkAccessManager(QNetworkAccessManager): def set_book_data(self, root, spine): self.orig_root = root - self.root = os.path.normcase(os.path.abspath(root)) + self.root = normpath(root) self.mime_map, self.single_pages, self.codec_map = {}, set(), {} for p in spine: mt = getattr(p, 'mime_type', None)