From cf3d4c32c3be07a6b0f8e1b16e0b15bde23a1195 Mon Sep 17 00:00:00 2001 From: LecygneNoir Date: Sun, 28 Feb 2021 10:27:40 +0100 Subject: [PATCH] Better resilience for the genconfig function thanks to happy path and @Zykino suggestion! --- prismedia/genconfig.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/prismedia/genconfig.py b/prismedia/genconfig.py index 03273ac..d3a29c7 100644 --- a/prismedia/genconfig.py +++ b/prismedia/genconfig.py @@ -6,19 +6,18 @@ logger = logging.getLogger('Prismedia') from . import utils + def genconfig(): path = join(dirname(__file__), 'config') files = [f for f in listdir(path) if isfile(join(path, f))] for f in files: final_f = f.replace(".sample", "") - overwrite = True - if exists(final_f): - overwrite = utils.ask_overwrite(final_f + " already exists. Do you want to overwrite it?") + if exists(final_f) and not utils.ask_overwrite(final_f + " already exists. Do you want to overwrite it?"): + continue - if overwrite: - copyfile(join(path, f), final_f) - logger.info(str(final_f) + " correctly generated, you may now edit it to fill your credentials.") + copyfile(join(path, f), final_f) + logger.info(str(final_f) + " correctly generated, you may now edit it to fill your credentials.") if __name__ == '__main__':