technofab/pay-respects
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/pay-respects.git synced 2025-12-12 14:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: search also for xdg_data_dirs

Browse source
This commit is contained in:
iff 2024-11-16 01:28:54 +01:00
parent 3a84d0c020
commit 284b807b9e
1 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/runtime_rules.rs
View file

@ -23,6 +23,10 @@ pub fn runtime_match(
let xdg_config_dirs = std::env::var("XDG_CONFIG_DIRS").unwrap_or("/etc/xdg".to_owned()); let xdg_config_dirs = std::env::var("XDG_CONFIG_DIRS").unwrap_or("/etc/xdg".to_owned());
let xdg_config_dirs = xdg_config_dirs.split(':').collect::<Vec<&str>>(); let xdg_config_dirs = xdg_config_dirs.split(':').collect::<Vec<&str>>();
let xdg_data_dirs =
std::env::var("XDG_DATA_DIRS").unwrap_or("/usr/local/share:/usr/share".to_owned());
let xdg_data_dirs = xdg_data_dirs.split(':').collect::<Vec<&str>>();
let user_rule_dir = format!("{}/pay-respects/rules", xdg_config_home); let user_rule_dir = format!("{}/pay-respects/rules", xdg_config_home);
let user_rule_file = format!("{}/{}.toml", user_rule_dir, executable); let user_rule_file = format!("{}/{}.toml", user_rule_dir, executable);
@ -30,15 +34,25 @@ pub fn runtime_match(
if std::path::Path::new(&user_rule_file).exists() { if std::path::Path::new(&user_rule_file).exists() {
file = Some(user_rule_file); file = Some(user_rule_file);
} else { }
for dir in xdg_config_dirs {
let check_dirs = |dirs: Vec<&str>| -> Option<String> {
for dir in dirs {
let rule_dir = format!("{}/pay-respects/rules", dir); let rule_dir = format!("{}/pay-respects/rules", dir);
let rule_file = format!("{}/{}.toml", rule_dir, executable); let rule_file = format!("{}/{}.toml", rule_dir, executable);
if std::path::Path::new(&rule_file).exists() { if std::path::Path::new(&rule_file).exists() {
file = Some(rule_file); return Some(rule_file);
break;
} }
} }
None
};
if file.is_none() {
file = check_dirs(xdg_config_dirs);
}
if file.is_none() {
file = check_dirs(xdg_data_dirs);
} }
if file.is_none() { if file.is_none() {
@ -103,7 +117,13 @@ pub fn runtime_match(
if pure_suggest.contains("{{command}}") { if pure_suggest.contains("{{command}}") {
pure_suggest = pure_suggest.replace("{{command}}", last_command); pure_suggest = pure_suggest.replace("{{command}}", last_command);
} }
return eval_suggest(&pure_suggest, last_command, error_msg, shell, &split_command); return eval_suggest(
&pure_suggest,
last_command,
error_msg,
shell,
&split_command,
);
} }
} }
} }