Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/cmds/check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ fn print_update(update: &updates::Update, manifest: &manifest::Manifest) -> anyh
}

pub async fn run(args: &Args, config: &Config) -> anyhow::Result<()> {
let manifest = manifest::load_manifest(config, args.force).await?;
let manifest = manifest::load_latest_manifest(config, args.force).await?;

let updates = updates::load_updates(&manifest, config, args.force).await?;

Expand Down
10 changes: 6 additions & 4 deletions src/cmds/install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ use crate::{Config, manifest::*};

#[derive(Parser, Default)]
pub struct Args {
pub tool: Option<String>,
pub version: Option<String>,
release: Option<String>,
}

#[derive(Debug, Clone, Serialize, Deserialize)]
Expand Down Expand Up @@ -224,8 +223,11 @@ async fn install_tool(tool: &Tool, requested: &VersionReq, config: &Config) -> a
Ok(())
}

pub async fn run(_args: &Args, config: &Config) -> anyhow::Result<()> {
let manifest = manifest::load_manifest(config, true).await?;
pub async fn run(args: &Args, config: &Config) -> anyhow::Result<()> {
let manifest = match &args.release {
Some(release) => manifest::load_tagged_manifest(config, release).await?,
None => manifest::load_latest_manifest(config, true).await?,
};

let updates = updates::check_updates(&manifest, config).await?;

Expand Down
2 changes: 1 addition & 1 deletion src/cmds/show.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ fn print_tool(tool: &crate::manifest::Tool, config: &Config) -> anyhow::Result<(
}

pub async fn run(_args: &Args, config: &Config) -> anyhow::Result<()> {
let manifest = manifest::load_manifest(config, false).await?;
let manifest = manifest::load_latest_manifest(config, false).await?;

for tool in manifest.tools() {
println!("{}: {}", tool.name, tool.description);
Expand Down
50 changes: 40 additions & 10 deletions src/manifest.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use anyhow::Context;
use octocrab::Octocrab;
use octocrab::{Octocrab, models::repos::Release, repos::RepoHandler};
use reqwest::Client;
use serde::{Deserialize, Serialize};
use std::{
Expand Down Expand Up @@ -54,18 +54,35 @@ async fn fetch_manifest_content(url: &str) -> anyhow::Result<String> {
Ok(data)
}

pub async fn download_remote_manifest(config: &Config) -> anyhow::Result<()> {
async fn define_release(
repo: &RepoHandler<'_>,
explicit_tag: Option<&str>,
) -> anyhow::Result<Release> {
if let Some(explicit) = explicit_tag {
return repo
.releases()
.get_by_tag(explicit)
.await
.context("fetching release");
} else {
repo.releases()
.get_latest()
.await
.context("fetching latest release")
}
}

pub async fn download_remote_manifest(
config: &Config,
explicit_tag: Option<&str>,
) -> anyhow::Result<()> {
let octocrab = Octocrab::builder()
.build()
.map_err(|e| anyhow::anyhow!("Failed to create Octocrab client: {}", e))?;
.context("building octocrab client")?;

let repo = octocrab.repos("tx3-lang", "toolchain");

let release = repo
.releases()
.get_latest()
.await
.context("fetching latest release")?;
let release = define_release(&repo, explicit_tag).await?;

let manifest_name = format!("manifest-{}.json", config.ensure_channel());

Expand Down Expand Up @@ -134,11 +151,14 @@ fn manifest_is_stale(timestamp: Option<SystemTime>) -> bool {
timestamp.is_none() || timestamp.unwrap() < SystemTime::now() - MANIFEST_STALE_THRESHOLD
}

pub async fn load_manifest(config: &Config, force_download: bool) -> anyhow::Result<Manifest> {
pub async fn load_latest_manifest(
config: &Config,
force_download: bool,
) -> anyhow::Result<Manifest> {
let timestamp = check_manifest_timestamp(config).await?;

if manifest_is_stale(timestamp) || force_download {
download_remote_manifest(config).await?;
download_remote_manifest(config, None).await?;
}

let manifest = load_local_manifest(config)
Expand All @@ -147,3 +167,13 @@ pub async fn load_manifest(config: &Config, force_download: bool) -> anyhow::Res

Ok(manifest)
}

pub async fn load_tagged_manifest(config: &Config, explicit_tag: &str) -> anyhow::Result<Manifest> {
download_remote_manifest(config, Some(explicit_tag)).await?;

let manifest = load_local_manifest(config)
.await?
.ok_or(anyhow::anyhow!("Manifest file should exist"))?;

Ok(manifest)
}