dranke/microw8
1
0
Fork 0
mirror of https://github.com/exoticorn/microw8.git synced 2026-01-20 19:26:43 +01:00
Code Issues Projects Releases Wiki Activity

implement more robust file watcher

Browse Source
This commit is contained in:
Dennis Ranke
2022-01-29 15:22:14 +01:00
parent 381eaf970f
commit f21497dd2e
6 changed files with 93 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main.rs
View File

@@ -1,17 +1,14 @@
use std::fs::File;
use std::io::prelude::*;
use std::process;
use std::sync::mpsc;
use std::time::Duration;
use std::{
path::{Path, PathBuf},
process::exit,
};
use anyhow::{bail, Result};
use notify::{DebouncedEvent, Watcher};
use anyhow::Result;
use pico_args::Arguments;
use uw8::MicroW8;
use uw8::{FileWatcher, MicroW8};
fn main() -> Result<()> {
let mut args = Arguments::from_env();
@@ -72,13 +69,14 @@ fn run(mut args: Arguments) -> Result<()> {
uw8.set_timeout(timeout);
}
let (tx, rx) = mpsc::channel();
let mut watcher = notify::watcher(tx, Duration::from_millis(100))?;
let mut watcher = FileWatcher::builder();
if watch_mode {
watcher.watch(&filename, notify::RecursiveMode::NonRecursive)?;
watcher.add_file(&filename);
}
let watcher = watcher.build()?;
if let Err(err) = start_cart(&filename, &mut uw8, &config) {
eprintln!("Load error: {}", err);
if !watch_mode {
@@ -87,14 +85,10 @@ fn run(mut args: Arguments) -> Result<()> {
}
while uw8.is_open() {
match rx.try_recv() {
Ok(DebouncedEvent::Create(_) | DebouncedEvent::Write(_)) => {
if let Err(err) = start_cart(&filename, &mut uw8, &config) {
eprintln!("Load error: {}", err);
}
if watcher.poll_changed_file()?.is_some() {
if let Err(err) = start_cart(&filename, &mut uw8, &config) {
eprintln!("Load error: {}", err);
}
Err(mpsc::TryRecvError::Disconnected) => bail!("File watcher disconnected"),
_ => (),
}
if let Err(err) = uw8.run_frame() {