From f7c9a0764fce449b1929864f13404c92961465af Mon Sep 17 00:00:00 2001 From: S4NKALP Date: Sun, 2 Nov 2025 13:47:12 +0545 Subject: [PATCH] style: standardize prompt formatting and input handling --- djinit/scripts/app_generator.py | 4 +- djinit/scripts/input_handler.py | 89 +++++++++++++++++---------------- 2 files changed, 50 insertions(+), 43 deletions(-) diff --git a/djinit/scripts/app_generator.py b/djinit/scripts/app_generator.py index 10e2296..02b69a2 100644 --- a/djinit/scripts/app_generator.py +++ b/djinit/scripts/app_generator.py @@ -64,7 +64,9 @@ class AppManager: # Create app in the correct location # Use 'python -m django' instead of 'django-admin' for better compatibility with change_cwd(apps_base_dir): - subprocess.run([sys.executable, "-m", "django", "startapp", self.app_name], capture_output=True, text=True, check=True) + subprocess.run( + [sys.executable, "-m", "django", "startapp", self.app_name], capture_output=True, text=True, check=True + ) UIFormatter.print_success(f"Created Django app '{self.app_name}' in {apps_base_dir}") return True diff --git a/djinit/scripts/input_handler.py b/djinit/scripts/input_handler.py index 22aa8ac..af035a2 100644 --- a/djinit/scripts/input_handler.py +++ b/djinit/scripts/input_handler.py @@ -185,11 +185,11 @@ class InputCollector: # Get valid keys from CICDOption enum valid_keys = [option.key for option in CICDOption] - + choice = CharReader.get_cicd_choice( f"[{UIColors.HIGHLIGHT}]Your choice: [/{UIColors.HIGHLIGHT}]", valid_keys=valid_keys, - default=CICDOption.NONE.key + default=CICDOption.NONE.key, ) # Parse choice @@ -215,8 +215,7 @@ class InputCollector: console.print() choice = CharReader.get_yes_no( - f"[{UIColors.HIGHLIGHT}]Nested Django apps? (y/N):[/{UIColors.HIGHLIGHT}]", - default="n" + f"[{UIColors.HIGHLIGHT}]Nested Django apps? (y/N):[/{UIColors.HIGHLIGHT}]", default="n" ) if choice != "y": @@ -244,8 +243,7 @@ class InputCollector: console.print() choice = CharReader.get_yes_no( - f"[{UIColors.HIGHLIGHT}]Use DATABASE_URL? (Y/n):[/{UIColors.HIGHLIGHT}]", - default="y" + f"[{UIColors.HIGHLIGHT}]Use DATABASE_URL? (Y/n):[/{UIColors.HIGHLIGHT}]", default="y" ) # Return True if choice is 'y', False if 'n' @@ -265,46 +263,48 @@ class CharReader: def get_yes_no(prompt: str, default: str = "n") -> str: max_attempts = 3 attempt = 0 - + while attempt < max_attempts: try: console.print(f"{prompt} ", end="") sys.stdout.flush() - + reader = CharReader() response = reader.get_char() - + # Handle Enter key (default) - in raw mode, Enter is '\r' (carriage return) # Also handle empty string or other control characters as Enter - if not response or response == '\r' or response == '\n' or ord(response) < 32: + if not response or response == "\r" or response == "\n" or ord(response) < 32: console.print(default.upper()) return default.lower() - + response = response.lower() - + # Validate response - if response in ('y', 'n'): + if response in ("y", "n"): console.print(response.upper()) return response - + # Invalid input - show error (only show if it's a printable character) console.print() if response.isprintable(): UIFormatter.print_error(f"Invalid input '{response}'. Please enter 'y' or 'n'.") attempt += 1 if attempt < max_attempts: - console.print(f"[{UIColors.MUTED}]Please try again ({attempt}/{max_attempts}).[/{UIColors.MUTED}]") + console.print( + f"[{UIColors.MUTED}]Please try again ({attempt}/{max_attempts}).[/{UIColors.MUTED}]" + ) console.print() else: # Control character entered, treat as Enter console.print(default.upper()) return default.lower() - + except KeyboardInterrupt: console.print() UIFormatter.print_info("\nOperation cancelled by user.") raise - + # Max attempts reached - use default console.print() UIFormatter.print_warning(f"Maximum attempts reached. Using default: '{default.upper()}'.") @@ -314,40 +314,40 @@ class CharReader: def get_cicd_choice(prompt: str, valid_keys: list[str], default: str = "n") -> str: """ Get CI/CD choice input with validation and retries. - + Args: prompt: The prompt message to display valid_keys: List of valid key characters (e.g., ['g', 'l', 'b', 'n']) default: Default value if Enter is pressed - + Returns: Valid key (lowercase) """ max_attempts = 3 attempt = 0 valid_keys_lower = [k.lower() for k in valid_keys] - + while attempt < max_attempts: try: console.print(f"{prompt} ", end="") sys.stdout.flush() - + reader = CharReader() response = reader.get_char() - + # Handle Enter key (default) - in raw mode, Enter is '\r' (carriage return) # Also handle empty string or other control characters as Enter - if not response or response == '\r' or response == '\n' or ord(response) < 32: + if not response or response == "\r" or response == "\n" or ord(response) < 32: console.print(default.upper()) return default.lower() - + response = response.lower() - + # Validate response if response in valid_keys_lower: console.print(response.upper()) return response - + # Invalid input - show error (only show if it's a printable character) console.print() if response.isprintable(): @@ -355,18 +355,20 @@ class CharReader: UIFormatter.print_error(f"Invalid input '{response}'. Please enter one of: {valid_keys_str}.") attempt += 1 if attempt < max_attempts: - console.print(f"[{UIColors.MUTED}]Please try again ({attempt}/{max_attempts}).[/{UIColors.MUTED}]") + console.print( + f"[{UIColors.MUTED}]Please try again ({attempt}/{max_attempts}).[/{UIColors.MUTED}]" + ) console.print() else: # Control character entered, treat as Enter console.print(default.upper()) return default.lower() - + except KeyboardInterrupt: console.print() UIFormatter.print_info("\nOperation cancelled by user.") raise - + # Max attempts reached - use default console.print() UIFormatter.print_warning(f"Maximum attempts reached. Using default: '{default.upper()}'.") @@ -414,21 +416,23 @@ def get_user_input() -> Tuple[str, str, str, list, dict]: console.print(f"[{UIColors.HIGHLIGHT}]Project Directory[/{UIColors.HIGHLIGHT}]") console.print(f"[{UIColors.MUTED}]Where your project files will be created[/{UIColors.MUTED}]") console.print(f"[{UIColors.MUTED}]Press Enter or enter '.' to create in current directory[/{UIColors.MUTED}]") - + # Get project directory with special handling for '.' and empty input attempt = 0 project_dir = None - + while attempt < collector.MAX_ATTEMPTS and project_dir is None: try: - user_input = console.input(f"[{UIColors.HIGHLIGHT}]Enter project directory name:[/{UIColors.HIGHLIGHT}] ").strip() - + user_input = console.input( + f"[{UIColors.HIGHLIGHT}]Enter project directory name:[/{UIColors.HIGHLIGHT}] " + ).strip() + # Handle empty input or '.' - use current directory if not user_input or user_input == ".": project_dir = "." UIFormatter.print_info(f"Creating project in current directory: {os.getcwd()}") break - + # Validate the input is_valid, error_msg = validate_project_name(user_input) if not is_valid: @@ -436,26 +440,28 @@ def get_user_input() -> Tuple[str, str, str, list, dict]: attempt += 1 collector._show_retry_message(attempt) continue - + # Check if directory exists and ask for alternative if os.path.exists(user_input): UIFormatter.print_error(f"Directory '{user_input}' already exists.") - UIFormatter.print_info("Please choose a different project directory name (or press Enter for current directory).") + UIFormatter.print_info( + "Please choose a different project directory name (or press Enter for current directory)." + ) attempt += 1 collector._show_retry_message(attempt) continue - + project_dir = user_input break - + except KeyboardInterrupt: UIFormatter.print_info("\nSetup cancelled by user.") sys.exit(0) - + if project_dir is None: UIFormatter.print_error("Maximum attempts reached for project directory name. Exiting.") sys.exit(1) - + console.print() console.print(f"[{UIColors.HIGHLIGHT}]Django Project Name[/{UIColors.HIGHLIGHT}]") @@ -524,8 +530,7 @@ def confirm_setup(project_dir: str, project_name: str, app_names: list, metadata # Get confirmation try: response = CharReader.get_yes_no( - f"[{UIColors.WARNING}]Proceed with setup? (y/N):[/{UIColors.WARNING}]", - default="n" + f"[{UIColors.WARNING}]Proceed with setup? (y/N):[/{UIColors.WARNING}]", default="n" ) return response == "y"