Pull from trunk

src/calibre/customize/builtins.py

@@ -665,13 +665,17 @@ class ActionCopyToLibrary(InterfaceActionBase):
     name = 'Copy To Library'
     actual_plugin = 'calibre.gui2.actions.copy_to_library:CopyToLibraryAction'
 
+class ActionTweakEpub(InterfaceActionBase):
+    name = 'Tweak ePub'
+    actual_plugin = 'calibre.gui2.actions.tweak_epub:TweakEpubAction'
+
 plugins += [ActionAdd, ActionFetchAnnotations, ActionGenerateCatalog,
         ActionConvert, ActionDelete, ActionEditMetadata, ActionView,
         ActionFetchNews, ActionSaveToDisk, ActionShowBookDetails,
         ActionRestart, ActionOpenFolder, ActionConnectShare,
         ActionSendToDevice, ActionHelp, ActionPreferences, ActionSimilarBooks,
         ActionAddToLibrary, ActionEditCollections, ActionChooseLibrary,
-        ActionCopyToLibrary]
+        ActionCopyToLibrary, ActionTweakEpub]
 
 # }}}
 

src/calibre/devices/apple/driver.py

@@ -740,7 +740,7 @@ class ITUNES(DriverBase):
 
             # Purge the booklist, self.cached_books, thumb cache
             for i,bl_book in enumerate(booklists[0]):
-                if DEBUG:
+                if False:
                     self.log.info(" evaluating '%s' by '%s' uuid:%s" %
                                   (bl_book.title, bl_book.author,bl_book.uuid))
 

src/calibre/gui2/__init__.py

@@ -39,7 +39,7 @@ gprefs.defaults['action-layout-context-menu'] = (
         'Edit Metadata', 'Send To Device', 'Save To Disk',
         'Connect Share', 'Copy To Library', None,
         'Convert Books', 'View', 'Open Folder', 'Show Book Details',
-        'Similar Books', None, 'Remove Books',
+        'Similar Books', 'Tweak ePub', None, 'Remove Books',
         )
 
 gprefs.defaults['action-layout-context-menu-device'] = (

src/calibre/gui2/actions/tweak_epub.py

@@ -0,0 +1,56 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+
+__license__   = 'GPL v3'
+__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+from calibre.gui2 import error_dialog
+from calibre.gui2.actions import InterfaceAction
+from calibre.gui2.dialogs.tweak_epub import TweakEpub
+
+class TweakEpubAction(InterfaceAction):
+
+    name = 'Tweak ePub'
+    action_spec = (_('Tweak ePub'), 'trim.png',
+            _('Make small changes to ePub format books'),
+            _('T'))
+    dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
+    action_type = 'current'
+
+    def genesis(self):
+        self.qaction.triggered.connect(self.edit_epub_in_situ)
+
+    def edit_epub_in_situ(self, *args):
+        row = self.gui.library_view.currentIndex()
+        if not row.isValid():
+            return error_dialog(self.gui, _('Cannot tweak ePub'),
+                    _('No book selected'), show=True)
+
+        # Confirm 'EPUB' in formats
+        book_id = self.gui.library_view.model().id(row)
+        try:
+            path_to_epub = self.gui.library_view.model().db.format_abspath(
+                    book_id, 'EPUB', index_is_id=True)
+        except:
+            path_to_epub = None
+
+        if not path_to_epub:
+            return error_dialog(self.gui, _('Cannot tweak ePub'),
+                    _('No ePub available. First convert the book to ePub.'),
+                    show=True)
+
+
+        # Launch a modal dialog waiting for user to complete or cancel
+        dlg = TweakEpub(self.gui, path_to_epub)
+        if dlg.exec_() == dlg.Accepted:
+            self.update_db(book_id, dlg._output)
+        dlg.cleanup()
+
+    def update_db(self, book_id, rebuilt):
+        '''
+        Update the calibre db with the tweaked epub
+        '''
+        self.gui.library_view.model().db.add_format(book_id, 'EPUB',
+                open(rebuilt, 'rb'), index_is_id=True)
+

src/calibre/gui2/dialogs/tweak_epub.py

@@ -0,0 +1,84 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+from __future__ import with_statement
+
+__license__   = 'GPL v3'
+__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
+__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.gui2 import open_local_file
+from calibre.gui2.dialogs.tweak_epub_ui import Ui_Dialog
+from calibre.libunzip import extract as zipextract
+from calibre.ptempfile import PersistentTemporaryDirectory
+
+class TweakEpub(QDialog, Ui_Dialog):
+    '''
+    Display controls for tweaking ePubs
+
+    To do:
+        - need way to kill file browser proc in cleanup()
+    '''
+
+    def __init__(self, parent, epub):
+        QDialog.__init__(self, parent)
+
+        self._epub = epub
+        self._exploded = None
+        #self._file_browser_proc = None
+        self._output = None
+
+        # Run the dialog setup generated from tweak_epub.ui
+        self.setupUi(self)
+
+        self.cancel_button.clicked.connect(self.reject)
+        self.explode_button.clicked.connect(self.explode)
+        self.rebuild_button.clicked.connect(self.rebuild)
+
+        # Position update dialog overlaying top left of app window
+        parent_loc = parent.pos()
+        self.move(parent_loc.x(),parent_loc.y())
+
+    def cleanup(self):
+        # Delete directory containing exploded ePub
+        if self._exploded is not None:
+            shutil.rmtree(self._exploded, ignore_errors=True)
+
+
+    def display_exploded(self):
+        '''
+        Generic subprocess launch of native file browser
+        User can use right-click to 'Open with ...'
+        '''
+        open_local_file(self._exploded)
+
+    def explode(self, *args):
+        if self._exploded is None:
+            self._exploded = PersistentTemporaryDirectory("_exploded", prefix='')
+            zipextract(self._epub, self._exploded)
+            self.display_exploded()
+            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:
+            # Write mimetype
+            zf.write(os.path.join(self._exploded,'mimetype'), 'mimetype', compress_type=ZIP_STORED)
+            # Write everything else
+            exclude_files = ['.DS_Store','mimetype','iTunesMetadata.plist','rebuilt.epub']
+            for root, dirs, files in os.walk(self._exploded):
+                for fn in files:
+                    if fn in exclude_files:
+                        continue
+                    absfn = os.path.join(root, fn)
+                    zfn = os.path.relpath(absfn,
+                            self._exploded).replace(os.sep, '/')
+                    zf.write(absfn, zfn)
+        return QDialog.accept(self)
+

src/calibre/gui2/dialogs/tweak_epub.ui

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog">
+  <property name="windowModality">
+   <enum>Qt::NonModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>382</width>
+    <height>242</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Tweak ePub</string>
+  </property>
+  <property name="sizeGripEnabled">
+   <bool>false</bool>
+  </property>
+  <property name="modal">
+   <bool>false</bool>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="1" column="0">
+    <widget class="QPushButton" name="explode_button">
+     <property name="statusTip">
+      <string>Display contents of exploded ePub</string>
+     </property>
+     <property name="text">
+      <string>&amp;Explode ePub</string>
+     </property>
+     <property name="icon">
+      <iconset resource="../../../../resources/images.qrc">
+       <normaloff>:/images/wizard.png</normaloff>:/images/wizard.png</iconset>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QPushButton" name="rebuild_button">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="statusTip">
+      <string>Rebuild ePub from exploded contents</string>
+     </property>
+     <property name="text">
+      <string>&amp;Rebuild ePub</string>
+     </property>
+     <property name="icon">
+      <iconset resource="../../../../resources/images.qrc">
+       <normaloff>:/images/exec.png</normaloff>:/images/exec.png</iconset>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QPushButton" name="cancel_button">
+     <property name="statusTip">
+      <string>Discard changes</string>
+     </property>
+     <property name="text">
+      <string>&amp;Cancel</string>
+     </property>
+     <property name="icon">
+      <iconset resource="../../../../resources/images.qrc">
+       <normaloff>:/images/window-close.png</normaloff>:/images/window-close.png</iconset>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>First, explode the epub. Then edit is contents by right clicking on the individual files and selecting the editor of your choice. When you are done, click rebuild epub and the epub in your calibre library will be updated with the changes you have made.</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../../../../resources/images.qrc"/>
+ </resources>
+ <connections/>
+</ui>

src/calibre/gui2/tools.py

@@ -217,6 +217,10 @@ def fetch_scheduled_recipe(arg):
     if 'output_profile' in ps:
         recs.append(('output_profile', ps['output_profile'],
             OptionRecommendation.HIGH))
+        if ps['output_profile'] == 'kindle':
+            recs.append(('no_inline_toc', True,
+                OptionRecommendation.HIGH))
+
     lf = load_defaults('look_and_feel')
     if lf.get('base_font_size', 0.0) != 0.0:
         recs.append(('base_font_size', lf['base_font_size'],