refactor: Renamed KeyEventHandler::with to KeyEventHandler::new to keep with Rust best practices and conventions
This commit is contained in:
@@ -70,7 +70,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for RootFoldersHandler<'
|
||||
ROOT_FOLDERS_BLOCKS.contains(&active_block)
|
||||
}
|
||||
|
||||
fn with(
|
||||
fn new(
|
||||
key: Key,
|
||||
app: &'a mut App<'b>,
|
||||
active_block: ActiveRadarrBlock,
|
||||
|
||||
@@ -30,7 +30,7 @@ mod tests {
|
||||
.set_items(vec![RootFolder::default()]);
|
||||
app.data.radarr_data.edit_root_folder = Some("Test".into());
|
||||
|
||||
RootFoldersHandler::with(
|
||||
RootFoldersHandler::new(
|
||||
DEFAULT_KEYBINDINGS.home.key,
|
||||
&mut app,
|
||||
ActiveRadarrBlock::AddRootFolderPrompt,
|
||||
@@ -50,7 +50,7 @@ mod tests {
|
||||
4
|
||||
);
|
||||
|
||||
RootFoldersHandler::with(
|
||||
RootFoldersHandler::new(
|
||||
DEFAULT_KEYBINDINGS.end.key,
|
||||
&mut app,
|
||||
ActiveRadarrBlock::AddRootFolderPrompt,
|
||||
@@ -88,7 +88,7 @@ mod tests {
|
||||
.root_folders
|
||||
.set_items(vec![RootFolder::default()]);
|
||||
|
||||
RootFoldersHandler::with(DELETE_KEY, &mut app, ActiveRadarrBlock::RootFolders, None).handle();
|
||||
RootFoldersHandler::new(DELETE_KEY, &mut app, ActiveRadarrBlock::RootFolders, None).handle();
|
||||
|
||||
assert_eq!(
|
||||
app.get_current_route(),
|
||||
@@ -107,7 +107,7 @@ mod tests {
|
||||
.root_folders
|
||||
.set_items(vec![RootFolder::default()]);
|
||||
|
||||
RootFoldersHandler::with(DELETE_KEY, &mut app, ActiveRadarrBlock::RootFolders, None).handle();
|
||||
RootFoldersHandler::new(DELETE_KEY, &mut app, ActiveRadarrBlock::RootFolders, None).handle();
|
||||
|
||||
assert_eq!(
|
||||
app.get_current_route(),
|
||||
@@ -130,7 +130,7 @@ mod tests {
|
||||
app.is_loading = is_ready;
|
||||
app.data.radarr_data.main_tabs.set_index(4);
|
||||
|
||||
RootFoldersHandler::with(
|
||||
RootFoldersHandler::new(
|
||||
DEFAULT_KEYBINDINGS.left.key,
|
||||
&mut app,
|
||||
ActiveRadarrBlock::RootFolders,
|
||||
@@ -151,7 +151,7 @@ mod tests {
|
||||
app.is_loading = is_ready;
|
||||
app.data.radarr_data.main_tabs.set_index(4);
|
||||
|
||||
RootFoldersHandler::with(
|
||||
RootFoldersHandler::new(
|
||||
DEFAULT_KEYBINDINGS.right.key,
|
||||
&mut app,
|
||||
ActiveRadarrBlock::RootFolders,
|
||||
@@ -172,7 +172,7 @@ mod tests {
|
||||
) {
|
||||
let mut app = App::default();
|
||||
|
||||
RootFoldersHandler::with(
|
||||
RootFoldersHandler::new(
|
||||
key,
|
||||
&mut app,
|
||||
ActiveRadarrBlock::DeleteRootFolderPrompt,
|
||||
@@ -182,7 +182,7 @@ mod tests {
|
||||
|
||||
assert!(app.data.radarr_data.prompt_confirm);
|
||||
|
||||
RootFoldersHandler::with(
|
||||
RootFoldersHandler::new(
|
||||
key,
|
||||
&mut app,
|
||||
ActiveRadarrBlock::DeleteRootFolderPrompt,
|
||||
@@ -198,7 +198,7 @@ mod tests {
|
||||
let mut app = App::default();
|
||||
app.data.radarr_data.edit_root_folder = Some("Test".into());
|
||||
|
||||
RootFoldersHandler::with(
|
||||
RootFoldersHandler::new(
|
||||
DEFAULT_KEYBINDINGS.left.key,
|
||||
&mut app,
|
||||
ActiveRadarrBlock::AddRootFolderPrompt,
|
||||
@@ -218,7 +218,7 @@ mod tests {
|
||||
1
|
||||
);
|
||||
|
||||
RootFoldersHandler::with(
|
||||
RootFoldersHandler::new(
|
||||
DEFAULT_KEYBINDINGS.right.key,
|
||||
&mut app,
|
||||
ActiveRadarrBlock::AddRootFolderPrompt,
|
||||
@@ -266,7 +266,7 @@ mod tests {
|
||||
app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into());
|
||||
app.push_navigation_stack(ActiveRadarrBlock::AddRootFolderPrompt.into());
|
||||
|
||||
RootFoldersHandler::with(
|
||||
RootFoldersHandler::new(
|
||||
SUBMIT_KEY,
|
||||
&mut app,
|
||||
ActiveRadarrBlock::AddRootFolderPrompt,
|
||||
@@ -295,7 +295,7 @@ mod tests {
|
||||
app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into());
|
||||
app.push_navigation_stack(ActiveRadarrBlock::AddRootFolderPrompt.into());
|
||||
|
||||
RootFoldersHandler::with(
|
||||
RootFoldersHandler::new(
|
||||
SUBMIT_KEY,
|
||||
&mut app,
|
||||
ActiveRadarrBlock::AddRootFolderPrompt,
|
||||
@@ -324,7 +324,7 @@ mod tests {
|
||||
app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into());
|
||||
app.push_navigation_stack(ActiveRadarrBlock::DeleteRootFolderPrompt.into());
|
||||
|
||||
RootFoldersHandler::with(
|
||||
RootFoldersHandler::new(
|
||||
SUBMIT_KEY,
|
||||
&mut app,
|
||||
ActiveRadarrBlock::DeleteRootFolderPrompt,
|
||||
@@ -354,7 +354,7 @@ mod tests {
|
||||
app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into());
|
||||
app.push_navigation_stack(ActiveRadarrBlock::DeleteRootFolderPrompt.into());
|
||||
|
||||
RootFoldersHandler::with(
|
||||
RootFoldersHandler::new(
|
||||
SUBMIT_KEY,
|
||||
&mut app,
|
||||
ActiveRadarrBlock::DeleteRootFolderPrompt,
|
||||
@@ -385,7 +385,7 @@ mod tests {
|
||||
app.push_navigation_stack(ActiveRadarrBlock::DeleteRootFolderPrompt.into());
|
||||
app.data.radarr_data.prompt_confirm = true;
|
||||
|
||||
RootFoldersHandler::with(
|
||||
RootFoldersHandler::new(
|
||||
ESC_KEY,
|
||||
&mut app,
|
||||
ActiveRadarrBlock::DeleteRootFolderPrompt,
|
||||
@@ -408,7 +408,7 @@ mod tests {
|
||||
app.data.radarr_data.edit_root_folder = Some("/nfs/test".into());
|
||||
app.should_ignore_quit_key = true;
|
||||
|
||||
RootFoldersHandler::with(
|
||||
RootFoldersHandler::new(
|
||||
ESC_KEY,
|
||||
&mut app,
|
||||
ActiveRadarrBlock::AddRootFolderPrompt,
|
||||
@@ -434,7 +434,7 @@ mod tests {
|
||||
app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into());
|
||||
app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into());
|
||||
|
||||
RootFoldersHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::RootFolders, None).handle();
|
||||
RootFoldersHandler::new(ESC_KEY, &mut app, ActiveRadarrBlock::RootFolders, None).handle();
|
||||
|
||||
assert_eq!(
|
||||
app.get_current_route(),
|
||||
@@ -460,7 +460,7 @@ mod tests {
|
||||
.root_folders
|
||||
.set_items(vec![RootFolder::default()]);
|
||||
|
||||
RootFoldersHandler::with(
|
||||
RootFoldersHandler::new(
|
||||
DEFAULT_KEYBINDINGS.add.key,
|
||||
&mut app,
|
||||
ActiveRadarrBlock::RootFolders,
|
||||
@@ -487,7 +487,7 @@ mod tests {
|
||||
.root_folders
|
||||
.set_items(vec![RootFolder::default()]);
|
||||
|
||||
RootFoldersHandler::with(
|
||||
RootFoldersHandler::new(
|
||||
DEFAULT_KEYBINDINGS.add.key,
|
||||
&mut app,
|
||||
ActiveRadarrBlock::RootFolders,
|
||||
@@ -513,7 +513,7 @@ mod tests {
|
||||
.set_items(vec![RootFolder::default()]);
|
||||
app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into());
|
||||
|
||||
RootFoldersHandler::with(
|
||||
RootFoldersHandler::new(
|
||||
DEFAULT_KEYBINDINGS.refresh.key,
|
||||
&mut app,
|
||||
ActiveRadarrBlock::RootFolders,
|
||||
@@ -539,7 +539,7 @@ mod tests {
|
||||
.set_items(vec![RootFolder::default()]);
|
||||
app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into());
|
||||
|
||||
RootFoldersHandler::with(
|
||||
RootFoldersHandler::new(
|
||||
DEFAULT_KEYBINDINGS.refresh.key,
|
||||
&mut app,
|
||||
ActiveRadarrBlock::RootFolders,
|
||||
@@ -564,7 +564,7 @@ mod tests {
|
||||
.set_items(vec![RootFolder::default()]);
|
||||
app.data.radarr_data.edit_root_folder = Some("/nfs/test".into());
|
||||
|
||||
RootFoldersHandler::with(
|
||||
RootFoldersHandler::new(
|
||||
DEFAULT_KEYBINDINGS.backspace.key,
|
||||
&mut app,
|
||||
ActiveRadarrBlock::AddRootFolderPrompt,
|
||||
@@ -588,7 +588,7 @@ mod tests {
|
||||
.set_items(vec![RootFolder::default()]);
|
||||
app.data.radarr_data.edit_root_folder = Some(HorizontallyScrollableText::default());
|
||||
|
||||
RootFoldersHandler::with(
|
||||
RootFoldersHandler::new(
|
||||
Key::Char('h'),
|
||||
&mut app,
|
||||
ActiveRadarrBlock::AddRootFolderPrompt,
|
||||
@@ -613,7 +613,7 @@ mod tests {
|
||||
app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into());
|
||||
app.push_navigation_stack(ActiveRadarrBlock::DeleteRootFolderPrompt.into());
|
||||
|
||||
RootFoldersHandler::with(
|
||||
RootFoldersHandler::new(
|
||||
DEFAULT_KEYBINDINGS.confirm.key,
|
||||
&mut app,
|
||||
ActiveRadarrBlock::DeleteRootFolderPrompt,
|
||||
@@ -652,7 +652,7 @@ mod tests {
|
||||
path: "/nfs/test".to_owned(),
|
||||
};
|
||||
|
||||
let actual_add_root_folder_body = RootFoldersHandler::with(
|
||||
let actual_add_root_folder_body = RootFoldersHandler::new(
|
||||
DEFAULT_KEYBINDINGS.esc.key,
|
||||
&mut app,
|
||||
ActiveRadarrBlock::RootFolders,
|
||||
@@ -673,7 +673,7 @@ mod tests {
|
||||
.root_folders
|
||||
.set_items(vec![root_folder()]);
|
||||
|
||||
let root_folder_id = RootFoldersHandler::with(
|
||||
let root_folder_id = RootFoldersHandler::new(
|
||||
DEFAULT_KEYBINDINGS.esc.key,
|
||||
&mut app,
|
||||
ActiveRadarrBlock::RootFolders,
|
||||
@@ -689,7 +689,7 @@ mod tests {
|
||||
let mut app = App::default();
|
||||
app.is_loading = true;
|
||||
|
||||
let handler = RootFoldersHandler::with(
|
||||
let handler = RootFoldersHandler::new(
|
||||
DEFAULT_KEYBINDINGS.esc.key,
|
||||
&mut app,
|
||||
ActiveRadarrBlock::RootFolders,
|
||||
@@ -704,7 +704,7 @@ mod tests {
|
||||
let mut app = App::default();
|
||||
app.is_loading = false;
|
||||
|
||||
let handler = RootFoldersHandler::with(
|
||||
let handler = RootFoldersHandler::new(
|
||||
DEFAULT_KEYBINDINGS.esc.key,
|
||||
&mut app,
|
||||
ActiveRadarrBlock::RootFolders,
|
||||
@@ -724,7 +724,7 @@ mod tests {
|
||||
.radarr_data
|
||||
.root_folders
|
||||
.set_items(vec![RootFolder::default()]);
|
||||
let handler = RootFoldersHandler::with(
|
||||
let handler = RootFoldersHandler::new(
|
||||
DEFAULT_KEYBINDINGS.esc.key,
|
||||
&mut app,
|
||||
ActiveRadarrBlock::RootFolders,
|
||||
|
||||
Reference in New Issue
Block a user