Skip to content

Hotfix 1.3.4 #163

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

Merged
PawelKorsak merged 16 commits into from
Mar 27, 2026
Merged

Hotfix 1.3.4 #163

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7a73bb1
version bump
PawelKorsak Mar 23, 2026
bea76f6
fix: added md discovery method
PawelKorsak Mar 23, 2026
17442d2
fix: windows color printing
PawelKorsak Mar 24, 2026
40e683e
fix: using std path instead of u8 string
PawelKorsak Mar 24, 2026
08ebb61
fix: config path location for win
PawelKorsak Mar 24, 2026
0e4606d
fix: save
PawelKorsak Mar 24, 2026
f79348f
fix: std filesystem path compatibiltiy
PawelKorsak Mar 24, 2026
df11a8d
fix: typo
PawelKorsak Mar 24, 2026
0aec8ba
fix: old ini compatibility
PawelKorsak Mar 24, 2026
406d9c8
fix: old mabfile parser compatibility
PawelKorsak Mar 24, 2026
18d5d33
fix: workflow adjusted
PawelKorsak Mar 26, 2026
cec9012
fix: added mab build env
PawelKorsak Mar 26, 2026
e3247c6
fix: removed unexistant package
PawelKorsak Mar 26, 2026
0c3a1d2
fix: removed container
PawelKorsak Mar 26, 2026
18bca59
fix: added python extension module
PawelKorsak Mar 26, 2026
f93e357
fix: removed required property
PawelKorsak Mar 26, 2026
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
Prev Previous commit
Next Next commit
fix: std filesystem path compatibiltiy
  • Loading branch information
@PawelKorsak
PawelKorsak committed Mar 24, 2026
commit f79348ff50f81b5687dc6081a1afe0cfab0c595a
22 changes: 12 additions & 10 deletions candletool/src/md_cli.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,18 +484,19 @@ namespace mab
return;
}

std::string configFilePath = *downloadConfigOptions.configFile;
std::filesystem::path configFilePath = *downloadConfigOptions.configFile;
if (configFilePath.empty())
{
m_logger.error("Configuration file path is empty!");
return;
}
// If the path is not specified, prepend the standard path
if (std::find(configFilePath.begin(), configFilePath.end(), '/') ==
configFilePath.end() || std::find(configFilePath.begin(), configFilePath.end(), '\\') ==
configFilePath.end())
std::string matchString = configFilePath.string();
if (std::find(matchString.begin(), matchString.end(), '/') ==
matchString.end() || std::find(matchString.begin(), matchString.end(), '\\') ==
matchString.end())
{
configFilePath = std::string(DEFAULT_CANDLETOOL_CONFIG_DIR) + "/config/motors/" + configFilePath;
configFilePath = std::filesystem::path(DEFAULT_CANDLETOOL_CONFIG_DIR) / std::filesystem::path("/config/motors/") / configFilePath;
}

MDConfigMap cfgMap;
Expand Down Expand Up @@ -537,18 +538,19 @@ namespace mab
return;
}

std::string configFilePath = *uploadConfigOptions.configFile;
std::filesystem::path configFilePath = *uploadConfigOptions.configFile;
if (configFilePath.empty())
{
m_logger.error("Configuration file path is empty!");
return;
}
// If the path is not specified, prepend the standard path
if (std::find(configFilePath.begin(), configFilePath.end(), '/') ==
configFilePath.end() || std::find(configFilePath.begin(), configFilePath.end(), '\\') ==
configFilePath.end())
std::string matchString = configFilePath.string();
if (std::find(matchString.begin(), matchString.end(), '/') ==
matchString.end() || std::find(matchString.begin(), matchString.end(), '\\') ==
matchString.end())
{
configFilePath = std::string(DEFAULT_CANDLETOOL_CONFIG_DIR) + "/config/motors/" + configFilePath;
configFilePath = DEFAULT_CANDLETOOL_CONFIG_DIR / "/config/motors/" / configFilePath;
}

mINI::INIFile configFile(configFilePath);
Expand Down