diff --git a/src/keys.rs b/src/keys.rs index 66d461e..2dacae3 100644 --- a/src/keys.rs +++ b/src/keys.rs @@ -25,7 +25,7 @@ mod save; mod quit; mod help; -impl Handle for Taggart { +impl Handle for Perch { fn handle (&mut self, input: &TuiIn) -> Perhaps { let min = self.offset; let max = self.offset + self.display.h().saturating_sub(1); @@ -60,7 +60,7 @@ impl Handle for Taggart { } } -impl Taggart { +impl Perch { fn open_in_player (&self) -> Usually<()> { open(self.entries[self.cursor].path.as_ref())?; Ok(()) diff --git a/src/keys/edit.rs b/src/keys/edit.rs index 3e56554..de74ef1 100644 --- a/src/keys/edit.rs +++ b/src/keys/edit.rs @@ -1,6 +1,6 @@ use crate::*; -impl Taggart { +impl Perch { pub fn handle_edit (&mut self, event: &Event) { match event { press!(Char(c)) => self.edit_insert(*c), diff --git a/src/keys/help.rs b/src/keys/help.rs index 65fa90d..9014214 100644 --- a/src/keys/help.rs +++ b/src/keys/help.rs @@ -1,6 +1,6 @@ use crate::*; -impl Taggart { +impl Perch { pub fn handle_help (&mut self, event: &Event, _page: u8) { match event { press!(Esc) => { self.mode = None }, diff --git a/src/keys/quit.rs b/src/keys/quit.rs index 0420993..362f2de 100644 --- a/src/keys/quit.rs +++ b/src/keys/quit.rs @@ -1,6 +1,6 @@ use crate::*; -impl Taggart { +impl Perch { pub fn handle_quit (&mut self, input: &TuiIn, choice: u8) { match &*input.event() { press!(Esc) => { self.mode = None }, diff --git a/src/keys/save.rs b/src/keys/save.rs index 707d3fe..434ee7a 100644 --- a/src/keys/save.rs +++ b/src/keys/save.rs @@ -1,6 +1,6 @@ use crate::*; -impl Taggart { +impl Perch { pub fn handle_save (&mut self, event: &Event, choice: u8) { match event { press!(Esc) => { self.mode = None } diff --git a/src/main.rs b/src/main.rs index 7487d96..8381915 100644 --- a/src/main.rs +++ b/src/main.rs @@ -52,7 +52,7 @@ fn main () -> Usually<()> { if let Ok(results) = Arc::try_unwrap(results) { let mut results = results.into_inner()?; results.sort(); - let state = Arc::new(RwLock::new(Taggart::new(&path, results)?)); + let state = Arc::new(RwLock::new(Perch::new(&path, results)?)); if let Some(true) = args.get_one::("check") { return Ok(()) } diff --git a/src/model.rs b/src/model.rs index 3855973..ad1ef15 100644 --- a/src/model.rs +++ b/src/model.rs @@ -5,7 +5,7 @@ mod column; pub use self::column::*; mod entry; pub use self::entry::*; /// The application state. -pub struct Taggart { +pub struct Perch { pub _root: PathBuf, pub entries: Vec, pub cursor: usize, @@ -32,7 +32,7 @@ pub enum Mode { Quit { choice: u8, }, } -impl Taggart { +impl Perch { pub fn new (root: &impl AsRef, entries: Vec) -> Usually { Ok(Self { _root: root.as_ref().into(), diff --git a/src/model/column.rs b/src/model/column.rs index 492958d..55ff27f 100644 --- a/src/model/column.rs +++ b/src/model/column.rs @@ -63,7 +63,7 @@ pub struct Columns(pub Vec>); macro_rules! setter { ($set:ident) => {{ - fn $set (state: &mut Taggart, index: usize, value: Option<&str>) { + fn $set (state: &mut Perch, index: usize, value: Option<&str>) { if let Some(entries) = entries_under(&mut state.entries, index) { for (_path, entry) in entries.into_iter() { if entry.write().unwrap().$set(value) { @@ -82,7 +82,7 @@ macro_rules! setter { impl Default for Columns< fn(&Entry)->Option>, - fn(&mut Taggart, usize, Option<&str>), + fn(&mut Perch, usize, Option<&str>), fn(&Entry)->Option