From c27bebd6faf9cf91e934f124439ff7389e4dd307 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 2 Apr 2012 18:32:57 +0530 Subject: [PATCH] ... --- src/calibre/gui2/actions/edit_metadata.py | 1 + src/calibre/gui2/metadata/bulk_download.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/actions/edit_metadata.py b/src/calibre/gui2/actions/edit_metadata.py index 3eb9a79122..a58bae25fd 100644 --- a/src/calibre/gui2/actions/edit_metadata.py +++ b/src/calibre/gui2/actions/edit_metadata.py @@ -120,6 +120,7 @@ class EditMetadataAction(InterfaceAction): payload, log_file, _('Download log'), _('Download complete'), msg, det_msg=det_msg, show_copy_button=show_copy_button, + cancel_callback=lambda x:self.cleanup_bulk_download(tdir), parent=self.gui, log_is_file=True) p.show() diff --git a/src/calibre/gui2/metadata/bulk_download.py b/src/calibre/gui2/metadata/bulk_download.py index 0f2f5ae9be..b199468309 100644 --- a/src/calibre/gui2/metadata/bulk_download.py +++ b/src/calibre/gui2/metadata/bulk_download.py @@ -124,7 +124,7 @@ def start_download(gui, ids, callback, ensure_fields=None): d.b.clicked.disconnect() if ret != d.Accepted: return - tf = PersistentTemporaryFile('_metadata_bulk_log_') + tf = PersistentTemporaryFile('_metadata_bulk.log') tf.close() job = Job('metadata bulk download', @@ -204,7 +204,7 @@ def download(all_ids, tf, db, do_identify, covers, ensure_fields, log=None, abort=None, notifications=None): batch_size = 10 batches = split_jobs(all_ids, batch_size=batch_size) - tdir = PersistentTemporaryDirectory('_metadata_bulk_') + tdir = PersistentTemporaryDirectory('_metadata_bulk') heartbeat = HeartBeat(tdir) failed_ids = set()