mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-08 13:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor creating SpinnerHandle

Browse Source
This commit is contained in:
Felix Schütt
2022-10-11 11:19:27 +02:00
parent 5b72f97876
commit 8f29862d72
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/cli/src/cli.rs
View File

@@ -13,6 +13,7 @@ use crate::commands::Wast;
use crate::commands::{Cache, Config, Inspect, Run, RunWithoutFile, SelfUpdate, Validate};
use crate::error::PrettyError;
use clap::{ErrorKind, Parser};
use spinner::SpinnerHandle;
use wasmer_registry::get_all_local_packages;
#[derive(Parser, Debug)]
@@ -240,15 +241,7 @@ fn wasmer_main_inner() -> Result<(), anyhow::Error> {
if let Ok(mut sv) = split_version(&package) {
let mut package_download_info = None;
if !sv.package.contains('/') {
let sp = spinner::SpinnerBuilder::new(format!(
"Looking up command {} ...",
sv.package
))
.spinner(vec![
"⣾", "⣽", "⣻", "⢿", "⡿", "⣟", "⣯", "⣷", " ", "⠁", "⠂", "⠄", "⡀", "⢀", "⠠",
"⠐", "⠈",
])
.start();
let sp = start_spinner(format!("Looking up command {} ...", sv.package));
for registry in
wasmer_registry::get_all_available_registries().unwrap_or_default()
@@ -290,13 +283,7 @@ fn wasmer_main_inner() -> Result<(), anyhow::Error> {
}
// else: local package not found
let sp =
spinner::SpinnerBuilder::new(format!("Installing package {} ...", sv.package))
.spinner(vec![
"⣾", "⣽", "⣻", "⢿", "⡿", "⣟", "⣯", "⣷", " ", "⠁", "⠂", "⠄", "⡀", "⢀",
"⠠", "⠐", "⠈",
])
.start();
let sp = start_spinner(format!("Installing package {} ...", sv.package));
let v = sv.version.as_deref();
let result =
@@ -329,6 +316,14 @@ fn wasmer_main_inner() -> Result<(), anyhow::Error> {
options.execute()
}
fn start_spinner(msg: String) -> SpinnerHandle {
spinner::SpinnerBuilder::new(msg)
.spinner(vec![
"⣾", "⣽", "⣻", "⢿", "⡿", "⣟", "⣯", "⣷", " ", "⠁", "⠂", "⠄", "⡀", "⢀", "⠠", "⠐", "⠈",
])
.start()
}
#[derive(Debug, Clone, PartialEq, Default)]
struct SplitVersion {
package: String,