Skip to content

Improve watch code #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ntaulbut wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Improve watch code #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 49 additions & 58 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,76 +104,67 @@ fn watch(config: &Config) -> Result<(), ProgramError> {
}

let (transmit, receive) = channel();
let mut watcher = watcher(transmit, Duration::from_millis(250)).unwrap(); // Create watcher with 1 second debounce time
let mut watcher = watcher(transmit, Duration::from_millis(250)).unwrap();

watcher
.watch(&config.watch, RecursiveMode::Recursive)
.unwrap(); // Watch for file system events in all subfolders of the specified directory
.unwrap();
println!(
"\x1b[94;1mInfo:\x1b[0m Watching for changes in {}...",
"\x1b[94;1mInfo:\x1b[0m Watching for write events in {}...",
&config.watch
);

loop {
match receive.recv() {
Ok(event) => {
if let DebouncedEvent::Write(changed_file_path) = event {
// Match if the event is a file write event
let extension = changed_file_path.extension();
if let Some(extension) = extension {
// Match if the file has an extension
if extension == "htmlisp" {
// Construct output path
let watch_dir = PathBuf::from(&config.watch);
let mut output_path = PathBuf::from("output/");

let absolute_watch_dir =
watch_dir.canonicalize().map_err(ProgramError::ReadInput)?;
let absolute_changed_file_path = changed_file_path
.canonicalize()
.map_err(ProgramError::ReadInput)?;
let relative_changed_file_path = absolute_changed_file_path
.strip_prefix(absolute_watch_dir)
.expect("Couldn't calculate output path");

output_path.push(relative_changed_file_path); // (Relative means relative to the watch directory)
output_path.set_extension("html");

// Create new config
match Config::new(&mut env::args()) {
Ok(config) => {
let mut config = config; // Make value from match mutable
config.input_file =
changed_file_path.to_str().unwrap().to_string();
config.output_file = output_path.to_str().unwrap().to_string();
println!(
"\x1b[94;1mInfo:\x1b[0m Re-compiling due to changes..."
);

// Parse changed file with new config
match read_write(&config) {
Ok(()) => println!(
"\x1b[32;1mSuccess:\x1b[0m {} -> {}",
relative_changed_file_path.to_string_lossy(),
&config.output_file
),
// Handle error here instead of propagating it so that the loop keeps running
Err(err) => eprintln!(
"\x1b[31;1mError:\x1b[0m {}: {}",
err,
relative_changed_file_path.to_string_lossy()
),
}
}
Err(err) => {
eprintln!("\x1b[31;1mError:\x1b[0m {}", err);
process::exit(1);
}
}
Ok(DebouncedEvent::Write(written_file_path)) => {
if written_file_path.extension() != Some("htmlisp".as_ref()) {
continue;
}
// Construct output path
let watch_directory = PathBuf::from(&config.watch);
let mut output_path = PathBuf::from("output/");
let watch_directory_absolute =
watch_directory.canonicalize().map_err(ProgramError::ReadInput)?;
let written_file_path_absolute = written_file_path
.canonicalize()
.map_err(ProgramError::ReadInput)?;
let written_file_path_relative = written_file_path_absolute
.strip_prefix(watch_directory_absolute)
.expect("Couldn't determine output path");
output_path.push(written_file_path_relative);
output_path.set_extension("html");

// Create new config
match Config::new(&mut env::args()) {
Ok(mut config) => {
config.input_file =
written_file_path.to_str().unwrap().to_string();
config.output_file = output_path.to_str().unwrap().to_string();
println!(
"\x1b[94;1mInfo:\x1b[0m Compiling due to write event..."
);

// Parse changed file with new config
match read_write(&config) {
Ok(()) => println!(
"\x1b[32;1mSuccess:\x1b[0m {} -> {}",
written_file_path_relative.to_string_lossy(),
&config.output_file
),
// Handle error here instead of propagating it so that the loop keeps running
Err(err) => eprintln!(
"\x1b[31;1mError:\x1b[0m {}: {}",
err,
written_file_path_relative.to_string_lossy()
),
}
}
Err(err) => {
eprintln!("\x1b[31;1mError:\x1b[0m {}", err);
process::exit(1);
}
}
}
Ok(_) => {}
Err(err) => {
eprintln!("\x1b[31;1mError:\x1b[0m Watch error: {:?}", err);
process::exit(1);
Expand Down