refactor get/set_config with serde::De/Serialize

Author: syphar

src/bin/cratesfyi.rs

@@ -365,7 +365,7 @@ impl BuildSubcommand {
                         .get()
                         .context("failed to get a database connection")?;
 
-                    if get_config(&mut conn, ConfigName::RustcVersion)?.is_string() {
+                    if get_config::<String>(&mut conn, ConfigName::RustcVersion)?.is_some() {
                         println!("update-toolchain was already called in the past, exiting");
                         return Ok(());
                     }

src/build_queue.rs

@@ -49,8 +49,8 @@ impl BuildQueue {
 
     pub fn last_seen_reference(&self) -> Result<Option<Oid>> {
         let mut conn = self.db.get()?;
-        if let Some(value) = get_config(&mut conn, ConfigName::LastSeenIndexReference)?.as_str() {
-            return Ok(Some(Oid::from_str(value)?));
+        if let Some(value) = get_config::<String>(&mut conn, ConfigName::LastSeenIndexReference)? {
+            return Ok(Some(Oid::from_str(&value)?));
         }
         Ok(None)
     }
@@ -204,9 +204,7 @@ impl BuildQueue {
     pub fn is_locked(&self) -> Result<bool> {
         let mut conn = self.db.get()?;
 
-        Ok(get_config(&mut conn, ConfigName::QueueLocked)?
-            .as_bool()
-            .unwrap_or(false))
+        Ok(get_config::<bool>(&mut conn, ConfigName::QueueLocked)?.unwrap_or(false))
     }
 
     /// lock the queue. Daemon will check this lock and stop operating if it exists.

src/utils/mod.rs

@@ -22,6 +22,8 @@ pub(crate) mod queue_builder;
 mod rustc_version;
 use anyhow::Result;
 use postgres::Client;
+use serde::de::DeserializeOwned;
+use serde::Serialize;
 pub(crate) mod sized_buffer;
 
 pub(crate) const APP_USER_AGENT: &str = concat!(
@@ -50,25 +52,29 @@ pub enum ConfigName {
 pub fn set_config(
     conn: &mut Client,
     name: ConfigName,
-    value: impl Into<serde_json::Value>,
+    value: impl Serialize,
 ) -> anyhow::Result<()> {
     let name: &'static str = name.into();
     conn.execute(
         "INSERT INTO config (name, value) 
         VALUES ($1, $2)
         ON CONFLICT (name) DO UPDATE SET value = $2;",
-        &[&name, &value.into()],
+        &[&name, &serde_json::to_value(value)?],
     )?;
     Ok(())
 }
 
-pub fn get_config(conn: &mut Client, name: ConfigName) -> Result<serde_json::Value> {
+pub fn get_config<T>(conn: &mut Client, name: ConfigName) -> Result<Option<T>>
+where
+    T: DeserializeOwned,
+{
     let name: &'static str = name.into();
-    Ok(conn
-        .query_opt("SELECT value FROM config WHERE name = $1;", &[&name])?
-        .map_or(serde_json::Value::Null, |row| {
-            row.get::<_, serde_json::Value>("value")
-        }))
+    Ok(
+        match conn.query_opt("SELECT value FROM config WHERE name = $1;", &[&name])? {
+            Some(row) => serde_json::from_value(row.get("value"))?,
+            None => None,
+        },
+    )
 }
 
 #[cfg(test)]
@@ -92,10 +98,7 @@ mod tests {
             let mut conn = env.db().conn();
             conn.execute("DELETE FROM config", &[])?;
 
-            assert_eq!(
-                get_config(&mut conn, ConfigName::RustcVersion)?,
-                Value::Null
-            );
+            assert!(get_config::<String>(&mut conn, ConfigName::RustcVersion)?.is_none());
             Ok(())
         });
     }
@@ -106,10 +109,7 @@ mod tests {
             let mut conn = env.db().conn();
             conn.execute("DELETE FROM config", &[])?;
 
-            assert_eq!(
-                get_config(&mut conn, ConfigName::RustcVersion)?,
-                Value::Null
-            );
+            assert!(get_config::<String>(&mut conn, ConfigName::RustcVersion)?.is_none());
 
             set_config(
                 &mut conn,
@@ -118,7 +118,7 @@ mod tests {
             )?;
             assert_eq!(
                 get_config(&mut conn, ConfigName::RustcVersion)?,
-                Value::String("some value".into())
+                Some("some value".to_string())
             );
             Ok(())
         });

src/web/page/templates.rs

@@ -34,7 +34,7 @@ impl TemplateData {
 }
 
 fn load_rustc_resource_suffix(conn: &mut Client) -> Result<String> {
-    if let Some(vers_str) = get_config(conn, ConfigName::RustcVersion)?.as_str() {
+    if let Some(vers_str) = get_config::<String>(conn, ConfigName::RustcVersion)? {
         return crate::utils::parse_rustc_version(vers_str);
     }
 

src/web/sitemap.rs

@@ -109,9 +109,10 @@ impl_webpage!(AboutBuilds = "core/about/builds.html");
 pub fn about_builds_handler(req: &mut Request) -> IronResult<Response> {
     let mut conn = extension!(req, Pool).get()?;
 
-    let rustc_version = ctry!(req, get_config(&mut conn, ConfigName::RustcVersion))
-        .as_str()
-        .map(str::to_owned);
+    let rustc_version = ctry!(
+        req,
+        get_config::<String>(&mut conn, ConfigName::RustcVersion)
+    );
 
     AboutBuilds {
         rustc_version,