Skip to content

Commit

Permalink
autoformatter uses tabs now (SlimeVR#52)
Browse files Browse the repository at this point in the history
  • Loading branch information
@TheButlah
TheButlah authored Nov 13, 2022
1 parent d8b9cdb commit 8444feb
Show file tree
Hide file tree
Showing 35 changed files with 1,999 additions and 1,998 deletions.
254 changes: 127 additions & 127 deletions autoupdater/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,146 +11,146 @@ use reqwest::Url;
use std::path::PathBuf;
use tempfile::tempdir;
use tokio::{
fs::{File, OpenOptions},
io::AsyncWriteExt,
task::JoinHandle,
fs::{File, OpenOptions},
io::AsyncWriteExt,
task::JoinHandle,
};

lazy_static! {
static ref VERSIONING_URL: Url = Url::parse(
"https://github.com/SlimeVR/SlimeVR-Overlay/releases/download/autoupdater-latest/versioning.json"
).unwrap();
static ref VERSIONING_URL: Url = Url::parse(
"https://github.com/SlimeVR/SlimeVR-Overlay/releases/download/autoupdater-latest/versioning.json"
).unwrap();
}

#[derive(Parser)]
struct Args {
/// The url to fetch the versioning.yaml from.
#[clap(long, default_value_t = VERSIONING_URL.clone())]
url: Url,
#[clap(long)]
/// The path to a versioning.yaml file, to use instead of the URL.
path: Option<PathBuf>,
/// The url to fetch the versioning.yaml from.
#[clap(long, default_value_t = VERSIONING_URL.clone())]
url: Url,
#[clap(long)]
/// The path to a versioning.yaml file, to use instead of the URL.
path: Option<PathBuf>,
}

/// Helper macro to unpack Option<T> and continue with a helpful error if None.
macro_rules! try_get {
($arg:expr) => {
if let Some(v) = $arg {
v
} else {
println!("Component not supported on this platform. Skipping.");
continue;
}
};
($arg:expr) => {
if let Some(v) = $arg {
v
} else {
println!("Component not supported on this platform. Skipping.");
continue;
}
};
}

#[tokio::main]
async fn main() -> Result<()> {
let args = Args::parse();
color_eyre::install()?; // pwetty errors UwU 👉👈

// Read yaml file from url or path
let versioning = if let Some(p) = args.path {
std::fs::read_to_string(p)
.wrap_err("Failed to read versioning.yaml from file")?
} else {
reqwest::get(args.url.clone())
.await
.wrap_err_with(move || {
format!(
"Failed to download `versioning.json` from URL: {}",
&args.url
)
})?
.text()
.await
.wrap_err("Failed to decode response body")?
};

// Parse/deserialize yaml
let components: Components =
serde_yaml::from_str(&versioning).wrap_err_with(|| {
format!("Could not deserialize YAML, whose contents was:\n{versioning}")
})?;

// We will delete the temporary dir upon drop.
let tmp_dir = tempdir().wrap_err("Failed to create temporary directory")?;

// Download each component, storing the async tasks in `download_tasks`
let mut download_tasks = Vec::new();
for (comp_name, comp_info) in components.0.into_iter() {
println!("Downloading component: {comp_name}...");
let url = try_get!(comp_info.download_url.get_owned());
let install_path = try_get!(comp_info.install_dir.get_owned());

let mut response = reqwest::get(url.clone()).await.wrap_err_with(|| {
format!("Failed to download `{comp_name}` from URL: {url}")
})?;

// TODO: This should use snake_case names since that is what the components in the
// file use.
let filename = url
.path_segments()
.map_or(comp_name.to_string(), |v| v.last().unwrap().to_string());
let download_path = tmp_dir.path().join(filename);
let mut download_file = File::create(&download_path)
.await
.wrap_err("Failed to create temporary file")?;

// We spawn a task so that the file can be downloaded concurrently
let task: JoinHandle<Result<_>> = tokio::spawn(async move {
while let Some(mut b) = response
.chunk()
.await
.wrap_err("error while slurping chunks")?
{
download_file
.write_all_buf(&mut b)
.await
.wrap_err("Error while writing to file")?
}
Ok((download_file, download_path, install_path.to_path()?))
});
download_tasks.push(task);
}

// Check that all components downloaded successfully
let downloads: Result<Vec<_>> = join_all(download_tasks)
.await
.into_iter()
.map(|t| {
Ok(t.wrap_err("couldn't join task")?
.wrap_err("failed download of component")?)
})
.collect();
let downloads = downloads?;

// Check that all files are writeable *before* attempting to move.
join_all(downloads.iter().map(|(_, _, install_path)| async move {
OpenOptions::new()
.create(true)
.write(true)
.open(install_path)
.await
.wrap_err_with(|| format!("{install_path:?} was not writeable"))
}))
.await
.into_iter()
.collect::<Result<Vec<_>>>()?; // returns if errors

// Move all the components to overwrite the old ones.
// This is suceptible to race conditions after the writable check, but its fine 😅
for (download_file, download_path, ref install_path) in downloads {
drop(download_file);
// Truncates if the file already exists.
tokio::fs::rename(download_path, install_path)
.await
.wrap_err_with(|| {
format!("Failed to move temporary file to {install_path:?}")
})?;
}

println!("Press enter to quit...");
std::io::stdin().read_line(&mut String::new()).unwrap();
Ok(())
let args = Args::parse();
color_eyre::install()?; // pwetty errors UwU 👉👈

// Read yaml file from url or path
let versioning = if let Some(p) = args.path {
std::fs::read_to_string(p)
.wrap_err("Failed to read versioning.yaml from file")?
} else {
reqwest::get(args.url.clone())
.await
.wrap_err_with(move || {
format!(
"Failed to download `versioning.json` from URL: {}",
&args.url
)
})?
.text()
.await
.wrap_err("Failed to decode response body")?
};

// Parse/deserialize yaml
let components: Components =
serde_yaml::from_str(&versioning).wrap_err_with(|| {
format!("Could not deserialize YAML, whose contents was:\n{versioning}")
})?;

// We will delete the temporary dir upon drop.
let tmp_dir = tempdir().wrap_err("Failed to create temporary directory")?;

// Download each component, storing the async tasks in `download_tasks`
let mut download_tasks = Vec::new();
for (comp_name, comp_info) in components.0.into_iter() {
println!("Downloading component: {comp_name}...");
let url = try_get!(comp_info.download_url.get_owned());
let install_path = try_get!(comp_info.install_dir.get_owned());

let mut response = reqwest::get(url.clone()).await.wrap_err_with(|| {
format!("Failed to download `{comp_name}` from URL: {url}")
})?;

// TODO: This should use snake_case names since that is what the components in the
// file use.
let filename = url
.path_segments()
.map_or(comp_name.to_string(), |v| v.last().unwrap().to_string());
let download_path = tmp_dir.path().join(filename);
let mut download_file = File::create(&download_path)
.await
.wrap_err("Failed to create temporary file")?;

// We spawn a task so that the file can be downloaded concurrently
let task: JoinHandle<Result<_>> = tokio::spawn(async move {
while let Some(mut b) = response
.chunk()
.await
.wrap_err("error while slurping chunks")?
{
download_file
.write_all_buf(&mut b)
.await
.wrap_err("Error while writing to file")?
}
Ok((download_file, download_path, install_path.to_path()?))
});
download_tasks.push(task);
}

// Check that all components downloaded successfully
let downloads: Result<Vec<_>> = join_all(download_tasks)
.await
.into_iter()
.map(|t| {
Ok(t.wrap_err("couldn't join task")?
.wrap_err("failed download of component")?)
})
.collect();
let downloads = downloads?;

// Check that all files are writeable *before* attempting to move.
join_all(downloads.iter().map(|(_, _, install_path)| async move {
OpenOptions::new()
.create(true)
.write(true)
.open(install_path)
.await
.wrap_err_with(|| format!("{install_path:?} was not writeable"))
}))
.await
.into_iter()
.collect::<Result<Vec<_>>>()?; // returns if errors

// Move all the components to overwrite the old ones.
// This is suceptible to race conditions after the writable check, but its fine 😅
for (download_file, download_path, ref install_path) in downloads {
drop(download_file);
// Truncates if the file already exists.
tokio::fs::rename(download_path, install_path)
.await
.wrap_err_with(|| {
format!("Failed to move temporary file to {install_path:?}")
})?;
}

println!("Press enter to quit...");
std::io::stdin().read_line(&mut String::new()).unwrap();
Ok(())
}
54 changes: 27 additions & 27 deletions autoupdater/src/parsing/install_path.rs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use color_eyre::{
eyre::{ContextCompat, WrapErr},
Result,
eyre::{ContextCompat, WrapErr},
Result,
};
use lazy_static::lazy_static;
use path_absolutize::Absolutize;
Expand All @@ -10,8 +10,8 @@ use std::path::PathBuf;
use crate::parsing::MCP;

lazy_static! {
static ref SLIME_DIR: MCP<PathBuf> = MCP::Cross(PathBuf::from("todo"));
static ref STEAM_DIR: MCP<PathBuf> = MCP::Cross(PathBuf::from("todo"));
static ref SLIME_DIR: MCP<PathBuf> = MCP::Cross(PathBuf::from("todo"));
static ref STEAM_DIR: MCP<PathBuf> = MCP::Cross(PathBuf::from("todo"));
}

/// The location to install a component.
Expand All @@ -20,29 +20,29 @@ lazy_static! {
#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Hash)]
#[serde(rename_all = "snake_case")]
pub enum InstallPath {
/// Just a regular path
Normal(PathBuf),
/// A path relative to the SlimeVR installation dir
RelativeToSlime(PathBuf),
/// A path relative to the SteamVR installation dir
RelativeToSteam(PathBuf),
/// Just a regular path
Normal(PathBuf),
/// A path relative to the SlimeVR installation dir
RelativeToSlime(PathBuf),
/// A path relative to the SteamVR installation dir
RelativeToSteam(PathBuf),
}
impl InstallPath {
/// Converts to the full absolute path of the file
pub fn to_path(&self) -> Result<PathBuf> {
let p = match self {
InstallPath::Normal(p) => p.to_owned(),
InstallPath::RelativeToSlime(p) => SLIME_DIR
.get()
.wrap_err("No slime install directory for current platform")?
.join(p),
InstallPath::RelativeToSteam(p) => STEAM_DIR
.get()
.wrap_err("No steam install directory for current platform")?
.join(p),
};
p.absolutize()
.map(|p| p.to_path_buf())
.wrap_err("Failed to canonicalize install path")
}
/// Converts to the full absolute path of the file
pub fn to_path(&self) -> Result<PathBuf> {
let p = match self {
InstallPath::Normal(p) => p.to_owned(),
InstallPath::RelativeToSlime(p) => SLIME_DIR
.get()
.wrap_err("No slime install directory for current platform")?
.join(p),
InstallPath::RelativeToSteam(p) => STEAM_DIR
.get()
.wrap_err("No steam install directory for current platform")?
.join(p),
};
p.absolutize()
.map(|p| p.to_path_buf())
.wrap_err("Failed to canonicalize install path")
}
}
Loading

0 comments on commit 8444feb

Please sign in to comment.