wip: refactor pt.17: 44 errors

This commit is contained in:
🪞👃🪞 2024-11-11 01:36:50 +01:00
parent 78c2004282
commit c2b290b3c5
8 changed files with 104 additions and 112 deletions

View file

@ -33,30 +33,30 @@ impl InputToCommand<Tui, PhrasePoolView<Tui>> for PhraseRenameCommand {
}
impl<E: Engine> Command<PhrasePoolView<E>> for PhraseRenameCommand {
fn execute (self, state: &mut PhrasePoolView<E>) -> Perhaps<Self> {
fn execute (self, view: &mut PhrasePoolView<E>) -> Perhaps<Self> {
use PhraseRenameCommand::*;
if let Some(PhrasePoolMode::Rename(phrase, ref mut old_name)) = state.mode {
if let Some(PhrasePoolMode::Rename(phrase, ref mut old_name)) = view.mode {
match self {
Set(s) => {
state.model.phrases[phrase].write().unwrap().name = s.into();
view.model.phrases[phrase].write().unwrap().name = s.into();
return Ok(Some(Self::Set(old_name.clone())))
},
Confirm => {
let old_name = old_name.clone();
state.mode = None;
view.mode = None;
return Ok(Some(Self::Set(old_name)))
},
Cancel => {
let mut phrase = state.model.phrases[phrase].write().unwrap();
let mut phrase = view.model.phrases[phrase].write().unwrap();
phrase.name = old_name.clone();
},
_ => unreachable!()
};
Ok(None)
} else if self == Begin {
state.mode = Some(PhrasePoolMode::Rename(
state.phrase,
state.model.phrases[state.phrase].read().unwrap().name.clone()
view.mode = Some(PhrasePoolMode::Rename(
view.phrase,
view.model.phrases[view.phrase].read().unwrap().name.clone()
));
Ok(None)
} else {