pihole: request::get now directly return the deserialized json

devmatteini · Dec 26, 2020 · 18fa2ca · 18fa2ca
1 parent 237e560
commit 18fa2ca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/src/pihole/mod.rs b/src/pihole/mod.rs
@@ -1,5 +1,4 @@
 use serde_json::Value as JsonValue;
-use ureq::Response;
 
 use crate::pihole::config::PiHoleConfig;
 use crate::pihole::disable_time::PiHoleDisableTime;
@@ -30,9 +29,7 @@ pub fn enable(config: &PiHoleConfig) -> PiholeResult {
     let url = format!("{}?enable&auth={}", &config.api_url, &config.api_token);
     let response = request::get(&url)?;
 
-    let json = request::deserialize_response_json(response)?;
-
-    process_response(json, ExpectedStatus::Enabled, PiHoleError::NotEnabled)
+    process_response(response, ExpectedStatus::Enabled, PiHoleError::NotEnabled)
 }
 
 pub fn disable(config: &PiHoleConfig, time: PiHoleDisableTime) -> PiholeResult {
@@ -44,9 +41,7 @@ pub fn disable(config: &PiHoleConfig, time: PiHoleDisableTime) -> PiholeResult {
     );
     let response = request::get(&url)?;
 
-    let json = request::deserialize_response_json(response)?;
-
-    process_response(json, ExpectedStatus::Disabled, PiHoleError::NotDisabled)
+    process_response(response, ExpectedStatus::Disabled, PiHoleError::NotDisabled)
 }
 
 fn process_response(

diff --git a/src/pihole/request.rs b/src/pihole/request.rs
@@ -1,19 +1,14 @@
-use serde_json::Value;
-use ureq::Response;
+use serde_json::Value as JsonValue;
 
 use crate::pihole::error::PiHoleError;
 
-pub fn get(url: &str) -> Result<Response, PiHoleError> {
+pub fn get(url: &str) -> Result<JsonValue, PiHoleError> {
     let response = ureq::get(url).timeout_connect(7_000).call();
 
     if let Some(err) = response.synthetic_error() {
         return Err(PiHoleError::HttpError(err.body_text()));
     }
 
-    Ok(response)
-}
-
-pub fn deserialize_response_json(response: Response) -> Result<Value, PiHoleError> {
     response
         .into_json()
         .map_err(|_| PiHoleError::InvalidResponse)