diff --git a/src-tauri/src/error/remote_access_error.rs b/src-tauri/src/error/remote_access_error.rs index 6f12508..689db9a 100644 --- a/src-tauri/src/error/remote_access_error.rs +++ b/src-tauri/src/error/remote_access_error.rs @@ -50,7 +50,7 @@ impl Display for RemoteAccessError { RemoteAccessError::HandshakeFailed(message) => write!(f, "failed to complete handshake: {message}"), RemoteAccessError::GameNotFound(id) => write!(f, "could not find game on server: {id}"), RemoteAccessError::InvalidResponse(error) => write!(f, "server returned an invalid response: {}, {}", error.status_code, error.status_message), - RemoteAccessError::UnparseableResponse(error) => write!(f, "server returned an invalid response: {}", error), + RemoteAccessError::UnparseableResponse(error) => write!(f, "server returned an invalid response: {error}"), RemoteAccessError::ManifestDownloadFailed(status, response) => write!( f, "failed to download game manifest: {status} {response}" diff --git a/src-tauri/src/games/downloads/download_logic.rs b/src-tauri/src/games/downloads/download_logic.rs index 55ea715..5985a62 100644 --- a/src-tauri/src/games/downloads/download_logic.rs +++ b/src-tauri/src/games/downloads/download_logic.rs @@ -1,4 +1,3 @@ -use crate::client; use crate::download_manager::util::download_thread_control_flag::{ DownloadThreadControl, DownloadThreadControlFlag, }; @@ -8,7 +7,7 @@ use crate::error::drop_server_error::DropServerError; use crate::error::remote_access_error::RemoteAccessError; use crate::games::downloads::manifest::DropDownloadContext; use crate::remote::auth::generate_authorization_header; -use log::{debug, info, warn}; +use log::{debug, warn}; use md5::{Context, Digest}; use reqwest::blocking::{RequestBuilder, Response}; @@ -147,7 +146,7 @@ pub fn download_game_chunk( if response.status() != 200 { debug!("chunk request got status code: {}", response.status()); let raw_res = response.text().unwrap(); - if let Some(err) = serde_json::from_str::(&raw_res).ok() { + if let Ok(err) = serde_json::from_str::(&raw_res) { return Err(ApplicationDownloadError::Communication( RemoteAccessError::InvalidResponse(err), ));