From da62c027a78dee462e46f84ea3d46c6446ee0e96 Mon Sep 17 00:00:00 2001 From: Marc Michalsky Date: Sun, 14 Feb 2021 20:58:48 +0100 Subject: [PATCH] code cleanup --- restore.py | 9 --------- utils.py | 8 ++++---- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/restore.py b/restore.py index 4e901ec..e30123b 100644 --- a/restore.py +++ b/restore.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -import datetime import os import sys from pathlib import Path @@ -9,16 +8,10 @@ import utils from utils import _print from models import Container from models import Log - from simple_term_menu import TerminalMenu -# terminal_menu = TerminalMenu(["entry 1", "entry 2", "entry 3"]) -# choice_index = terminal_menu.show() -# https://stackoverflow.com/posts/61265356/revisions - def restore(): - restore_status = True # Set flags utils.set_flags(sys.argv) @@ -44,7 +37,6 @@ def restore(): containers = {containers_to_choose_from[choice_index]: containers.get(containers_to_choose_from[choice_index])} container: Container - results = {} for container in containers.values(): # Start restore @@ -92,7 +84,6 @@ def restore(): _print(F"{Fore.YELLOW}Exception occurred in method: Container.{func}(){Style.RESET_ALL}") _print(traceback) _print() - backup_status = False if not utils.no_log and settings_list['log']['logging']: log.log(F"Restore backup ; {container.name} ; {container.restore_tar_file_path} ; FAIL") diff --git a/utils.py b/utils.py index 1a94c26..3fb5d8f 100644 --- a/utils.py +++ b/utils.py @@ -11,18 +11,18 @@ keep_maintenance_mode = False def set_flags(flags=list): + global no_confirm + global all_containers global quiet_mode global no_log global no_cleanup - global all_containers - global no_confirm global no_backup + no_confirm = "--yes" in flags + all_containers = "--all" in flags quiet_mode = "--quiet" in flags no_log = "--nolog" in flags - all_containers = "--all" in flags no_cleanup = "--nocleanup" in flags - no_confirm = "--yes" in flags no_backup = "--nobackup" in flags