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 +13 -16
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5979e75dcd - Show all commits

2
src/tests.rs
View File

@ -243,7 +243,7 @@ macro_rules! library_collection {
name: "The Album_Artist ‘C’".to_string(), name: "The Album_Artist ‘C’".to_string(),
}, },
sort: Some(ArtistId { sort: Some(ArtistId {
name: "Album_Artist ‘C’, The".to_string(), name: "Album_Artist ‘C’, The".to_string(),
}), }),
musicbrainz: None, musicbrainz: None,
properties: HashMap::new(), properties: HashMap::new(),

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

@ -228,17 +228,13 @@ impl ArtistSelection {
// https://wiki.musicbrainz.org/User:Yurim/Punctuation_and_Special_Characters. // https://wiki.musicbrainz.org/User:Yurim/Punctuation_and_Special_Characters.
if asciify { if asciify {
normalized normalized
.replace("‐", "-") // U+2010 hyphen // U+2010 hyphen, U+2012 figure dash, U+2013 en dash, U+2014 em dash,
.replace("‒", "-") // U+2012 figure dash // U+2015 horizontal bar
.replace("–", "-") // U+2013 en dash .replace(['‐', '‒', '–', '—', '―'], "-")
.replace("—", "-") // U+2014 em dash .replace(['‘', '’'], "'") // U+2018, U+2019
.replace("―", "-") // U+2015 horizontal bar .replace(['“', '”'], "\"") // U+201C, U+201D
.replace("‘", "'") // U+2018 .replace('…', "...") // U+2026
.replace("’", "'") // U+2019 .replace('−', "-") // U+2212 minus sign
.replace("“", "\"") // U+201C
.replace("”", "\"") // U+201D
.replace("…", "...") // U+2026
.replace("−", "-") // U+2212 minus sign
} else { } else {
normalized normalized
} }

4
src/tui/handler.rs
View File

@ -150,10 +150,10 @@ impl<APP: IAppInteract> IEventHandlerPrivate<APP> for EventHandler {
match key_event.code { match key_event.code {
KeyCode::Char('s') | KeyCode::Char('S') => { KeyCode::Char('s') | KeyCode::Char('S') => {
app.search_next(); app.search_next();
}, }
KeyCode::Char('g') | KeyCode::Char('G') => { KeyCode::Char('g') | KeyCode::Char('G') => {
app.cancel_search(); app.cancel_search();
}, }
_ => {} _ => {}
} }
return; return;

5
src/tui/ui.rs
View File

@ -378,8 +378,9 @@ impl Minibuffer<'_> {
AppState::Search(ref s) => Minibuffer { AppState::Search(ref s) => Minibuffer {
paragraphs: vec![ paragraphs: vec![
Paragraph::new(format!("I-search: {s}")), Paragraph::new(format!("I-search: {s}")),
Paragraph::new(format!("ctrl+s: search next")).alignment(Alignment::Center), Paragraph::new("ctrl+s: search next".to_string()).alignment(Alignment::Center),
Paragraph::new(format!("ctrl+g: cancel search")).alignment(Alignment::Center), Paragraph::new("ctrl+g: cancel search".to_string())
.alignment(Alignment::Center),
], ],
columns, columns,
}, },