Merge pull request #2495 from SpirosChadoulos/master

Added a terminal bell if interaction from the user is required, according to this issue: https://github.com/beetbox/beets/issues/2366
This commit is contained in:
Adrian Sampson 2017-03-27 23:37:11 -04:00 committed by GitHub
commit ae42ea6210
4 changed files with 15 additions and 0 deletions

View file

@ -25,6 +25,7 @@ import:
pretend: false
search_ids: []
duplicate_action: ask
bell: no
clutter: ["Thumbs.DB", ".DS_Store"]
ignore: [".*", "*~", "System Volume Information", "lost+found"]

View file

@ -613,6 +613,9 @@ def choose_candidate(candidates, singleton, rec, cur_artist=None,
})
if default is None:
require = True
# Bell ring when user interaction is needed.
if config['import']['bell']:
ui.print_('\a', end='')
sel = ui.input_options((u'Apply', u'More candidates') + choice_opts,
require=require, default=default)
if sel == u'a':

View file

@ -44,6 +44,9 @@ New features:
you have in your library. Thanks to :user:`qlyoung`. :bug:`2481`
* :doc:`/plugins/web` : Add new `reverse_proxy` config option to allow serving
the web plugins under a reverse proxy.
* A new :ref:`bell` configuration option under the ``import`` section enables
a terminal bell when input is required. Thanks to :user:`SpirosChadoulos`.
:bug:`2366` :bug:`2495`
Fixes:

View file

@ -576,6 +576,14 @@ skipped; "keep" means keep both old and new items; "remove" means remove old
item; "ask" means the user should be prompted for the action each time.
The default is ``ask``.
.. _bell:
bell
~~~~
Ring the terminal bell to get your attention when the importer needs your input.
Default: ``no``.
.. _musicbrainz-config: