Dark-Alex-17/managarr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Renamed KeyEventHandler::with to KeyEventHandler::new to keep with Rust best practices and conventions

Browse Source
This commit is contained in:
Alex Clarke
2025-01-18 12:43:25 -07:00
parent 5ead5bc3d6
commit fd35106df8
76 changed files with 1161 additions and 1161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/handlers/radarr_handlers/indexers/edit_indexer_handler.rs
+1 -1
View File
@@ -79,7 +79,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditIndexerHandler<'
EDIT_INDEXER_BLOCKS.contains(&active_block)
}
fn with(
fn new(
key: Key,
app: &'a mut App<'b>,
active_block: ActiveRadarrBlock,
src/handlers/radarr_handlers/indexers/edit_indexer_handler_tests.rs
+66 -66
View File
@@ -29,7 +29,7 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
EditIndexerHandler::with(
EditIndexerHandler::new(
key,
&mut app,
ActiveRadarrBlock::EditIndexerPriorityInput,
@@ -60,7 +60,7 @@ mod tests {
0
);
EditIndexerHandler::with(
EditIndexerHandler::new(
Key::Up,
&mut app,
ActiveRadarrBlock::EditIndexerPriorityInput,
@@ -79,7 +79,7 @@ mod tests {
1
);
EditIndexerHandler::with(
EditIndexerHandler::new(
key,
&mut app,
ActiveRadarrBlock::EditIndexerPriorityInput,
@@ -108,7 +108,7 @@ mod tests {
BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
app.data.radarr_data.selected_block.down();
EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
EditIndexerHandler::new(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
if key == Key::Up {
assert_eq!(
@@ -135,7 +135,7 @@ mod tests {
BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
app.data.radarr_data.selected_block.down();
EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
EditIndexerHandler::new(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
@@ -162,7 +162,7 @@ mod tests {
..EditIndexerModal::default()
});
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.home.key,
&mut app,
ActiveRadarrBlock::EditIndexerNameInput,
@@ -183,7 +183,7 @@ mod tests {
4
);
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.end.key,
&mut app,
ActiveRadarrBlock::EditIndexerNameInput,
@@ -214,7 +214,7 @@ mod tests {
..EditIndexerModal::default()
});
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.home.key,
&mut app,
ActiveRadarrBlock::EditIndexerUrlInput,
@@ -235,7 +235,7 @@ mod tests {
4
);
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.end.key,
&mut app,
ActiveRadarrBlock::EditIndexerUrlInput,
@@ -266,7 +266,7 @@ mod tests {
..EditIndexerModal::default()
});
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.home.key,
&mut app,
ActiveRadarrBlock::EditIndexerApiKeyInput,
@@ -287,7 +287,7 @@ mod tests {
4
);
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.end.key,
&mut app,
ActiveRadarrBlock::EditIndexerApiKeyInput,
@@ -318,7 +318,7 @@ mod tests {
..EditIndexerModal::default()
});
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.home.key,
&mut app,
ActiveRadarrBlock::EditIndexerSeedRatioInput,
@@ -339,7 +339,7 @@ mod tests {
4
);
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.end.key,
&mut app,
ActiveRadarrBlock::EditIndexerSeedRatioInput,
@@ -370,7 +370,7 @@ mod tests {
..EditIndexerModal::default()
});
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.home.key,
&mut app,
ActiveRadarrBlock::EditIndexerTagsInput,
@@ -391,7 +391,7 @@ mod tests {
4
);
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.end.key,
&mut app,
ActiveRadarrBlock::EditIndexerTagsInput,
@@ -436,11 +436,11 @@ mod tests {
BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
app.data.radarr_data.selected_block.y = EDIT_INDEXER_TORRENT_SELECTION_BLOCKS.len() - 1;
EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
EditIndexerHandler::new(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
assert!(app.data.radarr_data.prompt_confirm);
EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
EditIndexerHandler::new(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
assert!(!app.data.radarr_data.prompt_confirm);
}
@@ -483,14 +483,14 @@ mod tests {
left_block
);
EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
EditIndexerHandler::new(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
right_block
);
EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
EditIndexerHandler::new(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
@@ -536,14 +536,14 @@ mod tests {
left_block
);
EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
EditIndexerHandler::new(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
right_block
);
EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
EditIndexerHandler::new(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
@@ -567,14 +567,14 @@ mod tests {
ActiveRadarrBlock::EditIndexerPriorityInput
);
EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
EditIndexerHandler::new(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
ActiveRadarrBlock::EditIndexerConfirmPrompt
);
EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
EditIndexerHandler::new(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
@@ -592,7 +592,7 @@ mod tests {
..EditIndexerModal::default()
});
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.left.key,
&mut app,
ActiveRadarrBlock::EditIndexerNameInput,
@@ -613,7 +613,7 @@ mod tests {
1
);
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.right.key,
&mut app,
ActiveRadarrBlock::EditIndexerNameInput,
@@ -644,7 +644,7 @@ mod tests {
..EditIndexerModal::default()
});
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.left.key,
&mut app,
ActiveRadarrBlock::EditIndexerUrlInput,
@@ -665,7 +665,7 @@ mod tests {
1
);
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.right.key,
&mut app,
ActiveRadarrBlock::EditIndexerUrlInput,
@@ -696,7 +696,7 @@ mod tests {
..EditIndexerModal::default()
});
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.left.key,
&mut app,
ActiveRadarrBlock::EditIndexerApiKeyInput,
@@ -717,7 +717,7 @@ mod tests {
1
);
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.right.key,
&mut app,
ActiveRadarrBlock::EditIndexerApiKeyInput,
@@ -748,7 +748,7 @@ mod tests {
..EditIndexerModal::default()
});
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.left.key,
&mut app,
ActiveRadarrBlock::EditIndexerSeedRatioInput,
@@ -769,7 +769,7 @@ mod tests {
1
);
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.right.key,
&mut app,
ActiveRadarrBlock::EditIndexerSeedRatioInput,
@@ -800,7 +800,7 @@ mod tests {
..EditIndexerModal::default()
});
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.left.key,
&mut app,
ActiveRadarrBlock::EditIndexerTagsInput,
@@ -821,7 +821,7 @@ mod tests {
1
);
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.right.key,
&mut app,
ActiveRadarrBlock::EditIndexerTagsInput,
@@ -873,7 +873,7 @@ mod tests {
.set_index(0, EDIT_INDEXER_TORRENT_SELECTION_BLOCKS.len() - 1);
app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
EditIndexerHandler::with(
EditIndexerHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::EditIndexerPrompt,
@@ -927,7 +927,7 @@ mod tests {
};
app.data.radarr_data.prompt_confirm = true;
EditIndexerHandler::with(
EditIndexerHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::EditIndexerPrompt,
@@ -953,7 +953,7 @@ mod tests {
app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
app.data.radarr_data.prompt_confirm = true;
EditIndexerHandler::with(
EditIndexerHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::EditIndexerPrompt,
@@ -993,7 +993,7 @@ mod tests {
.selected_block
.set_index(starting_x, starting_y);
EditIndexerHandler::with(
EditIndexerHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::EditIndexerPrompt,
@@ -1015,7 +1015,7 @@ mod tests {
BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
app.data.radarr_data.selected_block.set_index(0, 4);
EditIndexerHandler::with(
EditIndexerHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::EditIndexerPrompt,
@@ -1040,7 +1040,7 @@ mod tests {
app.data.radarr_data.selected_block.set_index(0, 1);
app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());
EditIndexerHandler::with(
EditIndexerHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::EditIndexerPrompt,
@@ -1061,7 +1061,7 @@ mod tests {
.enable_rss
.unwrap());
EditIndexerHandler::with(
EditIndexerHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::EditIndexerPrompt,
@@ -1093,7 +1093,7 @@ mod tests {
app.data.radarr_data.selected_block.set_index(0, 2);
app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());
EditIndexerHandler::with(
EditIndexerHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::EditIndexerPrompt,
@@ -1114,7 +1114,7 @@ mod tests {
.enable_automatic_search
.unwrap());
EditIndexerHandler::with(
EditIndexerHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::EditIndexerPrompt,
@@ -1146,7 +1146,7 @@ mod tests {
app.data.radarr_data.selected_block.set_index(0, 3);
app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());
EditIndexerHandler::with(
EditIndexerHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::EditIndexerPrompt,
@@ -1167,7 +1167,7 @@ mod tests {
.enable_interactive_search
.unwrap());
EditIndexerHandler::with(
EditIndexerHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::EditIndexerPrompt,
@@ -1201,7 +1201,7 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());
app.push_navigation_stack(ActiveRadarrBlock::EditIndexerNameInput.into());
EditIndexerHandler::with(
EditIndexerHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::EditIndexerNameInput,
@@ -1237,7 +1237,7 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());
app.push_navigation_stack(ActiveRadarrBlock::EditIndexerUrlInput.into());
EditIndexerHandler::with(
EditIndexerHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::EditIndexerUrlInput,
@@ -1273,7 +1273,7 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());
app.push_navigation_stack(ActiveRadarrBlock::EditIndexerApiKeyInput.into());
EditIndexerHandler::with(
EditIndexerHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::EditIndexerApiKeyInput,
@@ -1309,7 +1309,7 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());
app.push_navigation_stack(ActiveRadarrBlock::EditIndexerSeedRatioInput.into());
EditIndexerHandler::with(
EditIndexerHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::EditIndexerSeedRatioInput,
@@ -1345,7 +1345,7 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());
app.push_navigation_stack(ActiveRadarrBlock::EditIndexerTagsInput.into());
EditIndexerHandler::with(
EditIndexerHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::EditIndexerTagsInput,
@@ -1388,7 +1388,7 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());
app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
EditIndexerHandler::with(
EditIndexerHandler::new(
ESC_KEY,
&mut app,
ActiveRadarrBlock::EditIndexerPrompt,
@@ -1419,7 +1419,7 @@ mod tests {
app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
app.should_ignore_quit_key = true;
EditIndexerHandler::with(ESC_KEY, &mut app, active_radarr_block, None).handle();
EditIndexerHandler::new(ESC_KEY, &mut app, active_radarr_block, None).handle();
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
assert!(!app.should_ignore_quit_key);
@@ -1449,7 +1449,7 @@ mod tests {
..EditIndexerModal::default()
});
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.backspace.key,
&mut app,
ActiveRadarrBlock::EditIndexerNameInput,
@@ -1479,7 +1479,7 @@ mod tests {
..EditIndexerModal::default()
});
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.backspace.key,
&mut app,
ActiveRadarrBlock::EditIndexerUrlInput,
@@ -1509,7 +1509,7 @@ mod tests {
..EditIndexerModal::default()
});
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.backspace.key,
&mut app,
ActiveRadarrBlock::EditIndexerApiKeyInput,
@@ -1539,7 +1539,7 @@ mod tests {
..EditIndexerModal::default()
});
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.backspace.key,
&mut app,
ActiveRadarrBlock::EditIndexerSeedRatioInput,
@@ -1569,7 +1569,7 @@ mod tests {
..EditIndexerModal::default()
});
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.backspace.key,
&mut app,
ActiveRadarrBlock::EditIndexerTagsInput,
@@ -1596,7 +1596,7 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
EditIndexerHandler::with(
EditIndexerHandler::new(
Key::Char('h'),
&mut app,
ActiveRadarrBlock::EditIndexerNameInput,
@@ -1623,7 +1623,7 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
EditIndexerHandler::with(
EditIndexerHandler::new(
Key::Char('h'),
&mut app,
ActiveRadarrBlock::EditIndexerUrlInput,
@@ -1650,7 +1650,7 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
EditIndexerHandler::with(
EditIndexerHandler::new(
Key::Char('h'),
&mut app,
ActiveRadarrBlock::EditIndexerApiKeyInput,
@@ -1677,7 +1677,7 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
EditIndexerHandler::with(
EditIndexerHandler::new(
Key::Char('h'),
&mut app,
ActiveRadarrBlock::EditIndexerSeedRatioInput,
@@ -1704,7 +1704,7 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
EditIndexerHandler::with(
EditIndexerHandler::new(
Key::Char('h'),
&mut app,
ActiveRadarrBlock::EditIndexerTagsInput,
@@ -1764,7 +1764,7 @@ mod tests {
..EditIndexerParams::default()
};
EditIndexerHandler::with(
EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.confirm.key,
&mut app,
ActiveRadarrBlock::EditIndexerPrompt,
@@ -1823,7 +1823,7 @@ mod tests {
..EditIndexerParams::default()
};
let edit_indexer_params = EditIndexerHandler::with(
let edit_indexer_params = EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
ActiveRadarrBlock::EditIndexerPrompt,
@@ -1841,7 +1841,7 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
app.is_loading = true;
let handler = EditIndexerHandler::with(
let handler = EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
ActiveRadarrBlock::EditIndexerPrompt,
@@ -1857,7 +1857,7 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
app.is_loading = false;
let handler = EditIndexerHandler::with(
let handler = EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
ActiveRadarrBlock::EditIndexerPrompt,
@@ -1874,7 +1874,7 @@ mod tests {
app.is_loading = false;
app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
let handler = EditIndexerHandler::with(
let handler = EditIndexerHandler::new(
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
ActiveRadarrBlock::EditIndexerPrompt,
src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler.rs
+1 -1
View File
@@ -33,7 +33,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexerSettingsHandl
INDEXER_SETTINGS_BLOCKS.contains(&active_block)
}
fn with(
fn new(
key: Key,
app: &'a mut App<'b>,
active_block: ActiveRadarrBlock,
src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler_tests.rs
+35 -35
View File
@@ -29,7 +29,7 @@ mod tests {
let mut app = App::default();
app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
IndexerSettingsHandler::with($key, &mut app, $block, None).handle();
IndexerSettingsHandler::new($key, &mut app, $block, None).handle();
if $key == Key::Up {
assert_eq!(
@@ -66,7 +66,7 @@ mod tests {
0
);
IndexerSettingsHandler::with(Key::Up, &mut app, $block, None).handle();
IndexerSettingsHandler::new(Key::Up, &mut app, $block, None).handle();
assert_eq!(
app
@@ -79,7 +79,7 @@ mod tests {
1
);
IndexerSettingsHandler::with($key, &mut app, $block, None).handle();
IndexerSettingsHandler::new($key, &mut app, $block, None).handle();
assert_eq!(
app
.data
@@ -103,7 +103,7 @@ mod tests {
BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS);
app.data.radarr_data.selected_block.down();
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
key,
&mut app,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
@@ -135,7 +135,7 @@ mod tests {
BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS);
app.data.radarr_data.selected_block.down();
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
key,
&mut app,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
@@ -219,7 +219,7 @@ mod tests {
..IndexerSettings::default()
});
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
DEFAULT_KEYBINDINGS.home.key,
&mut app,
ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput,
@@ -240,7 +240,7 @@ mod tests {
4
);
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
DEFAULT_KEYBINDINGS.end.key,
&mut app,
ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput,
@@ -281,7 +281,7 @@ mod tests {
BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS);
app.data.radarr_data.selected_block.y = INDEXER_SETTINGS_SELECTION_BLOCKS.len() - 1;
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
key,
&mut app,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
@@ -291,7 +291,7 @@ mod tests {
assert!(app.data.radarr_data.prompt_confirm);
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
key,
&mut app,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
@@ -339,7 +339,7 @@ mod tests {
left_block
);
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
key,
&mut app,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
@@ -352,7 +352,7 @@ mod tests {
right_block
);
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
key,
&mut app,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
@@ -374,7 +374,7 @@ mod tests {
..IndexerSettings::default()
});
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
DEFAULT_KEYBINDINGS.left.key,
&mut app,
ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput,
@@ -395,7 +395,7 @@ mod tests {
1
);
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
DEFAULT_KEYBINDINGS.right.key,
&mut app,
ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput,
@@ -448,7 +448,7 @@ mod tests {
.set_index(0, INDEXER_SETTINGS_SELECTION_BLOCKS.len() - 1);
app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
@@ -477,7 +477,7 @@ mod tests {
app.data.radarr_data.indexer_settings = Some(indexer_settings());
app.data.radarr_data.prompt_confirm = true;
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
@@ -503,7 +503,7 @@ mod tests {
app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
app.data.radarr_data.prompt_confirm = true;
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
@@ -540,7 +540,7 @@ mod tests {
.selected_block
.set_index(x_index, y_index);
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
@@ -567,7 +567,7 @@ mod tests {
.selected_block
.set_index(index.1, index.0);
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
@@ -590,7 +590,7 @@ mod tests {
BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS);
app.data.radarr_data.selected_block.set_index(1, 2);
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
@@ -614,7 +614,7 @@ mod tests {
app.data.radarr_data.selected_block.set_index(0, 3);
app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
@@ -636,7 +636,7 @@ mod tests {
.prefer_indexer_flags
);
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
@@ -668,7 +668,7 @@ mod tests {
app.data.radarr_data.selected_block.set_index(1, 3);
app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
@@ -690,7 +690,7 @@ mod tests {
.allow_hardcoded_subs
);
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
@@ -726,7 +726,7 @@ mod tests {
ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput.into(),
);
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput,
@@ -766,7 +766,7 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
app.push_navigation_stack(active_radarr_block.into());
IndexerSettingsHandler::with(SUBMIT_KEY, &mut app, active_radarr_block, None).handle();
IndexerSettingsHandler::new(SUBMIT_KEY, &mut app, active_radarr_block, None).handle();
assert_eq!(
app.get_current_route(),
@@ -793,7 +793,7 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
ESC_KEY,
&mut app,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
@@ -816,7 +816,7 @@ mod tests {
app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
app.should_ignore_quit_key = true;
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
ESC_KEY,
&mut app,
ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput,
@@ -849,7 +849,7 @@ mod tests {
app.push_navigation_stack(active_radarr_block.into());
app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
IndexerSettingsHandler::with(ESC_KEY, &mut app, active_radarr_block, None).handle();
IndexerSettingsHandler::new(ESC_KEY, &mut app, active_radarr_block, None).handle();
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
assert_eq!(
@@ -880,7 +880,7 @@ mod tests {
..IndexerSettings::default()
});
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
DEFAULT_KEYBINDINGS.backspace.key,
&mut app,
ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput,
@@ -906,7 +906,7 @@ mod tests {
let mut app = App::default();
app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
Key::Char('h'),
&mut app,
ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput,
@@ -941,7 +941,7 @@ mod tests {
.set_index(0, INDEXER_SETTINGS_SELECTION_BLOCKS.len() - 1);
app.data.radarr_data.indexer_settings = Some(indexer_settings());
IndexerSettingsHandler::with(
IndexerSettingsHandler::new(
DEFAULT_KEYBINDINGS.confirm.key,
&mut app,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
@@ -975,7 +975,7 @@ mod tests {
let mut app = App::default();
app.data.radarr_data.indexer_settings = Some(indexer_settings());
let body = IndexerSettingsHandler::with(
let body = IndexerSettingsHandler::new(
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
@@ -992,7 +992,7 @@ mod tests {
let mut app = App::default();
app.is_loading = true;
let handler = IndexerSettingsHandler::with(
let handler = IndexerSettingsHandler::new(
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
@@ -1007,7 +1007,7 @@ mod tests {
let mut app = App::default();
app.is_loading = false;
let handler = IndexerSettingsHandler::with(
let handler = IndexerSettingsHandler::new(
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
@@ -1023,7 +1023,7 @@ mod tests {
app.is_loading = false;
app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
let handler = IndexerSettingsHandler::with(
let handler = IndexerSettingsHandler::new(
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
src/handlers/radarr_handlers/indexers/indexers_handler_tests.rs
+26 -26
View File
@@ -32,7 +32,7 @@ mod tests {
.indexers
.set_items(vec![Indexer::default()]);
IndexersHandler::with(DELETE_KEY, &mut app, ActiveRadarrBlock::Indexers, None).handle();
IndexersHandler::new(DELETE_KEY, &mut app, ActiveRadarrBlock::Indexers, None).handle();
assert_eq!(
app.get_current_route(),
@@ -51,7 +51,7 @@ mod tests {
.indexers
.set_items(vec![Indexer::default()]);
IndexersHandler::with(DELETE_KEY, &mut app, ActiveRadarrBlock::Indexers, None).handle();
IndexersHandler::new(DELETE_KEY, &mut app, ActiveRadarrBlock::Indexers, None).handle();
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
}
@@ -69,7 +69,7 @@ mod tests {
app.is_loading = is_ready;
app.data.radarr_data.main_tabs.set_index(5);
IndexersHandler::with(
IndexersHandler::new(
DEFAULT_KEYBINDINGS.left.key,
&mut app,
ActiveRadarrBlock::Indexers,
@@ -93,7 +93,7 @@ mod tests {
app.is_loading = is_ready;
app.data.radarr_data.main_tabs.set_index(5);
IndexersHandler::with(
IndexersHandler::new(
DEFAULT_KEYBINDINGS.right.key,
&mut app,
ActiveRadarrBlock::Indexers,
@@ -114,11 +114,11 @@ mod tests {
) {
let mut app = App::default();
IndexersHandler::with(key, &mut app, ActiveRadarrBlock::DeleteIndexerPrompt, None).handle();
IndexersHandler::new(key, &mut app, ActiveRadarrBlock::DeleteIndexerPrompt, None).handle();
assert!(app.data.radarr_data.prompt_confirm);
IndexersHandler::with(key, &mut app, ActiveRadarrBlock::DeleteIndexerPrompt, None).handle();
IndexersHandler::new(key, &mut app, ActiveRadarrBlock::DeleteIndexerPrompt, None).handle();
assert!(!app.data.radarr_data.prompt_confirm);
}
@@ -194,7 +194,7 @@ mod tests {
radarr_data.indexers.set_items(vec![indexer]);
app.data.radarr_data = radarr_data;
IndexersHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::Indexers, None).handle();
IndexersHandler::new(SUBMIT_KEY, &mut app, ActiveRadarrBlock::Indexers, None).handle();
assert_eq!(
app.get_current_route(),
@@ -232,7 +232,7 @@ mod tests {
.indexers
.set_items(vec![Indexer::default()]);
IndexersHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::Indexers, None).handle();
IndexersHandler::new(SUBMIT_KEY, &mut app, ActiveRadarrBlock::Indexers, None).handle();
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
assert_eq!(app.data.radarr_data.edit_indexer_modal, None);
@@ -246,7 +246,7 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
app.push_navigation_stack(ActiveRadarrBlock::DeleteIndexerPrompt.into());
IndexersHandler::with(
IndexersHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::DeleteIndexerPrompt,
@@ -273,7 +273,7 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
app.push_navigation_stack(ActiveRadarrBlock::DeleteIndexerPrompt.into());
IndexersHandler::with(
IndexersHandler::new(
SUBMIT_KEY,
&mut app,
ActiveRadarrBlock::DeleteIndexerPrompt,
@@ -302,7 +302,7 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::DeleteIndexerPrompt.into());
app.data.radarr_data.prompt_confirm = true;
IndexersHandler::with(
IndexersHandler::new(
ESC_KEY,
&mut app,
ActiveRadarrBlock::DeleteIndexerPrompt,
@@ -322,7 +322,7 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
app.push_navigation_stack(ActiveRadarrBlock::TestIndexer.into());
IndexersHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::TestIndexer, None).handle();
IndexersHandler::new(ESC_KEY, &mut app, ActiveRadarrBlock::TestIndexer, None).handle();
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
assert_eq!(app.data.radarr_data.indexer_test_errors, None);
@@ -336,7 +336,7 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
IndexersHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::Indexers, None).handle();
IndexersHandler::new(ESC_KEY, &mut app, ActiveRadarrBlock::Indexers, None).handle();
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
assert!(app.error.text.is_empty());
@@ -363,7 +363,7 @@ mod tests {
.set_items(vec![Indexer::default()]);
app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
IndexersHandler::with(
IndexersHandler::new(
DEFAULT_KEYBINDINGS.refresh.key,
&mut app,
ActiveRadarrBlock::Indexers,
@@ -386,7 +386,7 @@ mod tests {
.set_items(vec![Indexer::default()]);
app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
IndexersHandler::with(
IndexersHandler::new(
DEFAULT_KEYBINDINGS.refresh.key,
&mut app,
ActiveRadarrBlock::Indexers,
@@ -407,7 +407,7 @@ mod tests {
.indexers
.set_items(vec![Indexer::default()]);
IndexersHandler::with(
IndexersHandler::new(
DEFAULT_KEYBINDINGS.settings.key,
&mut app,
ActiveRadarrBlock::Indexers,
@@ -436,7 +436,7 @@ mod tests {
.indexers
.set_items(vec![Indexer::default()]);
IndexersHandler::with(
IndexersHandler::new(
DEFAULT_KEYBINDINGS.settings.key,
&mut app,
ActiveRadarrBlock::Indexers,
@@ -456,7 +456,7 @@ mod tests {
.indexers
.set_items(vec![Indexer::default()]);
IndexersHandler::with(
IndexersHandler::new(
DEFAULT_KEYBINDINGS.test.key,
&mut app,
ActiveRadarrBlock::Indexers,
@@ -481,7 +481,7 @@ mod tests {
.indexers
.set_items(vec![Indexer::default()]);
IndexersHandler::with(
IndexersHandler::new(
DEFAULT_KEYBINDINGS.test.key,
&mut app,
ActiveRadarrBlock::Indexers,
@@ -501,7 +501,7 @@ mod tests {
.indexers
.set_items(vec![Indexer::default()]);
IndexersHandler::with(
IndexersHandler::new(
DEFAULT_KEYBINDINGS.test_all.key,
&mut app,
ActiveRadarrBlock::Indexers,
@@ -526,7 +526,7 @@ mod tests {
.indexers
.set_items(vec![Indexer::default()]);
IndexersHandler::with(
IndexersHandler::new(
DEFAULT_KEYBINDINGS.test_all.key,
&mut app,
ActiveRadarrBlock::Indexers,
@@ -544,7 +544,7 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
app.push_navigation_stack(ActiveRadarrBlock::DeleteIndexerPrompt.into());
IndexersHandler::with(
IndexersHandler::new(
DEFAULT_KEYBINDINGS.confirm.key,
&mut app,
ActiveRadarrBlock::DeleteIndexerPrompt,
@@ -638,7 +638,7 @@ mod tests {
let mut app = App::default();
app.data.radarr_data.indexers.set_items(vec![indexer()]);
let indexer_id = IndexersHandler::with(
let indexer_id = IndexersHandler::new(
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
ActiveRadarrBlock::Indexers,
@@ -654,7 +654,7 @@ mod tests {
let mut app = App::default();
app.is_loading = true;
let handler = IndexersHandler::with(
let handler = IndexersHandler::new(
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
ActiveRadarrBlock::Indexers,
@@ -669,7 +669,7 @@ mod tests {
let mut app = App::default();
app.is_loading = false;
let handler = IndexersHandler::with(
let handler = IndexersHandler::new(
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
ActiveRadarrBlock::Indexers,
@@ -689,7 +689,7 @@ mod tests {
.indexers
.set_items(vec![Indexer::default()]);
let handler = IndexersHandler::with(
let handler = IndexersHandler::new(
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
ActiveRadarrBlock::Indexers,
src/handlers/radarr_handlers/indexers/mod.rs
+4 -4
View File
@@ -47,15 +47,15 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexersHandler<'a,
if !self.handle_indexers_table_events(indexer_table_handling_config) {
match self.active_radarr_block {
_ if EditIndexerHandler::accepts(self.active_radarr_block) => {
EditIndexerHandler::with(self.key, self.app, self.active_radarr_block, self.context)
EditIndexerHandler::new(self.key, self.app, self.active_radarr_block, self.context)
.handle()
}
_ if IndexerSettingsHandler::accepts(self.active_radarr_block) => {
IndexerSettingsHandler::with(self.key, self.app, self.active_radarr_block, self.context)
IndexerSettingsHandler::new(self.key, self.app, self.active_radarr_block, self.context)
.handle()
}
_ if TestAllIndexersHandler::accepts(self.active_radarr_block) => {
TestAllIndexersHandler::with(self.key, self.app, self.active_radarr_block, self.context)
TestAllIndexersHandler::new(self.key, self.app, self.active_radarr_block, self.context)
.handle()
}
_ => self.handle_key_event(),
@@ -70,7 +70,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexersHandler<'a,
|| INDEXERS_BLOCKS.contains(&active_block)
}
fn with(
fn new(
key: Key,
app: &'a mut App<'b>,
active_block: ActiveRadarrBlock,
src/handlers/radarr_handlers/indexers/test_all_indexers_handler.rs
+1 -1
View File
@@ -48,7 +48,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for TestAllIndexersHandl
active_block == ActiveRadarrBlock::TestAllIndexers
}
fn with(
fn new(
key: Key,
app: &'a mut App<'b>,
active_block: ActiveRadarrBlock,
src/handlers/radarr_handlers/indexers/test_all_indexers_handler_tests.rs
+5 -5
View File
@@ -23,7 +23,7 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::TestAllIndexers.into());
app.data.radarr_data.indexer_test_all_results = Some(StatefulTable::default());
TestAllIndexersHandler::with(
TestAllIndexersHandler::new(
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
ActiveRadarrBlock::TestAllIndexers,
@@ -53,7 +53,7 @@ mod tests {
let mut app = App::default();
app.is_loading = true;
let handler = TestAllIndexersHandler::with(
let handler = TestAllIndexersHandler::new(
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
ActiveRadarrBlock::TestAllIndexers,
@@ -68,7 +68,7 @@ mod tests {
let mut app = App::default();
app.is_loading = false;
let handler = TestAllIndexersHandler::with(
let handler = TestAllIndexersHandler::new(
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
ActiveRadarrBlock::TestAllIndexers,
@@ -84,7 +84,7 @@ mod tests {
app.is_loading = false;
app.data.radarr_data.indexer_test_all_results = Some(StatefulTable::default());
let handler = TestAllIndexersHandler::with(
let handler = TestAllIndexersHandler::new(
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
ActiveRadarrBlock::TestAllIndexers,
@@ -102,7 +102,7 @@ mod tests {
indexer_test_results.set_items(vec![IndexerTestResultModalItem::default()]);
app.data.radarr_data.indexer_test_all_results = Some(indexer_test_results);
let handler = TestAllIndexersHandler::with(
let handler = TestAllIndexersHandler::new(
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
ActiveRadarrBlock::TestAllIndexers,