Merge pull request #1011 from simao/weather-refactor

Refactored weather block to use curl crate

Author: ammgws

Cargo.lock

@@ -29,6 +29,7 @@ serde_json = "1.0"
 swayipc = "2.7"
 toml = "0.5"
 signal-hook = "0.1.16"
+curl = "0.4"
 
 # Optional features/blocks
 libpulse-binding = { optional = true, version = "2.15.0", default-features = false }

Cargo.toml

@@ -1531,9 +1531,10 @@ Key | Values | Required | Default
 `api_key` | Your OpenWeatherMap API key. | Yes | None
 `city_id` | OpenWeatherMap's ID for the city. | Yes* | None
 `place` | OpenWeatherMap 'By city name' search query. See [here](https://openweathermap.org/current) | Yes* | None
+`coordinates` | GPS latitude longitude coordinates as a tuple, example: `["39.236229089090216","9.331730718685696"]`
 `units` | Either `metric` or `imperial`. | Yes | `metric`
 
-Either one of `city_id` or `place` is required. If both are supplied, `city_id` takes precedence.
+One of `city_id`, `place` or `coordinates` is required. If more than one are supplied, `city_id` takes precedence over `place` which takes place over `coordinates`.
 
 The options `api_key`, `city_id`, `place` can be omitted from configuration,
 in which case they must be provided in the environment variables
@@ -1549,6 +1550,7 @@ Key | Value
 `{humidity}` | Humidity
 `{weather}` | Textual description of the weather, e.g. "Raining"
 `{wind}` | Wind speed
+`{wind_kmh}` | Wind speed. The wind speed in km/h.
 `{direction}` | Wind direction, e.g. "NE"
 
 ###### [↥ back to top](#list-of-available-blocks)

blocks.md

@@ -1,5 +1,4 @@
 use std::collections::BTreeMap;
-use std::process::Command;
 use std::time::Duration;
 
 use crossbeam_channel::Sender;
@@ -9,6 +8,7 @@ use crate::blocks::{Block, ConfigBlock, Update};
 use crate::config::Config;
 use crate::de::deserialize_duration;
 use crate::errors::*;
+use crate::http;
 use crate::input::I3BarEvent;
 use crate::scheduler::Task;
 use crate::util::{pseudo_uuid, FormatTemplate};
@@ -92,29 +92,15 @@ impl ConfigBlock for Docker {
 
 impl Block for Docker {
     fn update(&mut self) -> Result<Option<Update>> {
-        let output = match Command::new("sh")
-            .args(&[
-                "-c",
-                "curl --fail --unix-socket /var/run/docker.sock http:/api/info",
-            ])
-            .output()
-        {
-            Ok(raw_output) => {
-                String::from_utf8(raw_output.stdout).block_error("docker", "Failed to decode")?
-            }
-            Err(_) => {
-                // We don't want the bar to crash if we can't reach the docker daemon.
-                self.text.set_text("N/A".to_string());
-                return Ok(Some(self.update_interval.into()));
-            }
-        };
-
-        if output.is_empty() {
+        let socket_path = std::path::PathBuf::from("/var/run/docker.sock");
+        let output = http::http_get_socket_json(socket_path, "http:/api/info");
+
+        if output.is_err() {
             self.text.set_text("N/A".to_string());
             return Ok(Some(self.update_interval.into()));
         }
 
-        let status: Status = serde_json::from_str(&output)
+        let status: Status = serde_json::from_value(output.unwrap().content)
             .block_error("docker", "Failed to parse JSON response.")?;
 
         let values = map!(

src/blocks/docker.rs

@@ -1,5 +1,4 @@
 use std::collections::{BTreeMap, HashMap};
-use std::process::Command;
 use std::time::Duration;
 
 use crossbeam_channel::Sender;
@@ -11,6 +10,7 @@ use crate::blocks::{Block, ConfigBlock, Update};
 use crate::config::Config;
 use crate::de::deserialize_duration;
 use crate::errors::*;
+use crate::http;
 use crate::input::I3BarEvent;
 use crate::scheduler::Task;
 use crate::util::{pseudo_uuid, FormatTemplate};
@@ -197,48 +197,25 @@ impl<'a> Notifications<'a> {
             return Ok(None);
         }
 
-        let result = Command::new("sh")
-            .args(&[
-                "-c",
-                &format!(
-                    "curl --silent --dump-header - --header \"Authorization: Bearer {token}\" -m 3 \"{next_page_url}\"",
-                    token = self.token,
-                    next_page_url = self.next_page_url,
-                ),
-            ])
-            .output()?;
-
-        // Catch all errors, if response status is not 200, then curl wont exit with status code 0.
-        if !result.status.success() {
-            return Err(Box::new(BlockError(
-                "github".to_owned(),
-                "curl status code different than 0".to_owned(),
-            )));
-        }
-
-        let output = String::from_utf8(result.stdout)?;
-
-        // Status / headers sections are separed by a blank line.
-        let split: Vec<&str> = output.split("\r\n\r\n").collect();
-        if split.len() != 2 {
-            return Err(Box::new(BlockError(
-                "github".to_owned(),
-                "unexpected curl output".to_owned(),
-            )));
-        }
-
-        let (meta, body) = (split[0], split[1]);
-
-        let next = match meta.lines().find(|&l| l.starts_with("Link:")) {
-            Some(v) => match parse_links_header(v).get("next") {
-                Some(next) => next,
-                None => "",
-            },
-            None => "",
-        };
-        self.next_page_url = next.to_owned();
+        let header_value = format!("Bearer {}", self.token);
+        let headers = vec![("Authorization", header_value.as_str())];
+        let result =
+            http::http_get_json(&self.next_page_url, Some(Duration::from_secs(3)), headers)?;
+
+        self.next_page_url = result
+            .headers
+            .iter()
+            .find_map(|header| {
+                if header.starts_with("Link:") {
+                    parse_links_header(header).get("next").cloned()
+                } else {
+                    None
+                }
+            })
+            .unwrap_or(&"")
+            .to_string();
 
-        let notifications: Vec<Notification> = serde_json::from_str(body)?;
+        let notifications: Vec<Notification> = serde_json::from_value(result.content)?;
         self.notifications = notifications.into_iter();
 
         Ok(self.notifications.next())