From 10e600a4ace065e8fd4cf7acb05f25091951fda2 Mon Sep 17 00:00:00 2001
From: ldericher <40151420+ldericher@users.noreply.github.com>
Date: Wed, 1 Dec 2021 13:02:49 +0100
Subject: [PATCH] cleanup

---
 kiwi_scp/commands/cli.py      | 17 +++++++++++------
 kiwi_scp/commands/cmd_list.py |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/kiwi_scp/commands/cli.py b/kiwi_scp/commands/cli.py
index 8616068..755162d 100644
--- a/kiwi_scp/commands/cli.py
+++ b/kiwi_scp/commands/cli.py
@@ -92,10 +92,15 @@ class KiwiCommand:
     def danger_confirm(*prompt_lines: str, default: Optional[bool] = None) -> bool:
         if default is True:
             suffix = "[YES|no]"
+            default_answer = "yes"
+
         elif default is False:
             suffix = "[yes|NO]"
+            default_answer = "no"
+
         else:
             suffix = "[yes|no]"
+            default_answer = None
 
         dumb = WParagraph.from_strings(
             click.style("WARNING", bold=True, underline=True, blink=True, fg="red"),
@@ -103,23 +108,23 @@ class KiwiCommand:
             click.style("を捨てないで下さい", fg="cyan"),
             click.style("DO NOT DUMB HERE", fg="yellow"),
             click.style("NO DUMB AREA", fg="yellow"),
-        ).align().surround("!")
+        ).align(WAlignment.CENTER).surround("!")
 
         prompt = WParagraph.from_strings(*prompt_lines).align(WAlignment.LEFT).emphasize(3)
 
         answer = input(
             f"{dumb}\n\n"
             f"{prompt}\n\n"
-            f"Are you sure you want to proceed? {suffix} "
+            f"Are you sure you want to proceed? {suffix}: "
         ).strip().lower()
 
-        if answer == '':
-            answer = default
+        if not answer:
+            answer = default_answer
 
-        while answer not in ['yes', 'no']:
+        while answer not in ["yes", "no"]:
             answer = input("Please type 'yes' or 'no' explicitly: ").strip().lower()
 
-        return answer == 'yes'
+        return answer == "yes"
 
     @classmethod
     def run(cls, instance: Instance, project_name: Optional[str] = None, service_names: Optional[List[str]] = None,
diff --git a/kiwi_scp/commands/cmd_list.py b/kiwi_scp/commands/cmd_list.py
index 092c8f9..0dca29d 100644
--- a/kiwi_scp/commands/cmd_list.py
+++ b/kiwi_scp/commands/cmd_list.py
@@ -28,7 +28,7 @@ class ListCommand(KiwiCommand):
         else:
             KiwiCommand.print_header(f"Projects in kiwi-scp instance at '{instance.directory}':")
             KiwiCommand.print_list(
-                project.name + click.style(" (disabled)" if not project.enabled else "", fg="red")
+                project.name + (click.style(" (disabled)", fg="red") if not project.enabled else "")
                 for project in instance.config.projects
             )