diff --git a/NEWS b/NEWS index 3959697b7..8a1ad3958 100644 --- a/NEWS +++ b/NEWS @@ -26,6 +26,8 @@ * "import -l" now logs duplicate albums. * A new "import_progress" option can be used to disable the importer's resuming feature. +* Resuming is automatically disabled when the importer is in quiet (-q) + mode. Progress is still saved, however. * Fix a bug where some files would be erroneously interpreted as MP4. * Fix permission bits applied to album art files. * Fix malformed MusicBrainz queries caused by null characters. diff --git a/beets/ui/__init__.py b/beets/ui/__init__.py index 1104bf7bb..d661802d1 100644 --- a/beets/ui/__init__.py +++ b/beets/ui/__init__.py @@ -262,7 +262,6 @@ class SubcommandsOptionParser(optparse.OptionParser): """A variant of OptionParser that parses subcommands and their arguments. """ - # A singleton command used to give help on other subcommands. _HelpSubcommand = Subcommand('help', optparse.OptionParser(), help='give detailed help on a specific sub-command', diff --git a/beets/ui/commands.py b/beets/ui/commands.py index 5f2afde5c..0fc7c56bf 100644 --- a/beets/ui/commands.py +++ b/beets/ui/commands.py @@ -565,7 +565,7 @@ def import_files(lib, paths, copy, write, autot, logpath, if autot: # Autotag. Set up the pipeline. pl = pipeline.Pipeline([ - read_albums(paths, progress), + read_albums(paths, progress and not quiet), initial_lookup(), user_query(lib, logfile, color, quiet), apply_choices(lib, copy, write, art, delete, progress),