From b69f46ced56fb199c8cdb58742f8babb5d953988 Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Tue, 30 Oct 2018 17:15:45 +0100
Subject: dome_key_state_load_map_group(): Remove `expect`s

Don't on errors from reading or parsing the mappings file. Instead print
the error and parse an empty mappings string.

Took a lot of doing to get this working because of this error:

    error[E0597]: `dkmap` does not live long enough
      --> src/ffi.rs:72:44
       |
    72 |                     match MapGroup::parse(&dkmap)
       |                                            ^^^^^ borrowed value does not live long enough
    ...
    82 |                 },
       |                 - borrowed value only lives until here
       |
       = note: borrowed value must be valid for the static lifetime...

Finally got tired to trying things and just decided to store the
unparsed mappings string in `State` to get it to live long enough.
---
 src/ffi.rs | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/ffi.rs b/src/ffi.rs
index 9e9111c..4738c18 100644
--- a/src/ffi.rs
+++ b/src/ffi.rs
@@ -9,6 +9,7 @@ use xdg;
 
 use {HeadphoneButton, MapGroup};
 use config::{self, Config};
+use errors::*;
 use map::{ModeChange, run_key_action};
 use trial;
 
@@ -23,6 +24,7 @@ pub struct Trigger {
 pub struct State {
     pub in_mode: Option<Vec<HeadphoneButton>>,
     pub map_group: Option<MapGroup>,
+    mappings_str: String,
 }
 
 #[no_mangle]
@@ -57,14 +59,33 @@ pub extern "C" fn dome_key_state_load_map_group(ptr: *mut State) {
 
             match xdg_dirs.find_config_file("mappings.dkmap") {
                 Some(mapping_file) => {
-                    let dkmap = fs::read_to_string(mapping_file)
-                        .expect("Failed to read 'mappings.dkmap'");
-
-                    let mut map_group = MapGroup::parse(&dkmap)
-                        .expect("Failed to parse 'mappings.dkmap'");
-                    map_group.parse_actions();
+                    // Store the mapping string contents in `State`. Otherwise
+                    // the reference doesn't live long enough.
+                    state.mappings_str = match fs::read_to_string(mapping_file)
+                        .chain_err(|| "failed to read 'mappings.dkmap'")
+                    {
+                        Ok(s) => s,
+                        Err(e) => {
+                            error!("{}", e);
+
+                            String::new()
+                        },
+                    };
+
+                    let map_group = match MapGroup::parse(&state.mappings_str)
+                        .chain_err(|| "failed to parse 'mappings.dkmap'")
+                    {
+                        Ok(mut map_group) => {
+                            map_group.parse_actions();
+                            Some(map_group)
+                        },
+                        Err(e) => {
+                            error!("{}", e);
+                            None
+                        },
+                    };
 
-                    state.map_group = Some(map_group);
+                    state.map_group = map_group;
                 },
                 None => {
                     state.map_group = Some(MapGroup::default());
-- 
cgit v1.2.3