From 85f0fe9b6fbf9561e04f1708de133c99c9465455 Mon Sep 17 00:00:00 2001 From: LecygneNoir Date: Sun, 28 Feb 2021 10:09:54 +0100 Subject: [PATCH] Add ask_overwirte function to utils in order to be more general and usable in other modules --- prismedia/genconfig.py | 12 ++---------- prismedia/utils.py | 9 +++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/prismedia/genconfig.py b/prismedia/genconfig.py index 3f05dbb..03273ac 100644 --- a/prismedia/genconfig.py +++ b/prismedia/genconfig.py @@ -4,15 +4,7 @@ from shutil import copyfile import logging logger = logging.getLogger('Prismedia') - -def overwrite_or_not(question): - while True: - reply = str(input(question + ' (Yes/[No]): ') or "No").lower().strip() - if reply[:1] == 'y': - return True - if reply[:1] == 'n': - return False - +from . import utils def genconfig(): path = join(dirname(__file__), 'config') @@ -22,7 +14,7 @@ def genconfig(): final_f = f.replace(".sample", "") overwrite = True if exists(final_f): - overwrite = overwrite_or_not(final_f + " already exists. Do you want to overwrite it?") + overwrite = utils.ask_overwrite(final_f + " already exists. Do you want to overwrite it?") if overwrite: copyfile(join(path, f), final_f) diff --git a/prismedia/utils.py b/prismedia/utils.py index 86d4a33..9cb87c2 100644 --- a/prismedia/utils.py +++ b/prismedia/utils.py @@ -100,6 +100,15 @@ def getLanguage(language, platform): return PEERTUBE_LANGUAGE[language.lower()] +def ask_overwrite(question): + while True: + reply = str(input(question + ' (Yes/[No]): ') or "No").lower().strip() + if reply[:1] == 'y': + return True + if reply[:1] == 'n': + return False + + def remove_empty_kwargs(**kwargs): good_kwargs = {} if kwargs is not None: