Skip to content

Commit

Permalink
fix: vfox tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
jdx committed Aug 18, 2024
1 parent 2084a37 commit c260ab2
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 117 deletions.
120 changes: 9 additions & 111 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions src/backend/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ pub trait Backend: Debug + Send + Sync {
}
fn list_remote_versions(&self) -> eyre::Result<Vec<String>> {
self.ensure_dependencies_installed()?;
trace!("Listing remote versions for {}", self.fa().to_string());
self._list_remote_versions()
}
fn _list_remote_versions(&self) -> eyre::Result<Vec<String>>;
Expand Down Expand Up @@ -297,6 +298,7 @@ pub trait Backend: Debug + Send + Sync {
None
}
fn ensure_dependencies_installed(&self) -> eyre::Result<()> {
trace!("Ensuring dependencies installed for {}", self.id());
let deps = self
.get_all_dependencies(&ToolRequest::System(self.id().into()))?
.into_iter()
Expand Down
18 changes: 13 additions & 5 deletions src/backend/vfox.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ impl Backend for VfoxBackend {
fn _list_remote_versions(&self) -> eyre::Result<Vec<String>> {
self.remote_version_cache
.get_or_try_init(|| {
let plugin = self.vfox.install_plugin_from_url(&self.get_url()?)?;
self.ensure_plugin_installed()?;
let versions = self
.runtime()?
.block_on(self.vfox.list_available_versions(&plugin.name))?;
.block_on(self.vfox.list_available_versions(&self.pathname))?;
Ok(versions
.into_iter()
.rev()
Expand All @@ -58,17 +58,16 @@ impl Backend for VfoxBackend {
fn install_version_impl(&self, ctx: &InstallContext) -> eyre::Result<()> {
let settings = Settings::get();
settings.ensure_experimental("vfox backend")?;
let plugin = self.vfox.install_plugin_from_url(&self.get_url()?)?;
self.ensure_plugin_installed()?;
self.runtime()?.block_on(self.vfox.install(
&plugin.name,
&self.pathname,
&ctx.tv.version,
ctx.tv.install_path(),
))?;
Ok(())
}

fn list_bin_paths(&self, tv: &ToolVersion) -> eyre::Result<Vec<PathBuf>> {
dbg!(self._exec_env(tv)?);
let path = self
._exec_env(tv)?
.get("PATH")
Expand Down Expand Up @@ -170,4 +169,13 @@ impl VfoxBackend {
self.repo()
}
}

fn ensure_plugin_installed(&self) -> eyre::Result<()> {
if !self.plugin_path.exists() {
let url = self.get_url()?;
trace!("Cloning vfox plugin: {url}");
self.repo()?.clone(url.as_str())?;
}
Ok(())
}
}
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ fn handle_err(err: Report) -> eyre::Result<()> {
return Ok(());
}
}
if cfg!(not(debug_assertions)) || log::max_level() < log::LevelFilter::Debug {
if cfg!(not(debug_assertions)) && log::max_level() < log::LevelFilter::Debug {
display_friendly_err(err);
exit(1);
}
Expand Down

0 comments on commit c260ab2

Please sign in to comment.