From 1bc6087f179ac2213acacaa0df917c96f9540e55 Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Sun, 13 Mar 2022 03:07:33 +0100
Subject: extract(): Remove `unwrap()`s

---
 src/lib.rs  |  2 +-
 src/yaml.rs | 23 ++++++++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/lib.rs b/src/lib.rs
index 5dd03ec..111ec3e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -12,7 +12,7 @@ pub fn insert(
     for mut doc in data {
         let tx = dbconn.transaction().unwrap();
 
-        crate::yaml::extract(&mut doc, &tx, &table_name, &table_columns);
+        crate::yaml::extract(&mut doc, &tx, &table_name, &table_columns).unwrap();
 
         tx.commit().unwrap();
     }
diff --git a/src/yaml.rs b/src/yaml.rs
index 9a7a517..5d54324 100644
--- a/src/yaml.rs
+++ b/src/yaml.rs
@@ -9,6 +9,13 @@ mod sql;
 pub use sql::*;
 
 
+#[derive(thiserror::Error, Debug)]
+pub enum YamlError {
+    #[error("SQL error")]
+    Sqlite(#[from] rusqlite::Error),
+}
+
+
 // TODO: Separate functions to get a list of YAML hashes, and insert hashes into
 // the database.
 pub fn extract(
@@ -16,11 +23,11 @@ pub fn extract(
     tx: &rusqlite::Transaction,
     table_name: &str,
     table_columns: &HashMap<String, crate::sqlite::Zero>,
-) {
+) -> Result<(), YamlError> {
     match doc {
         yaml::Yaml::Array(ref mut array) => {
             for yaml_value in array {
-                extract(yaml_value, tx, table_name, table_columns);
+                extract(yaml_value, tx, table_name, table_columns)?;
             }
         }
         yaml::Yaml::Hash(ref mut hash) => {
@@ -47,17 +54,23 @@ pub fn extract(
 
                     // Wrap column names in quotes.
                     hash.keys()
-                        .map(|k| format!(r#""{}""#, k.as_str().unwrap()))
+                        .map(|k| k.as_str())
+                        .filter(|k| k.is_some())
+
+                        // Always `Some`.
+                        .map(|k| format!(r#""{}""#, k.unwrap()))
                         .collect::<Vec<String>>()
                         .join(", "),
                     // TODO: get len "?"s
                     format!("{}?", "?, ".repeat(hash.len() - 1)),
                 )
-            ).unwrap();
+            )?;
 
             let values = hash.values().map(|v| Yaml(v));
-            stmt.insert(rusqlite::params_from_iter(values)).unwrap();
+            stmt.insert(rusqlite::params_from_iter(values))?;
         }
         _ => {}
     }
+
+    Ok(())
 }
-- 
cgit v1.2.3