wojtek/musichoard
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects 1 Releases 2 Wiki Activity

Provide search functionality through the TUI #134

Merged
wojtek merged 35 commits from 24---provide-search-functionality-through-the-tui into main 2024-02-18 22:12:42 +01:00
Conversation 0 Commits 35 Files Changed 24 +3 -4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 39e0c7c3f6 - Show all commits

2
src/tui/app/app.rs
View File

@ -288,7 +288,7 @@ impl<MH: IMusicHoard> IAppInteractReloadPrivate for App<MH> {
match result { match result {
Ok(()) => { Ok(()) => {
self.selection self.selection
.select(self.music_hoard.get_collection(), previous); .select_by_id(self.music_hoard.get_collection(), previous);
self.state = AppState::Browse(()) self.state = AppState::Browse(())
} }
Err(err) => self.state = AppState::Error(err.to_string()), Err(err) => self.state = AppState::Error(err.to_string()),

5
src/tui/app/selection.rs
View File

@ -70,8 +70,7 @@ impl Selection {
} }
} }
// FIXME: the name is not suitable in the presence of other `select` methods. pub fn select_by_id(&mut self, artists: &[Artist], selected: ActiveSelection) {
pub fn select(&mut self, artists: &[Artist], selected: ActiveSelection) {
self.artist.reinitialise(artists, selected.artist); self.artist.reinitialise(artists, selected.artist);
} }
@ -85,7 +84,7 @@ impl Selection {
pub fn reset_artist(&mut self, artists: &[Artist]) { pub fn reset_artist(&mut self, artists: &[Artist]) {
if self.artist.state.list.selected() != Some(0) { if self.artist.state.list.selected() != Some(0) {
self.select(artists, ActiveSelection { artist: None }); self.select_by_id(artists, ActiveSelection { artist: None });
} }
} }