From f145e3b1842c8165c68bad4a0b2d64d3497733d2 Mon Sep 17 00:00:00 2001 From: Adrian Sampson Date: Sun, 18 Jan 2015 14:58:08 -0800 Subject: [PATCH] More comment cleanup It has been a while since I have looked at these, and many of the FIXMEs no longer make sense to me. Better to open issues if there's really something to fix. --- beets/importer.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/beets/importer.py b/beets/importer.py index 5d458e580..52a721d4a 100644 --- a/beets/importer.py +++ b/beets/importer.py @@ -283,25 +283,28 @@ class ImportSession(object): else: stages = [query_tasks(self)] + # In pretend mode, just log what would otherwise be imported. if self.config['pretend']: - # Only log the imported files and end the pipeline stages += [log_files(self)] else: if self.config['group_albums'] and \ not self.config['singletons']: - # Split directory tasks into one task for each album + # Split directory tasks into one task for each album. stages += [group_albums(self)] + if self.config['autotag']: - # FIXME We should also resolve duplicates when not - # autotagging. This is currently handled in `user_query` stages += [lookup_candidates(self), user_query(self)] else: stages += [import_asis(self)] + stages += [apply_choices(self)] + # Plugin stages. for stage_func in plugins.import_stages(): stages.append(plugin_stage(self, stage_func)) + stages += [manipulate_files(self)] + pl = pipeline.Pipeline(stages) # Run the pipeline. @@ -514,8 +517,6 @@ class ImportTask(object): def cleanup(self, copy=False, delete=False, move=False): """Remove and prune imported paths. """ - # FIXME Maybe the keywords should be task properties. - # Do not delete any files or prune directories when skipping. if self.skip: return