Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added file select dialogue when wizard can not find tools.json #5

Merged
merged 1 commit into from
Jul 8, 2024
Merged

added file select dialogue when wizard can not find tools.json #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ tokio = {version = "1.37.0", features=["full"]}
idf-im-lib = { git = "https://github.com/espressif/idf-im-lib.git", branch="master" }
clap = {version = "4.5", features = ["cargo", "derive"]}
crossterm = "0.27.0"
dialoguer = "0.11.0"
dialoguer = { git = "https://github.com/Hahihula/dialoguer.git", branch = "folder-select", features = ["folder-select"] }
byte-unit = "5.1.4"
indicatif = "0.17.8"
ratatui-splash-screen = "0.1.3"
Expand Down
5 changes: 2 additions & 3 deletions src/cli_args/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,8 @@ impl Settings {
pub fn new() -> Result<Self, ConfigError> {
let cli = Cli::parse();
let log_level = match cli.verbose {
0 => log::LevelFilter::Warn,
1 => log::LevelFilter::Info,
2 => log::LevelFilter::Debug,
0 => log::LevelFilter::Info,
1 => log::LevelFilter::Debug,
_ => log::LevelFilter::Trace,
};
match SimpleLogger::new().with_level(log_level).init() {
Expand Down
1 change: 0 additions & 1 deletion src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use log::{error, info};
use simple_logger::SimpleLogger;
extern crate idf_im_lib;

mod cli_args;
Expand Down
126 changes: 57 additions & 69 deletions src/wizard/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use std::path::{Path, PathBuf};
use std::time::{Duration, Instant};
use std::{env, fs};
// folder select
use dialoguer::{Confirm, Input, Select};
use dialoguer::{Confirm, FolderSelect, Input, Select};
use walkdir::{DirEntry, WalkDir};

fn run_with_spinner<F, T>(func: F) -> T
Expand Down Expand Up @@ -273,54 +273,6 @@ fn python_sanity_check() -> Result<(), String> {

fn install_python_environment() {}

fn folder_select(path: &str) -> String {
let theme = ColorfulTheme {
values_style: Style::new().yellow().dim(),
..ColorfulTheme::default()
};
let current_folder: Vec<DirEntry> = WalkDir::new(path)
.min_depth(0)
.max_depth(0)
.into_iter()
.filter_map(|e| e.ok())
.collect();
let current_path = current_folder[0].path().to_str().unwrap().to_string();
let mut selects = vec!["."];
let ancestors = current_folder[0].path().ancestors().collect::<Vec<_>>();
if !current_folder.is_empty() && ancestors.len() > 1 {
selects.push("..");
}
let directories_in_current_folder: Vec<DirEntry> = WalkDir::new(path)
.min_depth(1)
.max_depth(1)
.into_iter()
.filter_map(|e| e.ok())
.collect();
let filenames = directories_in_current_folder
.iter()
.map(|entry| entry.file_name().to_str().unwrap())
.collect::<Vec<&str>>();
let select = Select::with_theme(&theme)
.clear(true)
.report(false)
// .with_prompt(format!("Current folder {}", current_path.as_str()))
.items(&selects)
.items(&filenames);
let selection = select.interact().unwrap();
match selection {
0 => {
return current_path;
} // select current folder
1 => folder_select(ancestors[1].to_str().unwrap()), // go up
_ => folder_select(
directories_in_current_folder[selection - 2]
.path()
.to_str()
.unwrap(),
), // open subfolder
}
}

pub async fn run_wizzard_run(mut config: Settings) -> Result<(), String> {
debug!("Config entering wizard: {:?}", config);

Expand Down Expand Up @@ -351,9 +303,23 @@ pub async fn run_wizzard_run(mut config: Settings) -> Result<(), String> {
{
//TODO: add progress or spinner
match idf_im_lib::system_dependencies::install_prerequisites(list) {
Ok(_) => {
info!("Prerequisities installed successfully");
}
Ok(_) => match check_prerequisites() {
Ok(list) => {
if list.is_empty() {
info!("Prerequisities installed successfully");
} else {
error!(
"Something went teribly wrong. These prerequisities were not installed: {:?}",
list
);
panic!("Prerequisities not installed successfully");
}
}
Err(err) => {
error!("{:?}", err);
return Err(err);
}
},
Err(err) => {
error!("{:?}", err);
return Err(err);
Expand Down Expand Up @@ -423,7 +389,6 @@ pub async fn run_wizzard_run(mut config: Settings) -> Result<(), String> {
let target = config.target.clone().unwrap().to_string();
debug!("Selected target: {}", target);
// select version
// TODO: verify the version support target
if config.idf_version.is_none() {
config.idf_version = Some(select_idf_version(&target, &theme).await.unwrap());
}
Expand All @@ -435,9 +400,14 @@ pub async fn run_wizzard_run(mut config: Settings) -> Result<(), String> {
if let Some(path) = config.path {
instalation_path.push(&path);
} else {
let mut default_path = "/tmp/esp-new/".to_string();
if std::env::consts::OS == "windows" {
default_path = "C:\\esp\\".to_string();
}

let path = match Input::with_theme(&theme)
.with_prompt("base instalation path")
.default("/tmp/esp-new/".to_string()) // default testing folder TODO: remove and move to config
.default(default_path) // default testing folder TODO: remove and move to config
.interact()
{
Ok(path) => path,
Expand Down Expand Up @@ -481,7 +451,7 @@ pub async fn run_wizzard_run(mut config: Settings) -> Result<(), String> {
panic!("Need to select some folder name:{:?}", err);
}
};
tool_download_directory.push(&name); // default testing folder TODO: remove and move to config
tool_download_directory.push(&name);
config.tool_download_folder_name = Some(name);
}
match idf_im_lib::ensure_path(&tool_download_directory.display().to_string()) {
Expand All @@ -506,7 +476,7 @@ pub async fn run_wizzard_run(mut config: Settings) -> Result<(), String> {
panic!("Need to select some folder name:{:?}", err);
}
};
tool_install_directory.push(&name); // default testing folder TODO: remove and move to config
tool_install_directory.push(&name);
config.tool_install_folder_name = Some(name);
}
idf_im_lib::add_path_to_path(tool_install_directory.to_str().unwrap());
Expand Down Expand Up @@ -536,21 +506,29 @@ pub async fn run_wizzard_run(mut config: Settings) -> Result<(), String> {
panic!("Need to select some folder name:{:?}", err);
}
};
tools_json_file.push(&name); // this may need some multiplatform handling
tools_json_file.push(&name);
config.tools_json_file = Some(name);
}
// this approach works regardless platform:
// tools_json_file.push("esp-idf");
// tools_json_file.push("tools");
// tools_json_file.push("tools.json");

debug!("Tools json file: {}", tools_json_file.display());

if !fs::metadata(&tools_json_file).is_ok() {
warn!("Tools.json file does not exist. Please select valied tools.json file");
unimplemented!(); // TODO: select tools.json file using file picker
// TODO: implement the retry logic -> in interactive mode the user should not be able to proceed until the files is found
warn!("tools.json file does not exist. Please select valied tools.json file");
let tools_json_file_select = FolderSelect::with_theme(&theme)
.with_prompt("Select tools.json file manually")
.folder(idf_path.to_str().unwrap())
.file(true)
.interact()
.unwrap();
if fs::metadata(&tools_json_file_select).is_ok() {
tools_json_file = PathBuf::from(tools_json_file_select);
config.tools_json_file = Some(tools_json_file.to_str().unwrap().to_string());
} else {
// TODO: implement the retry logic -> in interactive mode the user should not be able to proceed until the files is found
panic!("tools.json file does not exist. File you've selected cannot be accessed.");
}
}

debug!("Tools json file: {}", tools_json_file.display());

let tools =
match idf_im_lib::idf_tools::read_and_parse_tools_file(tools_json_file.to_str().unwrap()) {
Ok(tools) => tools,
Expand Down Expand Up @@ -607,7 +585,19 @@ pub async fn run_wizzard_run(mut config: Settings) -> Result<(), String> {
}
if !fs::metadata(&idf_tools_path).is_ok() {
warn!("idf_tools.py file not found. Please select valid idf_tools.py file");
unimplemented!(); // TODO: select idf_tools.py file using file picker
let idf_tools_py_select = FolderSelect::with_theme(&theme)
.with_prompt("Select idf_tools.py file manually")
.folder(idf_path.to_str().unwrap())
.file(true)
.interact()
.unwrap();
if fs::metadata(&idf_tools_py_select).is_ok() {
idf_tools_path = PathBuf::from(&idf_tools_py_select);
config.idf_tools_path = Some(idf_tools_py_select);
} else {
// TODO: implement the retry logic -> in interactive mode the user should not be able to proceed until the files is found
panic!("idf_tools.py file does not exist. File you've selected cannot be accessed.");
}
}
let out = run_with_spinner::<_, Result<String, String>>(|| {
idf_im_lib::python_utils::run_python_script_from_file(
Expand Down Expand Up @@ -635,8 +625,6 @@ pub async fn run_wizzard_run(mut config: Settings) -> Result<(), String> {
}
Err(err) => panic!("Failed to run idf tools: {:?}", err),
}
// env_vars.push(("PATH".to_string(), env::var("PATH").unwrap_or_default()));
// TODO: this should be done in rust instead of python
let export_paths =
get_tools_export_paths(tools, &target, tool_install_directory.to_str().unwrap());

Expand Down
Loading