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: use default .venv path for virtual environment #26

Merged
merged 1 commit into from
Mar 25, 2024
Merged

fix: use default .venv path for virtual environment #26

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
36 changes: 2 additions & 34 deletions src/dirs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ use clap::ColorChoice;
use indicatif::ProgressBar;
use pyo3::Python;
use std::path::{Path, PathBuf};
use thiserror::Error;

const AQORA_DIRNAME: &str = ".aqora";
const DATA_DIRNAME: &str = "data";
const VENV_DIRNAME: &str = "venv";
const VENV_DIRNAME: &str = ".venv";
const LAST_RUN_DIRNAME: &str = "last_run";
const PYPROJECT_FILENAME: &str = "pyproject.toml";
const USE_CASE_FILENAME: &str = "use_case.toml";
Expand Down Expand Up @@ -45,7 +44,7 @@ pub fn project_config_dir(project_dir: impl AsRef<Path>) -> PathBuf {
}

pub fn project_venv_dir(project_dir: impl AsRef<Path>) -> PathBuf {
project_config_dir(project_dir).join(VENV_DIRNAME)
project_dir.as_ref().join(VENV_DIRNAME)
}

pub fn project_last_run_dir(project_dir: impl AsRef<Path>) -> PathBuf {
Expand Down Expand Up @@ -92,34 +91,6 @@ pub async fn read_pyproject(project_dir: impl AsRef<Path>) -> Result<PyProject>
})
}

#[derive(Debug, Error)]
enum SymlinkError {
#[error("Failed to create symlink from {0} to {1}: {2}")]
CreateSymlink(PathBuf, PathBuf, std::io::Error),
#[error("{0} directory already exists. Symlink to {1} could not be created.")]
VenvDirExists(PathBuf, PathBuf),
}

fn create_venv_symlink(project_dir: impl AsRef<Path>) -> Result<(), SymlinkError> {
let symlink_dir = project_dir.as_ref().join(".venv");
let venv_dir = [AQORA_DIRNAME, VENV_DIRNAME].iter().collect::<PathBuf>();

if symlink_dir.exists() {
if symlink_dir.read_link().ok().as_ref() != Some(&venv_dir) {
return Err(SymlinkError::VenvDirExists(symlink_dir, venv_dir));
}
return Ok(());
}

#[cfg(unix)]
use std::os::unix::fs::symlink;
#[cfg(windows)]
use std::os::windows::fs::symlink_dir as symlink;

symlink(&venv_dir, &symlink_dir)
.map_err(|err| SymlinkError::CreateSymlink(symlink_dir, venv_dir, err))
}

pub fn locate_uv(uv_path: Option<impl AsRef<Path>>) -> Option<PathBuf> {
if let Some(uv_path) = uv_path.as_ref().map(|p| p.as_ref()).filter(|p| p.exists()) {
Some(PathBuf::from(uv_path))
Expand Down Expand Up @@ -222,8 +193,5 @@ pub async fn init_venv(
),
)
})?;
if let Err(err) = create_venv_symlink(&project_dir) {
eprintln!("WARN: {err}");
}
Ok(env)
}
Loading