From 72e723ffa500f8ef2f9e48e50bd18332f2da4b83 Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Wed, 10 Mar 2021 15:26:12 -0500 Subject: [PATCH] Dirty checking --- src/document.rs | 27 +++++++++++++++++++++------ src/editor.rs | 12 +++++++++++- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/src/document.rs b/src/document.rs index ec9efc1..52337dc 100644 --- a/src/document.rs +++ b/src/document.rs @@ -7,6 +7,7 @@ use std::io::{Error, Write}; pub struct Document { rows: Vec, pub file_name: Option, + dirty: bool, } impl Document { @@ -22,6 +23,7 @@ impl Document { Ok(Self { rows, file_name: Some(filename.to_string()), + dirty: false, }) } @@ -38,6 +40,13 @@ impl Document { } pub fn insert(&mut self, at: &Position, c: char) { + if at.y > self.len() { + return; + } + + // File has been modified + self.dirty = true; + if c == '\n' { self.insert_newline(at); return; @@ -47,7 +56,7 @@ impl Document { let mut row = Row::default(); row.insert(0, c); self.rows.push(row); - } else if at.y < self.len() { + } else { let row = self.rows.get_mut(at.y).unwrap(); row.insert(at.x, c); } @@ -59,6 +68,9 @@ impl Document { return } + // File has been modified + self.dirty = true; + if at.x == self.rows.get_mut(at.y).unwrap().len() && at.y < len - 1 { let next_row = self.rows.remove(at.y + 1); let row = self.rows.get_mut(at.y).unwrap(); @@ -69,7 +81,7 @@ impl Document { } } - pub fn save(&self) -> Result<(), Error> { + pub fn save(&mut self) -> Result<(), Error> { if let Some(file_name) = &self.file_name { let mut file = fs::File::create(file_name)?; @@ -77,16 +89,19 @@ impl Document { file.write_all(row.as_bytes())?; file.write_all(b"\n")?; } + + // File has been cleaned! (Saved) + self.dirty = false; } Ok(()) } - fn insert_newline(&mut self, at: &Position) { - if at.y > self.len() { - return; - } + pub fn is_dirty(&self) -> bool { + self.dirty + } + fn insert_newline(&mut self, at: &Position) { if at.y == self.len() { self.rows.push(Row::default()); return; diff --git a/src/editor.rs b/src/editor.rs index 5a70558..2f45582 100644 --- a/src/editor.rs +++ b/src/editor.rs @@ -107,6 +107,11 @@ impl Editor { fn draw_status_bar(&self) { let mut status; let width = self.terminal.size().width as usize; + let modified_indicator = if self.document.is_dirty() { + " (modified)" + } else { + "" + }; let mut file_name = "[No Name]".to_string(); if let Some(name) = &self.document.file_name { @@ -114,7 +119,12 @@ impl Editor { file_name.truncate(20); } - status = format!("{} - {} lines", file_name, self.document.len()); + status = format!( + "{} - {} lines{}", + file_name, + self.document.len(), + modified_indicator + ); let line_indicator = format!( "{}/{}",