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

...

Browse Source
This commit is contained in:
Kovid Goyal 2014-11-12 20:00:20 +05:30
parent d6fe4bf8d3
commit a4b4e854a1
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/metadata/zip.py
View File

@ -39,7 +39,7 @@ def get_metadata(stream):
pass pass
mi.timestamp = None mi.timestamp = None
return mi 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 '<stream>'))
def zip_opf_metadata(opfpath, zf): def zip_opf_metadata(opfpath, zf):

2
src/calibre/gui2/add.py
View File

@ -66,7 +66,6 @@ class Adder(QObject):
self.callback = callback self.callback = callback
self.add_formats_to_existing = prefs['add_formats_to_existing'] self.add_formats_to_existing = prefs['add_formats_to_existing']
self.do_one_signal.connect(self.tick, type=Qt.QueuedConnection) self.do_one_signal.connect(self.tick, type=Qt.QueuedConnection)
self.tdir = PersistentTemporaryDirectory('_add_books')
self.pool = pool self.pool = pool
self.pd = ProgressDialog(_('Adding books...'), _('Scanning for files...'), min=0, max=0, parent=parent, icon='add_book.png') 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) self.db = getattr(db, 'new_api', None)
@ -97,7 +96,6 @@ class Adder(QObject):
self.abort_scan = True self.abort_scan = True
self.pd.close() self.pd.close()
self.pd.deleteLater() self.pd.deleteLater()
shutil.rmtree(self.tdir, ignore_errors=True)
if self.pool is not None: if self.pool is not None:
self.pool.shutdown() self.pool.shutdown()
if not self.items: if not self.items: