From 732ffd10ff02f8e074d97cbbe7435a6b9e40925c Mon Sep 17 00:00:00 2001 From: Julien Cassette Date: Sun, 29 Jun 2014 22:32:45 +0200 Subject: [PATCH] Importer: save progress for skipped tasks Save progress and history for import tasks that are skipped by the user, so they are recorded for import resuming and incremental importing. Fix issue #844 --- beets/importer.py | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/beets/importer.py b/beets/importer.py index 4fd4749ee..afffde9bd 100644 --- a/beets/importer.py +++ b/beets/importer.py @@ -389,10 +389,11 @@ class ImportTask(object): if session.config['incremental']: self.save_history() - self.cleanup(copy=session.config['copy'], - delete=session.config['delete'], - move=session.config['move']) - self._emit_imported(session.lib) + if not self.skip: + self.cleanup(copy=session.config['copy'], + delete=session.config['delete'], + move=session.config['move']) + self._emit_imported(session.lib) def cleanup(self, copy=False, delete=False, move=False): """Remove and prune imported paths. @@ -1062,18 +1063,16 @@ def manipulate_files(session, task): manipulations *after* items have been added to the library and finalizes each task. """ - if task.skip: - return + if not task.skip: + if task.should_remove_duplicates: + task.remove_duplicates(session.lib) - if task.should_remove_duplicates: - task.remove_duplicates(session.lib) - - task.manipulate_files( - move=session.config['move'], - copy=session.config['copy'], - write=session.config['write'], - session=session, - ) + task.manipulate_files( + move=session.config['move'], + copy=session.config['copy'], + write=session.config['write'], + session=session, + ) # Progress, cleanup, and event. task.finalize(session)