From a4b4e854a13eaa6fce28fffdb20f1517180c3666 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 12 Nov 2014 20:00:20 +0530 Subject: [PATCH] ... --- src/calibre/ebooks/metadata/zip.py | 2 +- src/calibre/gui2/add.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/calibre/ebooks/metadata/zip.py b/src/calibre/ebooks/metadata/zip.py index 4a7926339d..ea7e107f4b 100644 --- a/src/calibre/ebooks/metadata/zip.py +++ b/src/calibre/ebooks/metadata/zip.py @@ -39,7 +39,7 @@ def get_metadata(stream): pass mi.timestamp = None return mi - raise ValueError('No ebook found in ZIP archive') + raise ValueError('No ebook found in ZIP archive (%s)' % os.path.basename(getattr(stream, 'name', '') or '')) def zip_opf_metadata(opfpath, zf): diff --git a/src/calibre/gui2/add.py b/src/calibre/gui2/add.py index 25201f766d..159b385111 100644 --- a/src/calibre/gui2/add.py +++ b/src/calibre/gui2/add.py @@ -66,7 +66,6 @@ class Adder(QObject): self.callback = callback self.add_formats_to_existing = prefs['add_formats_to_existing'] self.do_one_signal.connect(self.tick, type=Qt.QueuedConnection) - self.tdir = PersistentTemporaryDirectory('_add_books') self.pool = pool self.pd = ProgressDialog(_('Adding books...'), _('Scanning for files...'), min=0, max=0, parent=parent, icon='add_book.png') self.db = getattr(db, 'new_api', None) @@ -97,7 +96,6 @@ class Adder(QObject): self.abort_scan = True self.pd.close() self.pd.deleteLater() - shutil.rmtree(self.tdir, ignore_errors=True) if self.pool is not None: self.pool.shutdown() if not self.items: