Skip to content

Commit

Permalink
histories.append
Browse files Browse the repository at this point in the history
  • Loading branch information
@kyu08
kyu08 committed Nov 24, 2024
1 parent 156c18e commit 2435fa2
Show file tree
Hide file tree
Showing 2 changed files with 103 additions and 102 deletions.
197 changes: 100 additions & 97 deletions src/model/histories.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,19 @@ pub struct Histories {
}

impl Histories {
// TODO: ut
pub fn append(
&self,
current_dir: PathBuf,
history_of_cwd: Vec<command::Command>,
command: command::Command,
) -> Self {
pub fn append(&self, current_dir: PathBuf, command: command::Command) -> Self {
// Update the command history for the current directory.
let new_history = {
let history_commands: Vec<HistoryCommand> = history_of_cwd
.iter()
.map(|c| HistoryCommand::from(c.clone()))
.collect();
let history = History {
path: current_dir.clone(),
commands: history_commands,
};
history.append(command)
match self.histories.iter().find(|h| h.path == current_dir) {
Some(history) => history.append(command.clone()),
None => History {
path: current_dir,
commands: vec![HistoryCommand::from(command)],
},
}
};

// Update the whole histories.
let mut new_histories = self.histories.clone();
match new_histories
.iter()
Expand Down Expand Up @@ -94,87 +88,96 @@ impl HistoryCommand {

#[cfg(test)]
mod test {
// TODO(#321): comment in this test
// #[test]
// fn histories_append_test() {
// struct Case {
// title: &'static str,
// path: PathBuf,
// appending_target: &'static str,
// histories: Histories,
// expect: Option<Histories>,
// }
// let cases = vec![
// Case {
// title: "Success",
// path: PathBuf::from("/Users/user/code/fzf-make".to_string()),
// appending_target: "history1",
// histories: Histories {
// histories: vec![
// History {
// path: PathBuf::from("/Users/user/code/rustc".to_string()),
// executed_targets: vec!["history0".to_string(), "history1".to_string()],
// },
// History {
// path: PathBuf::from("/Users/user/code/fzf-make".to_string()),
// executed_targets: vec![
// "history0".to_string(),
// "history1".to_string(),
// "history2".to_string(),
// ],
// },
// ],
// },
// expect: Some(Histories {
// histories: vec![
// History {
// path: PathBuf::from("/Users/user/code/rustc".to_string()),
// executed_targets: vec!["history0".to_string(), "history1".to_string()],
// },
// History {
// path: PathBuf::from("/Users/user/code/fzf-make".to_string()),
// executed_targets: vec![
// "history1".to_string(),
// "history0".to_string(),
// "history2".to_string(),
// ],
// },
// ],
// }),
// },
// Case {
// title: "Returns None when path is not found",
// path: PathBuf::from("/Users/user/code/non-existent-dir".to_string()),
// appending_target: "history1",
// histories: Histories {
// histories: vec![
// History {
// path: PathBuf::from("/Users/user/code/rustc".to_string()),
// executed_targets: vec!["history0".to_string(), "history1".to_string()],
// },
// History {
// path: PathBuf::from("/Users/user/code/fzf-make".to_string()),
// executed_targets: vec![
// "history0".to_string(),
// "history1".to_string(),
// "history2".to_string(),
// ],
// },
// ],
// },
// expect: None,
// },
// ];
//
// for case in cases {
// assert_eq!(
// case.expect,
// case.histories.append(&case.path, case.appending_target),
// "\nFailed: 🚨{:?}🚨\n",
// case.title,
// )
// }
// }
use super::*;
use pretty_assertions::assert_eq;
use std::path::PathBuf;

#[test]
fn histories_append_test() {
struct Case {
title: &'static str,
histories: Histories,
command_to_append: command::Command,
expect: Histories,
}

let path_to_append = PathBuf::from("/Users/user/code/fzf-make".to_string());
let cases = vec![
Case {
title: "The command executed is appended to the existing history if there is history for cwd.",
histories: Histories {
histories: vec![
History {
path: PathBuf::from("/Users/user/code/rustc".to_string()),
commands: vec![
HistoryCommand{ runner_type: runner_type::RunnerType::Make, name: "history0".to_string() }]
},
History {
path: path_to_append.clone(),
commands: vec![
HistoryCommand{ runner_type: runner_type::RunnerType::Make, name: "history0".to_string() }]
},
],
},
command_to_append: command::Command{ runner_type: runner_type::RunnerType::Make, name: "append".to_string(), file_name: PathBuf::from("Makefile"), line_number: 1 },
expect: Histories {
histories: vec![
History {
path: PathBuf::from("/Users/user/code/rustc".to_string()),
commands: vec![
HistoryCommand{ runner_type: runner_type::RunnerType::Make, name: "history0".to_string() }]
},
History {
path: path_to_append.clone(),
commands: vec![
HistoryCommand{ runner_type: runner_type::RunnerType::Make, name: "append".to_string() },
HistoryCommand{ runner_type: runner_type::RunnerType::Make, name: "history0".to_string() },
]
},
],
},
},
Case {
title: "A new history is appended if there is no history for cwd.",
histories: Histories {
histories: vec![
History {
path: PathBuf::from("/Users/user/code/rustc".to_string()),
commands: vec![
HistoryCommand{ runner_type: runner_type::RunnerType::Make, name: "history0".to_string() }]
},
],
},
command_to_append: command::Command{ runner_type: runner_type::RunnerType::Make, name: "append".to_string(), file_name: PathBuf::from("Makefile"), line_number: 1 },
expect: Histories {
histories: vec![
History {
path: path_to_append.clone(),
commands: vec![
HistoryCommand{ runner_type: runner_type::RunnerType::Make, name: "append".to_string() },
]
},
History {
path: PathBuf::from("/Users/user/code/rustc".to_string()),
commands: vec![
HistoryCommand{ runner_type: runner_type::RunnerType::Make, name: "history0".to_string() }]
},
],
},
},
];

for case in cases {
assert_eq!(
case.expect,
case.histories
.append(path_to_append.clone(), case.command_to_append),
"\nFailed: 🚨{:?}🚨\n",
case.title,
)
}
}

// TODO(#321): comment in this test
// #[test]
// fn history_append_test() {
Expand Down
8 changes: 3 additions & 5 deletions src/usecase/tui/app.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -539,11 +539,9 @@ impl SelectTargetState<'_> {
// Because self.histories_list_state.selected keeps the selected index of the history list
// before update.
if let Some((dir, file_name)) = toml::history_file_path() {
let all_histories = toml::Histories::get_history().into().append(
self.current_dir.clone(),
self.history.clone(),
command,
);
let all_histories = toml::Histories::get_history()
.into()
.append(self.current_dir.clone(), command);

// TODO: handle error
let _ = toml::store_history(dir, file_name, all_histories);
Expand Down

0 comments on commit 2435fa2

Please sign in to comment.