Skip to content
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

Make file watching consistent across editors #37

Merged
merged 1 commit into from
Sep 20, 2024
Merged

Make file watching consistent across editors #37

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
22 changes: 11 additions & 11 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::fs::{self, File};
use std::io::{Read, Write};
use std::path::PathBuf;
use std::path::{Path, PathBuf};
use std::time::Duration;

use clap::{Parser, Subcommand};
Expand Down Expand Up @@ -106,6 +106,12 @@ fn main() -> miette::Result<()> {
}
Command::Clean { name: _ } => todo!("There are no debug files implemented to clean!"),
Command::Watch { name } => {
// Vim breaks if watching a single file
let folder_path = match name.parent() {
Some(pth) if pth.is_dir() => pth.to_path_buf(),
_ => Path::new(".").to_path_buf(),
};

// Clear screen and move cursor to top left
print!("\x1B[2J\x1B[2;1H");
file_message(Green, "Watching", &name);
Expand All @@ -115,8 +121,9 @@ fn main() -> miette::Result<()> {
.into_diagnostic()?;

watcher
.watch(name.clone(), move |event: Event| match event.kind {
EventKind::Modify(_) => {
.watch(folder_path, move |event: Event| match event.kind {
// Watch remove for vim changes
EventKind::Modify(_) | EventKind::Remove(_) => {
// Clear screen
print!("\x1B[2J\x1B[2;1H");
file_message(Green, "Watching", &name);
Expand All @@ -140,14 +147,6 @@ fn main() -> miette::Result<()> {
contents.reclaim();
Flow::Continue
}
EventKind::Remove(_) => {
if name.exists() {
Flow::Continue
} else {
message(Red, "Error", "watched file was deleted. Exiting...");
std::process::exit(1);
}
}
_ => Flow::Continue,
})
.into_diagnostic()?;
Expand All @@ -169,6 +168,7 @@ fn main() -> miette::Result<()> {
}
}

#[allow(unused)]
enum MsgColor {
Green,
Cyan,
Expand Down
Loading