Shutdown properly

Author: tocisz

src/main.rs

@@ -2,7 +2,7 @@ extern crate notify;
 
 use notify::{Watcher, RecursiveMode, RawEvent, raw_watcher};
 use notify::op::Op;
-use std::sync::mpsc::{channel,Sender};
+use std::sync::mpsc::{channel,Sender,Receiver,RecvTimeoutError};
 
 extern crate app_dirs;
 use app_dirs::*;
@@ -13,6 +13,7 @@ use std::io::Seek;
 use std::io::SeekFrom;
 use std::io::Read;
 use std::thread;
+use std::time::Duration;
 
 #[macro_use] extern crate lazy_static;
 extern crate regex;
@@ -156,7 +157,7 @@ impl FileScanner {
 
 const APP_INFO: AppInfo = AppInfo{name: "Logs", author: "CrossoverWorkSmart"};
 
-fn create_log_watch_thread(ui_tx: Sender<MeterControlMessage>)/* -> JoinHandle<()>*/ {
+fn create_log_watch_thread(ui_tx: Sender<MeterControlMessage>, shutdown_rx : Receiver<()>) -> thread::JoinHandle<()> {
     thread::spawn(move || {
         let mut path = get_app_root(AppDataType::UserConfig, &APP_INFO).unwrap();
         path.push("deskapp.log");
@@ -174,21 +175,29 @@ fn create_log_watch_thread(ui_tx: Sender<MeterControlMessage>)/* -> JoinHandle<(
         // Add a path to be watched. All files and directories at that path and
         // below will be monitored for changes.
         watcher.watch(path, RecursiveMode::NonRecursive).unwrap();
-        loop {
-            match rx.recv() {
+        'recv_loop: loop {
+            match rx.recv_timeout(Duration::from_secs(1)) {
                 Ok(RawEvent { path: Some(_path), op: Ok(op), cookie: _cookie }) => scanner.handle_event(op).unwrap(),
                 Ok(event) => println!("broken event: {:?}", event),
+                Err(RecvTimeoutError::Timeout) => (), // that's OK
                 Err(e) => println!("watch error: {:?}", e),
             }
+
+            for _ in shutdown_rx.try_iter() {
+                println!("Received shutdown message.");
+                break 'recv_loop;
+            }
         }
-    });
+    })
 }
 
 #[cfg(target_os = "windows")]
 fn main() {
     let (ui_tx, ui_rx) = channel();
-    create_log_watch_thread(ui_tx);
-    ten_minutes::TenMinutesMeter::new(ui_rx).main();
+    let (shutdown_tx, shutdown_rx) = channel();
+    let handle = create_log_watch_thread(ui_tx, shutdown_rx);
+    ten_minutes::TenMinutesMeter::new(ui_rx, shutdown_tx).main();
+    handle.join().ok();
 }
 
 #[cfg(test)]

src/ten_minutes.rs

@@ -1,9 +1,9 @@
 extern crate systray;
 
-use std::sync::mpsc::Receiver;
+use std::sync::mpsc::{Receiver,Sender};
 
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
-use std::process;
+//use std::process;
 use std::fmt;
 
 pub enum MeterControlMessage {
@@ -25,6 +25,7 @@ impl fmt::Display for Icon {
 pub struct TenMinutesMeter {
     app : systray::Application,
     rx : Receiver<MeterControlMessage>,
+//    shutdown_tx : Sender<()>,
     last_reminder : u16,
     photo_done : bool,
     screenshot_done : bool,
@@ -34,14 +35,15 @@ pub struct TenMinutesMeter {
 const TEN_MINUTES : u16 = 600;
 
 impl TenMinutesMeter {
-    pub fn new(rx : Receiver<MeterControlMessage>) -> TenMinutesMeter {
+    pub fn new(rx : Receiver<MeterControlMessage>, shutdown_tx : Sender<()>) -> TenMinutesMeter {
         match systray::Application::new() {
             Ok(w) => {
                 let mut app = w;
-                TenMinutesMeter::init(&mut app);
+                TenMinutesMeter::init(&mut app, shutdown_tx);
                 TenMinutesMeter {
                     app,
                     rx,
+//                    shutdown_tx,
                     last_reminder: 0,
                     photo_done: false,
                     screenshot_done: false,
@@ -52,12 +54,12 @@ impl TenMinutesMeter {
         }
     }
 
-    fn init(app : &mut systray::Application) -> () {
+    fn init(app : &mut systray::Application, shutdown_tx : Sender<()>) -> () {
         app.set_icon_from_resource(&"Stop".to_string()).ok();
-        app.add_menu_item(&"Quit".to_string(), |window| {
+        app.add_menu_item(&"Quit".to_string(), move |window| {
             window.shutdown().ok();
             window.quit();
-            process::exit(0);
+            shutdown_tx.send(()).ok();
         }).ok();
     }
 
@@ -86,7 +88,7 @@ impl TenMinutesMeter {
                 self.screenshot_done = false;
             }
 
-            let icon : Icon;
+            let icon;
             if TEN_MINUTES - reminder <= 5 { // Warn 5s before end of timecard
                 icon = Icon::Warning;
             } else if self.photo_done && self.screenshot_done {