Merge branch 'migrate_song_model' of github.com:kdeng00/IcarusDownloadManager into migrate_song_model
This commit is contained in:
+11
-5
@@ -16,7 +16,7 @@ impl Default for Download {
|
|||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub enum MyError {
|
pub enum MyError {
|
||||||
_Request(reqwest::Error),
|
Request(reqwest::Error),
|
||||||
Other(String),
|
Other(String),
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -41,12 +41,13 @@ impl Download {
|
|||||||
.get(&url)
|
.get(&url)
|
||||||
.header(reqwest::header::AUTHORIZATION, &access_token)
|
.header(reqwest::header::AUTHORIZATION, &access_token)
|
||||||
.send()
|
.send()
|
||||||
.await
|
.await;
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
match response.status() {
|
match response {
|
||||||
|
Ok(rep) => {
|
||||||
|
match rep.status() {
|
||||||
reqwest::StatusCode::OK => {
|
reqwest::StatusCode::OK => {
|
||||||
let data = response.text();
|
let data = rep.text();
|
||||||
match data.await {
|
match data.await {
|
||||||
Ok(e) => {
|
Ok(e) => {
|
||||||
return Ok(e);
|
return Ok(e);
|
||||||
@@ -63,6 +64,11 @@ impl Download {
|
|||||||
panic!("Uh oh! Something unexpected happened: {:?}", other);
|
panic!("Uh oh! Something unexpected happened: {:?}", other);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
Err(er) => {
|
||||||
|
return Err(MyError::Request(er));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return Err(MyError::Other(String::from("Error downloading")));
|
return Err(MyError::Other(String::from("Error downloading")));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user