diff --git a/src/calibre/gui2/dialogs/tweak_epub.py b/src/calibre/gui2/dialogs/tweak_epub.py
index edc274c9b2..732d74b77d 100755
--- a/src/calibre/gui2/dialogs/tweak_epub.py
+++ b/src/calibre/gui2/dialogs/tweak_epub.py
@@ -7,16 +7,16 @@
__docformat__ = 'restructuredtext en'
import os, shutil
-from contextlib import closing
from zipfile import ZipFile, ZIP_DEFLATED, ZIP_STORED
from PyQt4.Qt import QDialog
from calibre.constants import isosx
-from calibre.gui2 import open_local_file
+from calibre.gui2 import open_local_file, error_dialog
from calibre.gui2.dialogs.tweak_epub_ui import Ui_Dialog
from calibre.libunzip import extract as zipextract
-from calibre.ptempfile import PersistentTemporaryDirectory
+from calibre.ptempfile import (PersistentTemporaryDirectory,
+ PersistentTemporaryFile)
class TweakEpub(QDialog, Ui_Dialog):
'''
@@ -37,11 +37,15 @@ def __init__(self, parent, epub):
self.cancel_button.clicked.connect(self.reject)
self.explode_button.clicked.connect(self.explode)
self.rebuild_button.clicked.connect(self.rebuild)
+ self.preview_button.clicked.connect(self.preview)
# Position update dialog overlaying top left of app window
parent_loc = parent.pos()
self.move(parent_loc.x(),parent_loc.y())
+ self.gui = parent
+ self._preview_files = []
+
def cleanup(self):
if isosx:
try:
@@ -55,6 +59,11 @@ def cleanup(self):
# Delete directory containing exploded ePub
if self._exploded is not None:
shutil.rmtree(self._exploded, ignore_errors=True)
+ for x in self._preview_files:
+ try:
+ os.remove(x)
+ except:
+ pass
def display_exploded(self):
'''
@@ -71,9 +80,8 @@ def explode(self, *args):
self.rebuild_button.setEnabled(True)
self.explode_button.setEnabled(False)
- def rebuild(self, *args):
- self._output = os.path.join(self._exploded, 'rebuilt.epub')
- with closing(ZipFile(self._output, 'w', compression=ZIP_DEFLATED)) as zf:
+ def do_rebuild(self, src):
+ with ZipFile(src, 'w', compression=ZIP_DEFLATED) as zf:
# Write mimetype
zf.write(os.path.join(self._exploded,'mimetype'), 'mimetype', compress_type=ZIP_STORED)
# Write everything else
@@ -86,5 +94,23 @@ def rebuild(self, *args):
zfn = os.path.relpath(absfn,
self._exploded).replace(os.sep, '/')
zf.write(absfn, zfn)
+
+ def preview(self):
+ if not self._exploded:
+ return error_dialog(self, _('Cannot preview'),
+ _('You must first explode the epub before previewing.'),
+ show=True)
+
+ tf = PersistentTemporaryFile('.epub')
+ tf.close()
+ self._preview_files.append(tf.name)
+
+ self.do_rebuild(tf.name)
+
+ self.gui.iactions['View']._view_file(tf.name)
+
+ def rebuild(self, *args):
+ self._output = os.path.join(self._exploded, 'rebuilt.epub')
+ self.do_rebuild(self._output)
return QDialog.accept(self)
diff --git a/src/calibre/gui2/dialogs/tweak_epub.ui b/src/calibre/gui2/dialogs/tweak_epub.ui
index fc6f24675f..a59af4fde1 100644
--- a/src/calibre/gui2/dialogs/tweak_epub.ui
+++ b/src/calibre/gui2/dialogs/tweak_epub.ui
@@ -23,6 +23,16 @@
false
+ -
+
+
+ <p>Explode the ePub to display contents in a file browser window. To tweak individual files, right-click, then 'Open with...' your editor of choice. When tweaks are complete, close the file browser window <b>and the editor windows you used to edit files in the epub</b>.</p><p>Rebuild the ePub, updating your calibre library.</p>
+
+
+ true
+
+
+
-
@@ -37,23 +47,6 @@
- -
-
-
- false
-
-
- Rebuild ePub from exploded contents
-
-
- &Rebuild ePub
-
-
-
- :/images/exec.png:/images/exec.png
-
-
-
-
@@ -68,13 +61,31 @@
- -
-
-
- <p>Explode the ePub to display contents in a file browser window. To tweak individual files, right-click, then 'Open with...' your editor of choice. When tweaks are complete, close the file browser window <b>and the editor windows you used to edit files in the epub</b>.</p><p>Rebuild the ePub, updating your calibre library.</p>
+
-
+
+
+ false
-
- true
+
+ Rebuild ePub from exploded contents
+
+
+ &Rebuild ePub
+
+
+
+ :/images/exec.png:/images/exec.png
+
+
+
+ -
+
+
+ &Preview ePub
+
+
+
+ :/images/view.png:/images/view.png