From fa5862d7d55c387accfbdc5b29e2d2dea6c7dbfc Mon Sep 17 00:00:00 2001 From: alicezou Date: Thu, 7 Apr 2022 15:21:34 -0400 Subject: [PATCH] change func name, inline function, fix typo --- beets/ui/__init__.py | 17 +++++------------ beets/ui/commands.py | 3 --- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/beets/ui/__init__.py b/beets/ui/__init__.py index a50c3464f..365a0d529 100644 --- a/beets/ui/__init__.py +++ b/beets/ui/__init__.py @@ -1206,22 +1206,15 @@ def _configure(options): util.displayable_path(config.config_dir())) return config -# Check whether parental directories exist. - -def database_dir_creation(path): - # Ask the user for a choice. - return input_yn("The database directory {} does not \ - exists. Create it (Y/n)?" - .format(util.displayable_path(path))) - - -def _check_db_directory_exists(path): +def _ensure_db_directory_exists(path): if path == b':memory:': # in memory db return newpath = os.path.dirname(path) if not os.path.isdir(newpath): - if database_dir_creation(newpath): + if input_yn("The database directory {} does not \ + exist. Create it (Y/n)?" + .format(util.displayable_path(newpath))): os.makedirs(newpath) @@ -1229,7 +1222,7 @@ def _open_library(config): """Create a new library instance from the configuration. """ dbpath = util.bytestring_path(config['library'].as_filename()) - _check_db_directory_exists(dbpath) + _ensure_db_directory_exists(dbpath) try: lib = library.Library( dbpath, diff --git a/beets/ui/commands.py b/beets/ui/commands.py index a18b09f7d..3a3374013 100755 --- a/beets/ui/commands.py +++ b/beets/ui/commands.py @@ -1398,9 +1398,6 @@ version_cmd = ui.Subcommand( version_cmd.func = show_version default_commands.append(version_cmd) -# database_location: return true if user -# wants to create the parent directories. - # modify: Declaratively change metadata.