Skip to content

add support for ATUIN_DATA_DIR #2945

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

Open
lugoues wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −9
Open

add support for ATUIN_DATA_DIR #2945

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 22 additions & 9 deletions crates/atuin-common/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,22 +84,23 @@ pub fn config_dir() -> PathBuf {
}

pub fn data_dir() -> PathBuf {
let data_dir = std::env::var("XDG_DATA_HOME")
.map_or_else(|_| home_dir().join(".local").join("share"), PathBuf::from);

data_dir.join("atuin")
std::env::var("ATUIN_DATA_DIR").map_or_else(
|_| {
std::env::var("XDG_DATA_HOME")
.map_or_else(|_| home_dir().join(".local").join("share"), PathBuf::from)
.join("atuin")
},
PathBuf::from,
)
}

pub fn runtime_dir() -> PathBuf {
std::env::var("XDG_RUNTIME_DIR").map_or_else(|_| data_dir(), PathBuf::from)
}

pub fn dotfiles_cache_dir() -> PathBuf {
// In most cases, this will be ~/.local/share/atuin/dotfiles/cache
let data_dir = std::env::var("XDG_DATA_HOME")
.map_or_else(|_| home_dir().join(".local").join("share"), PathBuf::from);

data_dir.join("atuin").join("dotfiles").join("cache")
let data_dir = data_dir();
data_dir.join("dotfiles").join("cache")
}

pub fn get_current_dir() -> String {
Expand Down Expand Up @@ -191,6 +192,7 @@ mod tests {
test_config_dir();
test_data_dir_xdg();
test_data_dir();
test_atuin_data_dir();
}

#[cfg(not(windows))]
Expand Down Expand Up @@ -242,6 +244,17 @@ mod tests {
unsafe { env::remove_var("HOME") };
}

#[cfg(not(windows))]
fn test_atuin_data_dir() {
// TODO: Audit that the environment access only happens in single-threaded code.
unsafe { env::remove_var("HOME") };
// TODO: Audit that the environment access only happens in single-threaded code.
unsafe { env::set_var("ATUIN_DATA_DIR", "/home/user/custom_data") };
assert_eq!(data_dir(), PathBuf::from("/home/user/custom_data"));
// TODO: Audit that the environment access only happens in single-threaded code.
unsafe { env::remove_var("ATUIN_DATA_DIR") };
}

#[test]
fn uuid_is_unique() {
let how_many: usize = 1000000;
Expand Down