Skip to content

Commit

Permalink
addressing the PR comments
Browse files Browse the repository at this point in the history
  • Loading branch information
Petr Gadorek committed Dec 3, 2024
1 parent 43e53e4 commit ba40459
Show file tree
Hide file tree
Showing 6 changed files with 153 additions and 131 deletions.
1 change: 1 addition & 0 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ dirs = "5.0.1"
toml = "0.8.14"
log4rs = "1.3.0"
anyhow = "1.0.93"
colored = "2.1.0"

[dependencies.openssl-sys]
version = "0.9"
Expand Down
241 changes: 120 additions & 121 deletions locales/app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,183 +27,182 @@ prerequisites.install.ask:
en: Please install the missing prerequisites and try again.
cn: 请先安装缺少的依赖项并重试。
python.sanitycheck.info:
en: Running python sanity check
cn: 运行 Python 健全性检查
en: Running python sanity check
cn: 运行 Python 健全性检查
python.sanitycheck.ok:
en: Your Python meets the requirements
cn: 你的 python 符合要求
en: Your Python meets the requirements
cn: 你的 python 符合要求
python.sanitycheck.fail:
en: Python is missing, or it does not meet the requirements. Please install python3 with pip, venv and ssl support and try again
cn: Python 缺失或不符合要求。请安装 python3, pip 和 ssl 支持并重试
en: Python is missing, or it does not meet the requirements. Please install python3 with pip, venv and ssl support and try again
cn: Python 缺失或不符合要求。请安装 python3, pip 和 ssl 支持并重试
pythhon.install.prompt:
en: Do you want to install Python?
cn: 是否要安装 python?
en: Do you want to install Python?
cn: 是否要安装 python?
python.install.success:
en: Python installed successfully
cn: python 安装成功
en: Python installed successfully
cn: python 安装成功
python.install.failure:
en: Python installation failed
cn: python 安装失败
en: Python installation failed
cn: python 安装失败
python.install.refuse:
en: Please install python3 with pip and SSL support and try again
cn: 请安装 python3, pip 和 ssl 支持,并重试
en: Please install python3 with pip and SSL support and try again
cn: 请安装 python3, pip 和 ssl 支持,并重试
wizard.instalation_path.prompt:
en: Please select the ESP-IDF installation location
cn: 请选择 ESP-IDF 安装位置
en: Please select the ESP-IDF installation location
cn: 请选择 ESP-IDF 安装位置
wizard.instalation_path.unselected:
en: You really need to select some installation path
cn: 你真的需要选择一些安装位置
en: You really need to select some installation path
cn: 你真的需要选择一些安装位置
wizard.idf.mirror:
en: Select the source from which to download esp-idf
cn: 请选择来源来下载 esp-idf
en: Select the source from which to download esp-idf
cn: 请选择来源来下载 esp-idf
wizard.idf.sucess:
en: Download esp-idf successfully
cn: 下载 esp-idf 成功
en: Download esp-idf successfully
cn: 下载 esp-idf 成功
wizard.idf.failure:
en: Download esp-idf failed
cn: 下载 esp-idf 失败
en: Download esp-idf failed
cn: 下载 esp-idf 失败
wizard.idf.user_cancelled:
en: Canceling the instalation
cn: 取消安装 ESP-IDF
en: Canceling the instalation
cn: 取消安装 ESP-IDF
wizard.tools.donwload.prompt:
en: Choose the folder where the tools will be downloaded
cn: 请选择要下载的工具所在目录
en: Choose the folder where the tools will be downloaded
cn: 请选择要下载的工具所在目录
wizard.tools.donwload.prompt.failure:
en: You really need to select some folder
cn: 你真的需要选择一些目录
en: You really need to select some folder
cn: 你真的需要选择一些目录
wizard.tools.install.prompt:
en: Choose the folder where the tools will be installed
cn: 请选择要安装的工具所在目录
en: Choose the folder where the tools will be installed
cn: 请选择要安装的工具所在目录
wizard.tools.install.prompt.failure:
en: You really need to select some folder
cn: 你真的需要选择一些目录
en: You really need to select some folder
cn: 你真的需要选择一些目录
wizard.tooljs_json.prompt:
en: specify the relative (from the installation path) path to tools.json file
cn: 指定 tools.json 文件的相对路径
en: specify the relative (from the installation path) path to tools.json file
cn: 指定 tools.json 文件的相对路径
wizard.tools_json.prompt.failure:
en: You really need to point to the tools.json file
cn: 你真的需要指向 tools.json 文件
en: You really need to point to the tools.json file
cn: 你真的需要指向 tools.json 文件
wizard.tools_json.not_found:
en: tools.json file does not exist. Please select valid tools.json file
cn: tools.json 文件不存在。请选择有效的 tools.json 文件
en: tools.json file does not exist. Please select valid tools.json file
cn: tools.json 文件不存在。请选择有效的 tools.json 文件
wizard.tools_json.select.prompt:
en: Select tools.json file manually
cn: 手动选择 tools.json 文件
en: Select tools.json file manually
cn: 手动选择 tools.json 文件
wizard.tools_json.unreachable:
en: "tools.json file does not exist. The file you've selected cannot be accessed."
cn: "tools.json 文件不存在。所选文件无法被访问。"
en: "tools.json file does not exist. The file you've selected cannot be accessed."
cn: "tools.json 文件不存在。所选文件无法被访问。"
wizard.tools_json.unparsable:
en: Failed to read tools.json file. Error:%{e}
cn: tools.json 文件无法读取。错误:%{e}
en: Failed to read tools.json file. Error:%{e}
cn: tools.json 文件无法读取。错误:%{e}
wizard.tools.mirror:
en: Select a source from which to download tools
cn: 请选择来源来下载 tools
en: Select a source from which to download tools
cn: 请选择来源来下载 tools
wizard.idf_tools.prompt:
en: specify the relative (from installation path) path to idf_tools.py file
cn: 指定 idf_tools.py 文件的相对路径
en: specify the relative (from installation path) path to idf_tools.py file
cn: 指定 idf_tools.py 文件的相对路径
wizard.idf_tools.prompt.failure:
en: You really need to point to the idf_tools.py file
cn: 你真的需要指向 idf_tools.py 文件
en: You really need to point to the idf_tools.py file
cn: 你真的需要指向 idf_tools.py 文件
wizard.idf_tools.not_found:
en: idf_tools.py file does not exist. Please select valid idf_tools.py file
cn: idf_tools.py 文件不存在。请选择有效的 idf_tools.py 文件
en: idf_tools.py file does not exist. Please select valid idf_tools.py file
cn: idf_tools.py 文件不存在。请选择有效的 idf_tools.py 文件
wizard.idf_tools.select.prompt:
en: Select idf_tools.py file manually
cn: 手动选择 idf_tools.py 文件
en: Select idf_tools.py file manually
cn: 手动选择 idf_tools.py 文件
wizard.idf_tools.unreachable:
en: "idf_tools.py file does not exist. The file you've selected cannot be accessed."
cn: "idf_tools.py 文件不存在。所选文件无法被访问。"
en: "idf_tools.py file does not exist. The file you've selected cannot be accessed."
cn: "idf_tools.py 文件不存在。所选文件无法被访问。"
wizard.idf_tools.failed_to_run:
en: Failed to run idf_tools.py file. Error
cn: idf_tools.py 文件无法运行。错误
en: Failed to run idf_tools.py file. Error
cn: idf_tools.py 文件无法运行。错误
wizard.windows.succes_message:
en: \n\rYour environment variables have been updated! Shell may need to be restarted for changes to be effective.
cn: \n\r你的环境变量已更新 Shell 需要重启才能生效
en: \n\rYour environment variables have been updated! Shell may need to be restarted for changes to be effective.
cn: \n\r你的环境变量已更新 Shell 需要重启才能生效
wizard.posix.succes_message:
en: please copy and paste the following lines to your terminal
cn: 请复制并粘贴以下行到终端
en: please copy and paste the following lines to your terminal
cn: 请复制并粘贴以下行到终端
wizard.spinner.message:
en: Doing something...
cn: 执行中
en: Doing something...
cn: 执行中
wizard.select_target.prompt:
en: Please select all of the target platforms (esp chips)
cn: 请选择所有的目标平台 esp 芯片)
en: Please select the target platforms (esp chips)
cn: 请选择目标平台(esp 芯片)
wizard.select_target.prompt.failure:
en: We were unable to fetch available targets
cn: 无法获取可用的目标平台
en: We were unable to fetch available targets
cn: 无法获取可用的目标平台
wizard.select_idf_version.prompt:
en: Please select the desired ESP-IDF version
cn: 请选择要使用的 ESP-IDF 版本
en: Please select the desired ESP-IDF version
cn: 请选择要使用的 ESP-IDF 版本
wizard.idf_path_exists.prompt:
en: The path already exists. Do you want to proceed with installation without redownloading IDF?
cn: 该路径已存在。是​​否要继续安装而不重新下载 IDF?
en: The path already exists. Do you want to proceed with installation without redownloading IDF?
cn: 该路径已存在。是​​否要继续安装而不重新下载 IDF?
wizard.tools_download.progress:
en: Downloading tools
cn: 下载工具
en: Downloading tools
cn: 下载工具
wizard.tool_download.progress:
en: Downloading tool
cn: 下载工具
en: Downloading tool
cn: 下载工具
wizard.tools_platform_error:
en: Can not identify the correct platform for tools installation
cn: 无法确定正确的平台来安装工具
en: Can not identify the correct platform for tools installation
cn: 无法确定正确的平台来安装工具
wizard.tool_file.present:
en: The file is already downloaded and the checksum matches.
cn: 文件已下载并校验通过
en: The file is already downloaded and the checksum matches.
cn: 文件已下载并校验通过
wizard.tool_file.missing:
en: The checksum does not match or the file was not available.
cn: 校验不通过或文件不可用
en: The checksum does not match or the file was not available.
cn: 校验不通过或文件不可用
wizard.tool.downloaded:
en: Downloaded
cn: 已下载
en: Downloaded
cn: 已下载
wizard.tool.download_failed:
en: Download failed
cn: 下载失败
en: Download failed
cn: 下载失败
wizard.tool.extracted:
en: extracted tool
cn: 已解压工具
en: extracted tool
cn: 已解压工具
wizard.after_install.add_to_path.prompt:
en: Do you want to add ESP-IDF to your PATH permanently?
cn: 是否要永久加入 ESP-IDF 到 PATH 中?
en: Do you want to add ESP-IDF to your PATH permanently?
cn: 是否要永久加入 ESP-IDF 到 PATH 中?
wizard.shellrc.update.success:
en: ESP-IDF shellrc updated successfully
cn: ESP-IDF shellrc 已更新成功
en: ESP-IDF shellrc updated successfully
cn: ESP-IDF shellrc 已更新成功
wizard.shellrc.update.error:
en: ESP-IDF shellrc update failed
cn: ESP-IDF shellrc 更新失败
en: ESP-IDF shellrc update failed
cn: ESP-IDF shellrc 更新失败
wizard.after_install.save_config.prompt:
en: Do you want to save the installer configuration?
cn: 是否要保存安装器配置
en: Do you want to save the installer configuration?
cn: 是否要保存安装器配置
wizard.after_install.config.saved:
en: Configuration saved successfully to config.toml
cn: 配置已保存成功到 config.toml
en: Configuration saved successfully to eim_config.toml
cn: 配置已保存成功到 eim_config.toml
wizard.after_install.config.save_failed:
en: Configuration save failed
cn: 配置保存失败
en: Configuration save failed
cn: 配置保存失败
wizard.after_install.desktop_shortcut.created:
en: Desktop shortcut created successfully
cn: 已创建 desktop 快捷方式
en: Desktop shortcut created successfully
cn: 已创建 desktop 快捷方式
wizard.after_install.desktop_shortcut.failed:
en: Failed to create desktop shortcut
cn: 创建 desktop 快捷方式失败
en: Failed to create desktop shortcut
cn: 创建 desktop 快捷方式失败
wizard.posix.finish_steps.line_1:
en: You have successfully installed ESP-IDF
cn: 已成功安装 ESP-IDF
en: You have successfully installed ESP-IDF
cn: 已成功安装 ESP-IDF
wizard.posix.finish_steps.line_2:
en: for using the ESP-IDF tools inside the terminal, you will find activation scripts inside the base install folder
cn: 用于在终端内使用 ESP-IDF 工具,你可以在基础安装文件夹中找到激活脚本
en: for using the ESP-IDF tools inside the terminal, you will find activation scripts inside the base install folder
cn: 用于在终端内使用 ESP-IDF 工具,你可以在基础安装文件夹中找到激活脚本
wizard.posix.finish_steps.line_3:
en: sourcing the activation script will setup environment in the current terminal session
cn: 激活脚本会在当前的终端会话中设置环境变量
en: sourcing the activation script will setup environment in the current terminal session
cn: 激活脚本会在当前的终端会话中设置环境变量
wizard.posix.finish_steps.line_4:
en: to activate the environment, run the following command in your terminal
cn: 运行以下命令来激活环境
en: to activate the environment, run the following command in your terminal
cn: 运行以下命令来激活环境
wizard.posix.finish_steps.line_5:
en: source
cn: source
en: source
cn: source
wizard.windows.finish_steps.line_1:
en: You have successfully installed ESP-IDF
cn: 已成功安装 ESP-IDF
en: You have successfully installed ESP-IDF
cn: 已成功安装 ESP-IDF
wizard.windows.finish_steps.line_2:
en: the installer placed shortcuts for PowerShell terminal with activated ESP-IDF environment to your desktop
cn: 安装器将在桌面上放置带有激活 ESP-IDF 环境的 PowerShell 终端快捷方式

en: the installer placed shortcuts for PowerShell terminal with activated ESP-IDF environment to your desktop
cn: 安装器将在桌面上放置带有激活 ESP-IDF 环境的 PowerShell 终端快捷方式
2 changes: 1 addition & 1 deletion src/cli_args/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ fn custom_styles() -> Styles {
#[command(
author,
version = VERSION,
about = "ESP-IDF Install Manager",
about = "ESP-IDF Installation Manager",
long_about = "All you need to manage your ESP-IDF installations",
color = ColorChoice::Always,
styles = custom_styles()
Expand Down
25 changes: 17 additions & 8 deletions src/main.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::path::PathBuf;
use std::path::{Path, PathBuf};

use clap::Parser;
use cli_args::{Cli, Commands};
Expand Down Expand Up @@ -120,12 +120,18 @@ async fn main() {
println!("Listing installed versions...");
match idf_im_lib::version_manager::get_esp_ide_config() {
Ok(config) => {
println!("Installed versions:");
for version in config.idf_installed {
if version.id == config.idf_selected_id {
println!("- {} (selected)", version.name);
} else {
println!("- {}", version.name);
if config.idf_installed.len() == 0 {
println!(
"No versions found. Use eim install to install a new ESP-IDF version."
);
} else {
println!("Installed versions:");
for version in config.idf_installed {
if version.id == config.idf_selected_id {
println!("- {} (selected)", version.name);
} else {
println!("- {}", version.name);
}
}
}
}
Expand Down Expand Up @@ -221,7 +227,10 @@ async fn main() {
Commands::Discover => {
// Implement version discovery
println!("Discovering available versions...");
unimplemented!();
let idf_dirs = idf_im_lib::version_manager::find_esp_idf_folders("/");
for dir in idf_dirs {
println!("Found IDF directory: {}", dir);
}
}
Commands::Remove { version } => {
// todo: add spinner
Expand Down
Loading

0 comments on commit ba40459

Please sign in to comment.