@@ -15,7 +15,7 @@ use soar_dl::{
1515 } ,
1616} ;
1717
18- use crate :: cli:: Args ;
18+ use crate :: { cli:: Args , error , info } ;
1919
2020pub struct DownloadManager {
2121 args : Args ,
@@ -86,7 +86,7 @@ impl DownloadManager {
8686
8787 let selected_asset = self . select_asset ( & assets) ?;
8888
89- println ! ( "Downloading asset from {}" , selected_asset. download_url( ) ) ;
89+ info ! ( "Downloading asset from {}" , selected_asset. download_url( ) ) ;
9090 handler. download ( & selected_asset, options. clone ( ) ) . await ?;
9191 Ok ( ( ) )
9292 }
@@ -98,12 +98,12 @@ impl DownloadManager {
9898
9999 let handler = ReleaseHandler :: < Github > :: new ( ) ;
100100 for project in & self . args . github {
101- println ! ( "Fetching releases from GitHub: {}" , project) ;
101+ info ! ( "Fetching releases from GitHub: {}" , project) ;
102102 if let Err ( e) = self
103103 . handle_platform_download :: < Github , GithubRelease , GithubAsset > ( & handler, project)
104104 . await
105105 {
106- eprintln ! ( "{}" , e) ;
106+ error ! ( "{}" , e) ;
107107 }
108108 }
109109 Ok ( ( ) )
@@ -116,12 +116,12 @@ impl DownloadManager {
116116
117117 let handler = ReleaseHandler :: < Gitlab > :: new ( ) ;
118118 for project in & self . args . gitlab {
119- println ! ( "Fetching releases from GitLab: {}" , project) ;
119+ info ! ( "Fetching releases from GitLab: {}" , project) ;
120120 if let Err ( e) = self
121121 . handle_platform_download :: < Gitlab , GitlabRelease , GitlabAsset > ( & handler, project)
122122 . await
123123 {
124- eprintln ! ( "{}" , e) ;
124+ error ! ( "{}" , e) ;
125125 }
126126 }
127127 Ok ( ( ) )
@@ -144,7 +144,7 @@ impl DownloadManager {
144144 let mut retries = 0 ;
145145 loop {
146146 if retries > 5 {
147- eprintln ! ( "Max retries exhausted. Aborting." ) ;
147+ error ! ( "Max retries exhausted. Aborting." ) ;
148148 break ;
149149 }
150150 match downloader. download_oci ( ) . await {
@@ -157,7 +157,7 @@ impl DownloadManager {
157157 | DownloadError :: ChunkError ,
158158 ) => thread:: sleep ( Duration :: from_secs ( 5 ) ) ,
159159 Err ( err) => {
160- eprintln ! ( "{}" , err) ;
160+ error ! ( "{}" , err) ;
161161 break ;
162162 }
163163 } ;
@@ -173,7 +173,7 @@ impl DownloadManager {
173173 }
174174
175175 for reference in & self . args . ghcr {
176- println ! ( "Downloading using OCI reference: {}" , reference) ;
176+ info ! ( "Downloading using OCI reference: {}" , reference) ;
177177
178178 self . handle_oci_download ( reference) . await ?;
179179 }
@@ -185,7 +185,7 @@ impl DownloadManager {
185185 for link in & self . args . links {
186186 match PlatformUrl :: parse ( link) {
187187 Ok ( PlatformUrl :: DirectUrl ( url) ) => {
188- println ! ( "Downloading using direct link: {}" , url) ;
188+ info ! ( "Downloading using direct link: {}" , url) ;
189189
190190 let options = DownloadOptions {
191191 url : link. clone ( ) ,
@@ -196,39 +196,39 @@ impl DownloadManager {
196196 let _ = downloader
197197 . download ( options)
198198 . await
199- . map_err ( |e| eprintln ! ( "{}" , e) ) ;
199+ . map_err ( |e| error ! ( "{}" , e) ) ;
200200 }
201201 Ok ( PlatformUrl :: Github ( project) ) => {
202- println ! ( "Detected GitHub URL, processing as GitHub release" ) ;
202+ info ! ( "Detected GitHub URL, processing as GitHub release" ) ;
203203 let handler = ReleaseHandler :: < Github > :: new ( ) ;
204204 if let Err ( e) = self
205205 . handle_platform_download :: < Github , GithubRelease , GithubAsset > (
206206 & handler, & project,
207207 )
208208 . await
209209 {
210- eprintln ! ( "{}" , e) ;
210+ error ! ( "{}" , e) ;
211211 }
212212 }
213213 Ok ( PlatformUrl :: Gitlab ( project) ) => {
214- println ! ( "Detected GitLab URL, processing as GitLab release" ) ;
214+ info ! ( "Detected GitLab URL, processing as GitLab release" ) ;
215215 let handler = ReleaseHandler :: < Gitlab > :: new ( ) ;
216216 if let Err ( e) = self
217217 . handle_platform_download :: < Gitlab , GitlabRelease , GitlabAsset > (
218218 & handler, & project,
219219 )
220220 . await
221221 {
222- eprintln ! ( "{}" , e) ;
222+ error ! ( "{}" , e) ;
223223 }
224224 }
225225 Ok ( PlatformUrl :: Oci ( url) ) => {
226- println ! ( "Downloading using OCI reference: {}" , url) ;
226+ info ! ( "Downloading using OCI reference: {}" , url) ;
227227 if let Err ( e) = self . handle_oci_download ( & url) . await {
228- eprintln ! ( "{}" , e) ;
228+ error ! ( "{}" , e) ;
229229 } ;
230230 }
231- Err ( err) => eprintln ! ( "Error parsing URL '{}' : {}" , link, err) ,
231+ Err ( err) => error ! ( "Error parsing URL '{}' : {}" , link, err) ,
232232 } ;
233233 }
234234 Ok ( ( ) )
@@ -243,13 +243,13 @@ impl DownloadManager {
243243 return Ok ( assets[ 0 ] . clone ( ) ) ;
244244 }
245245
246- println ! ( "\n Available assets:" ) ;
246+ info ! ( "\n Available assets:" ) ;
247247 for ( i, asset) in assets. iter ( ) . enumerate ( ) {
248248 let size = asset
249249 . size ( )
250250 . map ( |s| format ! ( " ({})" , HumanBytes ( s) ) )
251251 . unwrap_or_default ( ) ;
252- println ! ( "{}. {}{}" , i + 1 , asset. name( ) , size) ;
252+ info ! ( "{}. {}{}" , i + 1 , asset. name( ) , size) ;
253253 }
254254
255255 loop {
@@ -261,7 +261,7 @@ impl DownloadManager {
261261
262262 match input. trim ( ) . parse :: < usize > ( ) {
263263 Ok ( n) if n > 0 && n <= assets. len ( ) => return Ok ( assets[ n - 1 ] . clone ( ) ) ,
264- _ => println ! ( "Invalid selection, please try again." ) ,
264+ _ => error ! ( "Invalid selection, please try again." ) ,
265265 }
266266 }
267267 }
0 commit comments