From 078438086d0dba31bdbe9990a3c0d9317bff84dd Mon Sep 17 00:00:00 2001 From: ste Date: Wed, 25 Oct 2023 22:23:01 +0200 Subject: [PATCH] Improve readability when picking config location --- jig-cli/src/commands/init_config.rs | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/jig-cli/src/commands/init_config.rs b/jig-cli/src/commands/init_config.rs index 777a282..b95a5d6 100644 --- a/jig-cli/src/commands/init_config.rs +++ b/jig-cli/src/commands/init_config.rs @@ -3,6 +3,7 @@ use clap::Args; use color_eyre::eyre::{eyre, Result, WrapErr}; use color_eyre::owo_colors::OwoColorize; use inquire::{Confirm, CustomType, Password, Select, Text}; +use std::fmt::Display; use std::fs; use std::path::PathBuf; use std::{env, process::Command}; @@ -16,6 +17,17 @@ pub struct InitConfig { all: bool, } +struct PathPrompt { + path: PathBuf, + name: String, +} + +impl Display for PathPrompt { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "{}: {}", self.name, self.path.to_string_lossy()) + } +} + impl InitConfig { pub fn init(&self) -> Result { let global_config = config::config_file(); @@ -23,12 +35,18 @@ impl InitConfig { let config_file_input = Select::new( "Where to save config", vec![ - global_config.to_string_lossy(), - local_config.to_string_lossy(), + PathPrompt { + name: String::from("Global"), + path: global_config, + }, + PathPrompt { + name: String::from("Local"), + path: local_config, + }, ], ) .prompt()?; - let config_file = if config_file_input == global_config.to_string_lossy() { + let config_file = if config_file_input.to_string().starts_with("Global") { config::config_file() } else { config::workspace_config_file()