Skip to content
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

Fix error messages in paths.rs #227

Merged
merged 2 commits into from
Apr 13, 2022
Merged

Fix error messages in paths.rs #227

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4b74aa
Adjust error messages to show target directory
stoeckmann Apr 13, 2022
006e361
Unify function bodies
stoeckmann Apr 13, 2022
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
23 changes: 11 additions & 12 deletions src/paths.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,46 +9,45 @@ pub fn sn0int_dir() -> Result<PathBuf> {
.ok_or_else(|| format_err!("Failed to find data directory"))?;
let path = path.join("sn0int");
fs::create_dir_all(&path)
.context("Failed to create data directory")?;
.context("Failed to create sn0int data directory")?;
Ok(path)
}

pub fn history_path() -> Result<PathBuf> {
let path = sn0int_dir()?;
let path = path.join("history");
let path = sn0int_dir()?
.join("history");
Ok(path)
}

pub fn module_dir() -> Result<PathBuf> {
let path = sn0int_dir()?;
let path = path.join("modules");
let path = sn0int_dir()?
.join("modules");
fs::create_dir_all(&path)
.context("Failed to create module directory")?;
.context("Failed to create modules directory")?;
Ok(path)
}

pub fn data_dir() -> Result<PathBuf> {
let path = sn0int_dir()?
.join("data");
fs::create_dir_all(&path)
.context("Failed to create module directory")?;
.context("Failed to create data directory")?;
Ok(path)
}

pub fn workspace_dir(workspace: &Workspace) -> Result<PathBuf> {
let path = sn0int_dir()?
.join("data")
let path = data_dir()?
.join(workspace.as_str());
fs::create_dir_all(&path)
.context("Failed to create module directory")?;
.context("Failed to create workspace directory")?;
Ok(path)
}

pub fn blobs_dir(workspace: &Workspace) -> Result<PathBuf> {
let path = workspace_dir(workspace)?
.join("blobs");
fs::create_dir_all(&path)
.context("Failed to create module directory")?;
.context("Failed to create blobs directory")?;
Ok(path)
}

Expand All @@ -57,7 +56,7 @@ pub fn cache_dir() -> Result<PathBuf> {
.ok_or_else(|| format_err!("Failed to find cache directory"))?;
let path = path.join("sn0int");
fs::create_dir_all(&path)
.context("Failed to create cache directory")?;
.context("Failed to create sn0int cache directory")?;
Ok(path)
}

Expand Down