technofab/pay-respects
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/pay-respects.git synced 2026-02-02 07:35:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: windows path

Browse source
This commit is contained in:
iff 2024-12-07 17:27:39 +01:00
parent fd06a0e958
commit b6b4afc226
1 changed files with 72 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

133
src/files.rs
View file

@ -1,60 +1,22 @@
use crate::suggestions::find_similar; use crate::suggestions::find_similar;
pub fn get_path_files() -> Vec<String> { pub fn get_path_files() -> Vec<String> {
let path_env = { let path_env = path_env();
#[cfg(windows)]
{
if is_msystem() {
String::from_utf8_lossy(
&std::process::Command::new("bash")
.arg("-c")
.arg("echo $PATH")
.output()
.unwrap()
.stdout,
)
.trim()
.to_owned()
} else {
std::env::var("PATH").unwrap()
}
}
#[cfg(not(windows))]
{
std::env::var("PATH").unwrap()
}
};
if cfg!(debug_assertions) { if cfg!(debug_assertions) {
eprintln!("path_env: {path_env}"); eprintln!("path_env: {path_env}");
} }
let path_env_sep = { let path_env_sep = path_env_sep();
#[cfg(windows)]
if is_msystem() {
":"
} else {
";"
}
#[cfg(not(windows))]
{
":"
}
};
let path = path_env.split(path_env_sep).collect::<Vec<&str>>(); let path = path_env.split(path_env_sep).collect::<Vec<&str>>();
let mut all_executable = vec![]; let mut all_executable = vec![];
for p in path { for p in path {
#[cfg(windows)] #[cfg(windows)]
let p = if is_msystem() { let p = path_convert(p);
msys2_conv_path(p).expect("Failed to convert path for msys")
} else {
p.to_owned()
};
if cfg!(debug_assertions) { #[cfg(debug_assertions)]
eprintln!("p={p}"); eprintln!("p={p}");
}
let files = match std::fs::read_dir(p) { let files = match std::fs::read_dir(p) {
Ok(files) => files, Ok(files) => files,
@ -66,31 +28,14 @@ pub fn get_path_files() -> Vec<String> {
let mut file_name = file.file_name().into_string().unwrap(); let mut file_name = file.file_name().into_string().unwrap();
#[cfg(windows)] #[cfg(windows)]
{ strip_extension(&mut file_name);
let mut ok = false;
let suffixies = [".exe", ".sh", ".ps1"];
for suffix in suffixies {
if let Some(file_name_strip) = file_name.strip_suffix(suffix) {
file_name = file_name_strip.to_owned();
ok = true;
break;
}
}
if !file_name.contains(".") {
ok = true;
}
if !ok {
continue;
}
}
all_executable.push(file_name); all_executable.push(file_name);
} }
} }
if cfg!(debug_assertions) { #[cfg(debug_assertions)]
{
let mut all_executable = all_executable.clone(); let mut all_executable = all_executable.clone();
all_executable.sort_unstable(); all_executable.sort_unstable();
eprintln!("all_executable={all_executable:?}"); eprintln!("all_executable={all_executable:?}");
@ -155,3 +100,67 @@ fn msys2_conv_path(p: &str) -> std::io::Result<String> {
fn is_msystem() -> bool { fn is_msystem() -> bool {
std::env::var("MSYSTEM").is_ok() std::env::var("MSYSTEM").is_ok()
} }
#[cfg(windows)]
fn path_env() -> String {
if is_msystem() {
String::from_utf8_lossy(
&std::process::Command::new("bash")
.arg("-c")
.arg("echo $PATH")
.output()
.unwrap()
.stdout,
)
.trim()
.to_owned()
} else {
std::env::var("PATH").unwrap()
}
}
#[cfg(windows)]
fn path_env_sep() -> &'static str {
if is_msystem() {
":"
} else {
";"
}
}
#[cfg(windows)]
fn path_convert(path: &str) -> String {
if is_msystem() {
msys2_conv_path(path).expect("Failed to convert path for msys")
} else {
path.to_owned()
}
}
#[cfg(windows)]
fn strip_extension(file_name: &str) -> String {
let mut file_name = file_name.to_owned();
let suffixies = [".exe", ".sh", ".ps1"];
for suffix in suffixies {
if let Some(file_name_strip) = file_name.strip_suffix(suffix) {
file_name = file_name_strip.to_owned();
break;
}
}
if !file_name.contains(".") {
file_name = file_name.to_owned();
}
file_name
}
#[cfg(not(windows))]
fn path_env() -> String {
std::env::var("PATH").unwrap()
}
#[cfg(not(windows))]
fn path_env_sep() -> &'static str {
":"
}