Skip to content

Commit 89aaa73

Browse files
committed
fix(yes): handle auto-select first package in download
1 parent c450fae commit 89aaa73

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

soar-cli/src/download.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ pub async fn handle_direct_downloads(
104104
let _ = downloader
105105
.download(options)
106106
.await
107-
.map_err(|e| eprintln!("{}", e));
107+
.map_err(|e| error!("{}", e));
108108
}
109109
Ok(PlatformUrl::Github(project)) => {
110110
info!("Detected GitHub URL, processing as GitHub release");
@@ -114,7 +114,7 @@ pub async fn handle_direct_downloads(
114114
)
115115
.await
116116
{
117-
eprintln!("{}", e);
117+
error!("{}", e);
118118
}
119119
}
120120
Ok(PlatformUrl::Gitlab(project)) => {
@@ -125,12 +125,12 @@ pub async fn handle_direct_downloads(
125125
)
126126
.await
127127
{
128-
eprintln!("{}", e);
128+
error!("{}", e);
129129
}
130130
}
131131
Ok(PlatformUrl::Oci(url)) => {
132132
if let Err(e) = handle_oci_download(ctx, &url).await {
133-
eprintln!("{}", e);
133+
error!("{}", e);
134134
};
135135
}
136136
Err(_) => {
@@ -143,14 +143,14 @@ pub async fn handle_direct_downloads(
143143
let packages: Vec<Package> = builder.load()?.items;
144144

145145
if packages.is_empty() {
146-
eprintln!("Invalid download resource '{}'", link);
146+
error!("Invalid download resource '{}'", link);
147147
break;
148148
}
149149

150-
let package = if packages.len() > 1 {
151-
&select_package_interactively(packages, link)?.unwrap()
152-
} else {
150+
let package = if packages.len() == 1 || ctx.yes {
153151
packages.first().unwrap()
152+
} else {
153+
&select_package_interactively(packages, link)?.unwrap()
154154
};
155155

156156
info!(
@@ -209,7 +209,7 @@ async fn handle_oci_download(ctx: &DownloadContext, reference: &str) -> SoarResu
209209
let mut retries = 0;
210210
loop {
211211
if retries > 5 {
212-
eprintln!("Max retries exhausted. Aborting.");
212+
error!("Max retries exhausted. Aborting.");
213213
break;
214214
}
215215
match downloader.download_oci().await {
@@ -222,7 +222,7 @@ async fn handle_oci_download(ctx: &DownloadContext, reference: &str) -> SoarResu
222222
| DownloadError::ChunkError,
223223
) => sleep(Duration::from_secs(5)),
224224
Err(err) => {
225-
eprintln!("{}", err);
225+
error!("{}", err);
226226
break;
227227
}
228228
};
@@ -307,7 +307,7 @@ pub async fn handle_github_downloads(
307307
if let Err(e) =
308308
handle_platform_download::<_, GithubRelease, _>(ctx, &handler, project).await
309309
{
310-
eprintln!("{}", e);
310+
error!("{}", e);
311311
}
312312
}
313313
Ok(())
@@ -323,7 +323,7 @@ pub async fn handle_gitlab_downloads(
323323
if let Err(e) =
324324
handle_platform_download::<_, GitlabRelease, _>(ctx, &handler, project).await
325325
{
326-
eprintln!("{}", e);
326+
error!("{}", e);
327327
}
328328
}
329329
Ok(())

0 commit comments

Comments
 (0)