Make it easier to save configuration files (#1659)

* updated save menu for configuration files

* add log message to TUI to let user know we may run for a second finding save directories

* remove testing line

* remove unnecessary non-relative import

* fix bug when skipping save location

* make save configuration translatable

* fix linting errors

* handle skip and reset options correctly

* fix flake8 linting error

---------

Co-authored-by: Anton Hvornum <anton@hvornum.se>
This commit is contained in:
bd-g 2023-04-01 04:13:18 -04:00 committed by GitHub
parent dc5291f781
commit 7ad00d96e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 74 additions and 16 deletions

View File

@ -1,9 +1,12 @@
from __future__ import annotations from __future__ import annotations
import logging
from pathlib import Path from pathlib import Path
from typing import Any, Dict, TYPE_CHECKING from typing import Any, Dict, TYPE_CHECKING
from ..configuration import ConfigurationOutput from ..configuration import ConfigurationOutput
from ..general import SysCommand
from ..menu import Menu from ..menu import Menu
from ..menu.menu import MenuSelectionType from ..menu.menu import MenuSelectionType
from ..output import log from ..output import log
@ -58,20 +61,75 @@ def save_config(config: Dict):
if choice.type_ == MenuSelectionType.Skip: if choice.type_ == MenuSelectionType.Skip:
return return
while True: dirs_to_exclude = [
path = input(_('Enter a directory for the configuration(s) to be saved: ')).strip(' ') '/bin',
dest_path = Path(path) '/dev',
if dest_path.exists() and dest_path.is_dir(): '/lib',
break '/lib64',
log(_('Not a valid directory: {}').format(dest_path), fg='red') '/lost+found',
'/opt',
'/proc',
'/run',
'/sbin',
'/srv',
'/sys',
'/usr',
'/var',
]
log(
_('When picking a directory to save configuration files to,'
' by default we will ignore the following folders: ') + ','.join(dirs_to_exclude),
level=logging.DEBUG
)
if options['user_config'] == choice.value: log(_('Finding possible directories to save configuration files ...'), level=logging.INFO)
config_output.save_user_config(dest_path)
elif options['user_creds'] == choice.value: find_exclude = '-path ' + ' -prune -o -path '.join(dirs_to_exclude) + ' -prune '
config_output.save_user_creds(dest_path) file_picker_command = f'find / {find_exclude} -o -type d -print0'
elif options['disk_layout'] == choice.value: possible_save_dirs = list(
config_output.save_disk_layout(dest_path) filter(None, SysCommand(file_picker_command).decode().split('\x00'))
elif options['all'] == choice.value: )
config_output.save_user_config(dest_path)
config_output.save_user_creds(dest_path) selection = Menu(
config_output.save_disk_layout(dest_path) _('Select directory (or directories) for saving configuration files'),
possible_save_dirs,
multi=True,
skip=True,
allow_reset=False,
).run()
match selection.type_:
case MenuSelectionType.Skip:
return
case _:
save_dirs = selection.value
prompt = _('Do you want to save {} configuration file(s) in the following locations?\n\n{}').format(
list(options.keys())[list(options.values()).index(choice.value)],
save_dirs
)
save_confirmation = Menu(prompt, Menu.yes_no(), default_option=Menu.yes()).run()
if save_confirmation == Menu.no():
return
log(
_('Saving {} configuration files to {}').format(
list(options.keys())[list(options.values()).index(choice.value)],
save_dirs
),
level=logging.DEBUG
)
if save_dirs is not None:
for save_dir_str in save_dirs:
save_dir = Path(save_dir_str)
if options['user_config'] == choice.value:
config_output.save_user_config(save_dir)
elif options['user_creds'] == choice.value:
config_output.save_user_creds(save_dir)
elif options['disk_layout'] == choice.value:
config_output.save_disk_layout(save_dir)
elif options['all'] == choice.value:
config_output.save_user_config(save_dir)
config_output.save_user_creds(save_dir)
config_output.save_disk_layout(save_dir)