Pack weather data

Cargo.toml

@@ -12,7 +12,7 @@ authors = [
 edition = "2021"
 
 [workspace]
-members = [".", "xtask"]
+members = [".", "xtask", "data"]
 
 [features]
 default = ["pulseaudio"]
@@ -28,6 +28,7 @@ rustdoc-args = ["--cfg", "docsrs"]
 async-once-cell = "0.5"
 async-trait = "0.1"
 backon = "0.4.1"
+bincode = "1.3.3"
 calibright = { version = "0.1", features = ["watch"] }
 chrono = { version = "0.4", default-features = false, features = ["clock", "unstable-locales"] }
 chrono-tz = { version = "0.8", features = ["serde"] }
@@ -64,6 +65,7 @@ unicode-segmentation = "1.10.1"
 wayrs-client = { version = "0.12", features = ["tokio"] }
 wayrs-protocols = { version = "0.12", features = ["wlr-foreign-toplevel-management-unstable-v1"] }
 zbus = { version = "3.14", default-features = false, features = ["tokio"] }
+i3status-rs_data = {path = "data"}
 
 [dependencies.tokio]
 version = "1.12"
@@ -82,6 +84,11 @@ features = [
   "time",
 ]
 
+[build-dependencies]
+bincode = "1.3.3"
+serde_json = "1.0"
+i3status-rs_data = {path = "data"}
+
 [profile.release]
 lto = "thin"
 

build.rs

@@ -1,6 +1,25 @@
-use std::process::Command;
+use std::{env, fs::File, path::PathBuf, process::Command};
 
 fn main() {
+    let met_no_legends_store: i3status_rs_data::weather::met_no::LegendsStore =
+        serde_json::from_str(include_str!("data/met_no_legends.json")).unwrap();
+
+    let buffer =
+        File::create(PathBuf::from(env::var("OUT_DIR").unwrap()).join("met_no_legends.bin"))
+            .unwrap();
+
+    bincode::serialize_into(buffer, &met_no_legends_store).unwrap();
+
+    let open_weather_map_cities_store: i3status_rs_data::weather::open_weather_map::CitiesStore =
+        serde_json::from_str(include_str!("data/open_weather_map_cities.json")).unwrap();
+
+    let buffer = File::create(
+        PathBuf::from(env::var("OUT_DIR").unwrap()).join("open_weather_map_cities.bin"),
+    )
+    .unwrap();
+
+    bincode::serialize_into(buffer, &open_weather_map_cities_store).unwrap();
+
     let hash = Command::new("git")
         .args(["rev-parse", "--short", "HEAD"])
         .env("GIT_CONFIG_GLOBAL", "/dev/null")

cspell.yaml

@@ -4,7 +4,7 @@ allowCompoundWords: true
 ignorePaths:
   - target/
   - man/
-  - src/blocks/weather/met_no_legends.json
+  - data/met_no_legends.json
 ignoreRegExpList:
   # Ignore usernames that are @'d
   - /@[\w-]*/g

data/Cargo.toml

@@ -0,0 +1,8 @@
+[package]
+name = "i3status-rs_data"
+publish = false
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+serde = { version = "1.0", features = ["derive", "rc"] }

data/src/lib.rs

@@ -0,0 +1,4 @@
+extern crate serde;
+
+mod prelude;
+pub mod weather;

data/src/prelude.rs

@@ -0,0 +1,3 @@
+pub use std::collections::HashMap;
+
+pub use serde::{Deserialize, Serialize};

data/src/weather/met_no.rs

@@ -0,0 +1,10 @@
+use crate::prelude::*;
+
+pub type LegendsStore = HashMap<String, LegendsResult>;
+
+#[derive(Deserialize, Serialize)]
+pub struct LegendsResult {
+    pub desc_en: String,
+    pub desc_nb: String,
+    pub desc_nn: String,
+}

data/src/weather/mod.rs

@@ -0,0 +1,2 @@
+pub mod met_no;
+pub mod open_weather_map;

data/src/weather/open_weather_map.rs

@@ -0,0 +1,9 @@
+use crate::prelude::*;
+
+pub type CitiesStore = HashMap<String, City>;
+
+#[derive(Deserialize, Serialize)]
+pub struct City {
+    pub lat: f64,
+    pub lon: f64,
+}

src/blocks/weather/met_no.rs

@@ -1,6 +1,6 @@
 use super::*;
 
-type LegendsStore = HashMap<String, LegendsResult>;
+use i3status_rs_data::weather::met_no::LegendsStore;
 
 #[derive(Deserialize, Debug)]
 #[serde(tag = "name", rename_all = "lowercase")]
@@ -25,13 +25,6 @@ impl<'a> Service<'a> {
     }
 }
 
-#[derive(Deserialize)]
-struct LegendsResult {
-    desc_en: String,
-    desc_nb: String,
-    desc_nn: String,
-}
-
 #[derive(Deserialize, Debug, Clone, Default)]
 pub(super) enum ApiLanguage {
     #[serde(rename = "en")]
@@ -90,8 +83,14 @@ struct ForecastTimeInstant {
     relative_humidity: Option<f64>,
 }
 
-static LEGENDS: Lazy<Option<LegendsStore>> =
-    Lazy::new(|| serde_json::from_str(include_str!("met_no_legends.json")).ok());
+static LEGENDS: Lazy<Option<LegendsStore>> = Lazy::new(|| {
+    bincode::deserialize(include_bytes!(concat!(
+        env!("OUT_DIR"),
+        "/",
+        "met_no_legends.bin"
+    )))
+    .ok()
+});
 
 const FORECAST_URL: &str = "https://api.met.no/weatherapi/locationforecast/2.0/compact";
 

src/blocks/weather/open_weather_map.rs

@@ -1,6 +1,8 @@
 use super::*;
 use chrono::Utc;
 
+use i3status_rs_data::weather::open_weather_map::{CitiesStore, City};
+
 pub(super) const URL: &str = "https://api.openweathermap.org/data/2.5/weather";
 pub(super) const GEO_URL: &str = "https://api.openweathermap.org/geo/1.0";
 pub(super) const API_KEY_ENV: &str = "OPENWEATHERMAP_API_KEY";
@@ -90,16 +92,14 @@ struct ApiWeather {
     description: String,
 }
 
-type CitiesStore = HashMap<String, City>;
-
-#[derive(Deserialize, Debug)]
-struct City {
-    lat: f64,
-    lon: f64,
-}
-
-static CITIES: Lazy<Option<CitiesStore>> =
-    Lazy::new(|| serde_json::from_str(include_str!("open_weather_map_cities.json")).ok());
+static CITIES: Lazy<Option<CitiesStore>> = Lazy::new(|| {
+    bincode::deserialize(include_bytes!(concat!(
+        env!("OUT_DIR"),
+        "/",
+        "open_weather_map_cities.bin"
+    )))
+    .ok()
+});
 
 static LOCATION_CACHE: Mutex<Option<String>> = Mutex::new(None);