github-jwinterm/grin-wallet
1
0
Fork 0
mirror of https://github.com/jwinterm/grin-wallet.git synced 2026-10-17 07:11:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Same as previous fixes to absoluet path and more, apperently forgot to save a file

Browse Source
This commit is contained in:
Anynomous
2025-09-13 15:49:26 +02:00
parent 34b1d0c665
commit 2bea5b6826
1 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/src/config.rs
+17 -23
View File
@@ -43,28 +43,6 @@ pub const API_SECRET_FILE_NAME: &str = ".foreign_api_secret";
/// Owner API secret /// Owner API secret
pub const OWNER_API_SECRET_FILE_NAME: &str = ".owner_api_secret"; pub const OWNER_API_SECRET_FILE_NAME: &str = ".owner_api_secret";
// Function to fix string to file path issues and return absolte path
pub fn fix_path_abs(path: Option<PathBuf>) -> Result<PathBuf, ConfigError> {
if let Some(p_buf) = path {
p_str = p_buf.to_str();
let fixed_str = p_str.replace("\\", "/");
let fixed_path = PathBuf::from(fixed_str);
// If a new wallet, check if dir exist, if needed create it
if create_path {
fs::create_dir_all(&fixed_path)?;
}
let absolute_path = if fixed_path.is_absolute() {
fixed_path.canonicalize()?
} else {
env::current_dir()?.join(&fixed_path).canonicalize()?
};
// Fix for Windows to strip the '\\?\'prefix added to the path
let absolute_path =
std::path::PathBuf::from(absolute_path.to_str().unwrap().replace(r"\\?\", ""));
Ok(absolute_path); // Return the updated path
}
}
/// Function to locate the wallet dir and wallet.toml in the order /// Function to locate the wallet dir and wallet.toml in the order
/// a) config in top-dir if provided, b) in working dir, c) default dir /// a) config in top-dir if provided, b) in working dir, c) default dir
/// Function to get wallet dir and create dirs if not existing /// Function to get wallet dir and create dirs if not existing
@@ -222,7 +200,23 @@ pub fn initial_setup_wallet(
// - Fix top-dir path to compensate for bug on Linux to handle "\" // - Fix top-dir path to compensate for bug on Linux to handle "\"
// - Convert top-dir path to be always absolute for config generation // - Convert top-dir path to be always absolute for config generation
if let Some(p) = &data_path { if let Some(p) = &data_path {
data_path = Some(fix_path_abs(data_path)?) if let Some(p_str) = p.to_str() {
let fixed_str = p_str.replace("\\", "/");
let fixed_path = PathBuf::from(fixed_str);
// If a new wallet, check if dir exist, if needed create it
if create_path {
fs::create_dir_all(&fixed_path)?;
}
let absolute_path = if fixed_path.is_absolute() {
fixed_path.canonicalize()?
} else {
env::current_dir()?.join(&fixed_path).canonicalize()?
};
// Fix for Windows to strip the '\\?\'prefix added to the path
let absolute_path =
std::path::PathBuf::from(absolute_path.to_str().unwrap().replace(r"\\?\", ""));
data_path = Some(absolute_path); // Store the updated path
}
} }
// Get wallet data_dir path if none provided // Get wallet data_dir path if none provided