Don't exit void when pressing Unselect key

Cargo.toml

@@ -24,13 +24,15 @@ log = "0.4.11"
 lazy_static = "1.4.0"
 time = "0.2.22"
 getopts = "0.2.21"
-protobuf = "1"
+protobuf = "2"
 rand = "0.7.3"
 libc = "0.2.80"
 regex = "1.4.2"
 unicode-segmentation = "1.6.0"
 clippy = { version = "0.0.302", optional = true }
 fs2 = "0.4.3"
+chrono = "0.4"
+hostname = "0.3.1"
 
 [dev-dependencies]
 quickcheck = "0.9.2"

include/data_model.proto

@@ -8,8 +8,14 @@ message Tag {
 }
 
 message Gps {
-  required float lat = 1;
-  required float lon = 2;
+  optional float lat = 1;
+  optional float lon = 2;
+}
+
+message Date {
+    required uint32 day = 1;
+    required uint32 month = 2;
+    required uint32 year = 3;
 }
 
 message Meta {
@@ -18,7 +24,8 @@ message Meta {
   optional uint64 finish_time = 5;
   required Gps gps = 3;
   repeated Tag tags = 4;
-  optional uint64 due = 6;
+  optional uint64 OLD_due = 6;
+  optional Date due_date = 7;
 }
 
 message Node {
@@ -31,10 +38,11 @@ message Node {
   required bool hide_stricken = 7;
   required uint32 x = 8;
   required uint32 y = 9;
-  required bool selected = 10;
+  optional bool selected = 10;
   required uint64 parent_id = 11;
   optional string free_text = 12;
   required bool auto_arrange = 13;
+  optional string url = 14;
 }
 
 message Arrow {

src/bin/void/main.rs

@@ -1,9 +1,21 @@
-use fs2::FileExt;
-use std::{ffi::OsString, fs::OpenOptions, io::Read};
-use voidmap::{deserialize_screen, init_screen_log, Config, Screen};
+use std::{
+    ffi::OsString,
+    fs::OpenOptions,
+    io::{Read, Write},
+    path::PathBuf,
+};
+use voidmap::{deserialize_screen, init_screen_log, Config};
 
 mod cli;
 
+struct DeleteOnDrop(PathBuf);
+
+impl Drop for DeleteOnDrop {
+    fn drop(&mut self) {
+        std::fs::remove_file(&self.0).expect("failed to kill lockfile")
+    }
+}
+
 fn main() {
     // Initialise the CLI parser
     let app = cli::create();
@@ -16,31 +28,51 @@ fn main() {
         .value_of("PATH")
         .map(OsString::from)
         .or_else(|| {
-            dirs::home_dir().and_then(|mut h| {
+            dirs::home_dir().map(|mut h| {
                 h.push(".void.db");
-                Some(h.into_os_string())
+                h.into_os_string()
             })
         })
         .unwrap();
 
     // load from file if present
     let mut data = vec![];
+    let mut lock_path = PathBuf::new();
+    lock_path.push(&path);
+    let mut file_name = lock_path
+        .file_name()
+        .expect("a filename for the db is needed")
+        .to_owned();
+    file_name.push(".lock");
+    lock_path.set_file_name(file_name);
+
+    let mut lock_file = OpenOptions::new()
+        .write(true)
+        .create_new(true)
+        .open(&lock_path)
+        .expect("failed to lock db - is another process using it?");
+    write!(
+        lock_file,
+        "{}::{}",
+        hostname::get().unwrap().to_string_lossy(),
+        std::process::id()
+    )
+    .unwrap();
+    lock_file.sync_all().unwrap();
+    let guard = DeleteOnDrop(lock_path);
+
     let mut f = OpenOptions::new()
         .write(true)
         .read(true)
         .create(true)
         .open(&path)
         .unwrap();
 
-    // exclusively lock the file
-    f.try_lock_exclusive()
-        .unwrap_or_else(|_| panic!("Another `void` process is using this path already!"));
-
     f.read_to_end(&mut data).unwrap();
-    let saved_screen = deserialize_screen(data).ok();
+    let saved_screen = deserialize_screen(data).expect("invalid screen");
 
     // Initialise the main working screen
-    let mut screen = saved_screen.unwrap_or_else(Screen::default);
+    let mut screen = saved_screen/*.unwrap_or_else(Screen::default)*/;
 
     screen.work_path = matches
         .value_of("PATH")
@@ -58,4 +90,5 @@ fn main() {
     screen.config = config;
 
     screen.run();
+    drop(guard);
 }

src/colors.rs

@@ -4,14 +4,23 @@ pub fn random_fg_color() -> String {
     use termion::color::*;
     let colors: Vec<String> = vec![
         format!("{}", Fg(LightGreen)),
-        // format!("{}", Fg(LightBlack)),
+        format!("{}", Fg(LightBlack)),
         format!("{}", Fg(LightRed)),
         format!("{}", Fg(LightGreen)),
-        format!("{}", Fg(LightYellow)),
-        // format!("{}", Fg(LightBlue)),
+        //format!("{}", Fg(LightYellow)),
+        format!("{}", Fg(LightBlue)),
         format!("{}", Fg(LightMagenta)),
         format!("{}", Fg(LightCyan)),
-        format!("{}", Fg(LightWhite)),
+        //format!("{}", Fg(LightWhite)),
+        format!("{}", Fg(Green)),
+        format!("{}", Fg(Black)),
+        format!("{}", Fg(Red)),
+        format!("{}", Fg(Green)),
+        format!("{}", Fg(Yellow)),
+        format!("{}", Fg(Blue)),
+        format!("{}", Fg(Magenta)),
+        format!("{}", Fg(Cyan)),
+        //format!("{}", Fg(White)),
     ];
     colors.choose(&mut rand::thread_rng()).unwrap().clone()
 }