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 +291 -89
6 changed files with 291 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b34cc9c662 - Show all commits

10
src/core/database/json/testmod.rs
View File

@ -2,7 +2,7 @@ pub static DATABASE_JSON: &str = "{\
\"V20240210\":\ \"V20240210\":\
[\ [\
{\ {\
\"name\":\"Album_Artist A\",\ \"name\":\"Album_Artist ‘A’\",\
\"sort\":null,\ \"sort\":null,\
\"musicbrainz\":\"https://musicbrainz.org/artist/00000000-0000-0000-0000-000000000000\",\ \"musicbrainz\":\"https://musicbrainz.org/artist/00000000-0000-0000-0000-000000000000\",\
\"properties\":{\ \"properties\":{\
@ -11,7 +11,7 @@ pub static DATABASE_JSON: &str = "{\
}\ }\
},\ },\
{\ {\
\"name\":\"Album_Artist B\",\ \"name\":\"Album_Artist ‘B’\",\
\"sort\":null,\ \"sort\":null,\
\"musicbrainz\":\"https://musicbrainz.org/artist/11111111-1111-1111-1111-111111111111\",\ \"musicbrainz\":\"https://musicbrainz.org/artist/11111111-1111-1111-1111-111111111111\",\
\"properties\":{\ \"properties\":{\
@ -24,13 +24,13 @@ pub static DATABASE_JSON: &str = "{\
}\ }\
},\ },\
{\ {\
\"name\":\"Album_Artist C\",\ \"name\":\"The Album_Artist ‘C’\",\
\"sort\":null,\ \"sort\":\"Album_Artist ‘C’, The\",\
\"musicbrainz\":\"https://musicbrainz.org/artist/11111111-1111-1111-1111-111111111111\",\ \"musicbrainz\":\"https://musicbrainz.org/artist/11111111-1111-1111-1111-111111111111\",\
\"properties\":{}\ \"properties\":{}\
},\ },\
{\ {\
\"name\":\"Album_Artist D\",\ \"name\":\"Album_Artist ‘D’\",\
\"sort\":null,\ \"sort\":null,\
\"musicbrainz\":null,\ \"musicbrainz\":null,\
\"properties\":{}\ \"properties\":{}\

44
src/core/library/beets/testmod.rs
View File

@ -2,27 +2,27 @@ use once_cell::sync::Lazy;
pub static LIBRARY_BEETS: Lazy<Vec<String>> = Lazy::new(|| -> Vec<String> { pub static LIBRARY_BEETS: Lazy<Vec<String>> = Lazy::new(|| -> Vec<String> {
vec![ vec![
String::from("Album_Artist A -*^- -*^- 1998 -*^- album_title a.a -*^- 1 -*^- track a.a.1 -*^- artist a.a.1 -*^- FLAC -*^- 992"), String::from("Album_Artist ‘A’ -*^- -*^- 1998 -*^- album_title a.a -*^- 1 -*^- track a.a.1 -*^- artist a.a.1 -*^- FLAC -*^- 992"),
String::from("Album_Artist A -*^- -*^- 1998 -*^- album_title a.a -*^- 2 -*^- track a.a.2 -*^- artist a.a.2.1; artist a.a.2.2 -*^- MP3 -*^- 320"), String::from("Album_Artist ‘A’ -*^- -*^- 1998 -*^- album_title a.a -*^- 2 -*^- track a.a.2 -*^- artist a.a.2.1; artist a.a.2.2 -*^- MP3 -*^- 320"),
String::from("Album_Artist A -*^- -*^- 1998 -*^- album_title a.a -*^- 3 -*^- track a.a.3 -*^- artist a.a.3 -*^- FLAC -*^- 1061"), String::from("Album_Artist ‘A’ -*^- -*^- 1998 -*^- album_title a.a -*^- 3 -*^- track a.a.3 -*^- artist a.a.3 -*^- FLAC -*^- 1061"),
String::from("Album_Artist A -*^- -*^- 1998 -*^- album_title a.a -*^- 4 -*^- track a.a.4 -*^- artist a.a.4 -*^- FLAC -*^- 1042"), String::from("Album_Artist ‘A’ -*^- -*^- 1998 -*^- album_title a.a -*^- 4 -*^- track a.a.4 -*^- artist a.a.4 -*^- FLAC -*^- 1042"),
String::from("Album_Artist A -*^- -*^- 2015 -*^- album_title a.b -*^- 1 -*^- track a.b.1 -*^- artist a.b.1 -*^- FLAC -*^- 1004"), String::from("Album_Artist ‘A’ -*^- -*^- 2015 -*^- album_title a.b -*^- 1 -*^- track a.b.1 -*^- artist a.b.1 -*^- FLAC -*^- 1004"),
String::from("Album_Artist A -*^- -*^- 2015 -*^- album_title a.b -*^- 2 -*^- track a.b.2 -*^- artist a.b.2 -*^- FLAC -*^- 1077"), String::from("Album_Artist ‘A’ -*^- -*^- 2015 -*^- album_title a.b -*^- 2 -*^- track a.b.2 -*^- artist a.b.2 -*^- FLAC -*^- 1077"),
String::from("Album_Artist B -*^- -*^- 2003 -*^- album_title b.a -*^- 1 -*^- track b.a.1 -*^- artist b.a.1 -*^- MP3 -*^- 190"), String::from("Album_Artist ‘B’ -*^- -*^- 2003 -*^- album_title b.a -*^- 1 -*^- track b.a.1 -*^- artist b.a.1 -*^- MP3 -*^- 190"),
String::from("Album_Artist B -*^- -*^- 2003 -*^- album_title b.a -*^- 2 -*^- track b.a.2 -*^- artist b.a.2.1; artist b.a.2.2 -*^- MP3 -*^- 120"), String::from("Album_Artist ‘B’ -*^- -*^- 2003 -*^- album_title b.a -*^- 2 -*^- track b.a.2 -*^- artist b.a.2.1; artist b.a.2.2 -*^- MP3 -*^- 120"),
String::from("Album_Artist B -*^- -*^- 2008 -*^- album_title b.b -*^- 1 -*^- track b.b.1 -*^- artist b.b.1 -*^- FLAC -*^- 1077"), String::from("Album_Artist ‘B’ -*^- -*^- 2008 -*^- album_title b.b -*^- 1 -*^- track b.b.1 -*^- artist b.b.1 -*^- FLAC -*^- 1077"),
String::from("Album_Artist B -*^- -*^- 2008 -*^- album_title b.b -*^- 2 -*^- track b.b.2 -*^- artist b.b.2.1; artist b.b.2.2 -*^- MP3 -*^- 320"), String::from("Album_Artist ‘B’ -*^- -*^- 2008 -*^- album_title b.b -*^- 2 -*^- track b.b.2 -*^- artist b.b.2.1; artist b.b.2.2 -*^- MP3 -*^- 320"),
String::from("Album_Artist B -*^- -*^- 2009 -*^- album_title b.c -*^- 1 -*^- track b.c.1 -*^- artist b.c.1 -*^- MP3 -*^- 190"), String::from("Album_Artist ‘B’ -*^- -*^- 2009 -*^- album_title b.c -*^- 1 -*^- track b.c.1 -*^- artist b.c.1 -*^- MP3 -*^- 190"),
String::from("Album_Artist B -*^- -*^- 2009 -*^- album_title b.c -*^- 2 -*^- track b.c.2 -*^- artist b.c.2.1; artist b.c.2.2 -*^- MP3 -*^- 120"), String::from("Album_Artist ‘B’ -*^- -*^- 2009 -*^- album_title b.c -*^- 2 -*^- track b.c.2 -*^- artist b.c.2.1; artist b.c.2.2 -*^- MP3 -*^- 120"),
String::from("Album_Artist B -*^- -*^- 2015 -*^- album_title b.d -*^- 1 -*^- track b.d.1 -*^- artist b.d.1 -*^- MP3 -*^- 190"), String::from("Album_Artist ‘B’ -*^- -*^- 2015 -*^- album_title b.d -*^- 1 -*^- track b.d.1 -*^- artist b.d.1 -*^- MP3 -*^- 190"),
String::from("Album_Artist B -*^- -*^- 2015 -*^- album_title b.d -*^- 2 -*^- track b.d.2 -*^- artist b.d.2.1; artist b.d.2.2 -*^- MP3 -*^- 120"), String::from("Album_Artist ‘B’ -*^- -*^- 2015 -*^- album_title b.d -*^- 2 -*^- track b.d.2 -*^- artist b.d.2.1; artist b.d.2.2 -*^- MP3 -*^- 120"),
String::from("Album_Artist C -*^- -*^- 1985 -*^- album_title c.a -*^- 1 -*^- track c.a.1 -*^- artist c.a.1 -*^- MP3 -*^- 320"), String::from("The Album_Artist ‘C’ -*^- Album_Artist ‘C’, The -*^- 1985 -*^- album_title c.a -*^- 1 -*^- track c.a.1 -*^- artist c.a.1 -*^- MP3 -*^- 320"),
String::from("Album_Artist C -*^- -*^- 1985 -*^- album_title c.a -*^- 2 -*^- track c.a.2 -*^- artist c.a.2.1; artist c.a.2.2 -*^- MP3 -*^- 120"), String::from("The Album_Artist ‘C’ -*^- Album_Artist ‘C’, The -*^- 1985 -*^- album_title c.a -*^- 2 -*^- track c.a.2 -*^- artist c.a.2.1; artist c.a.2.2 -*^- MP3 -*^- 120"),
String::from("Album_Artist C -*^- -*^- 2018 -*^- album_title c.b -*^- 1 -*^- track c.b.1 -*^- artist c.b.1 -*^- FLAC -*^- 1041"), String::from("The Album_Artist ‘C’ -*^- Album_Artist ‘C’, The -*^- 2018 -*^- album_title c.b -*^- 1 -*^- track c.b.1 -*^- artist c.b.1 -*^- FLAC -*^- 1041"),
String::from("Album_Artist C -*^- -*^- 2018 -*^- album_title c.b -*^- 2 -*^- track c.b.2 -*^- artist c.b.2.1; artist c.b.2.2 -*^- FLAC -*^- 756"), String::from("The Album_Artist ‘C’ -*^- Album_Artist ‘C’, The -*^- 2018 -*^- album_title c.b -*^- 2 -*^- track c.b.2 -*^- artist c.b.2.1; artist c.b.2.2 -*^- FLAC -*^- 756"),
String::from("Album_Artist D -*^- -*^- 1995 -*^- album_title d.a -*^- 1 -*^- track d.a.1 -*^- artist d.a.1 -*^- MP3 -*^- 120"), String::from("Album_Artist ‘D’ -*^- -*^- 1995 -*^- album_title d.a -*^- 1 -*^- track d.a.1 -*^- artist d.a.1 -*^- MP3 -*^- 120"),
String::from("Album_Artist D -*^- -*^- 1995 -*^- album_title d.a -*^- 2 -*^- track d.a.2 -*^- artist d.a.2.1; artist d.a.2.2 -*^- MP3 -*^- 120"), String::from("Album_Artist ‘D’ -*^- -*^- 1995 -*^- album_title d.a -*^- 2 -*^- track d.a.2 -*^- artist d.a.2.1; artist d.a.2.2 -*^- MP3 -*^- 120"),
String::from("Album_Artist D -*^- -*^- 2028 -*^- album_title d.b -*^- 1 -*^- track d.b.1 -*^- artist d.b.1 -*^- FLAC -*^- 841"), String::from("Album_Artist ‘D’ -*^- -*^- 2028 -*^- album_title d.b -*^- 1 -*^- track d.b.1 -*^- artist d.b.1 -*^- FLAC -*^- 841"),
String::from("Album_Artist D -*^- -*^- 2028 -*^- album_title d.b -*^- 2 -*^- track d.b.2 -*^- artist d.b.2.1; artist d.b.2.2 -*^- FLAC -*^- 756") String::from("Album_Artist ‘D’ -*^- -*^- 2028 -*^- album_title d.b -*^- 2 -*^- track d.b.2 -*^- artist d.b.2.1; artist d.b.2.2 -*^- FLAC -*^- 756")
] ]
}); });

52
src/core/library/testmod.rs
View File

@ -5,7 +5,7 @@ use crate::core::{collection::track::Format, library::Item};
pub static LIBRARY_ITEMS: Lazy<Vec<Item>> = Lazy::new(|| -> Vec<Item> { pub static LIBRARY_ITEMS: Lazy<Vec<Item>> = Lazy::new(|| -> Vec<Item> {
vec![ vec![
Item { Item {
album_artist: String::from("Album_Artist A"), album_artist: String::from("Album_Artist ‘A’"),
album_artist_sort: None, album_artist_sort: None,
album_year: 1998, album_year: 1998,
album_title: String::from("album_title a.a"), album_title: String::from("album_title a.a"),
@ -16,7 +16,7 @@ pub static LIBRARY_ITEMS: Lazy<Vec<Item>> = Lazy::new(|| -> Vec<Item> {
track_bitrate: 992, track_bitrate: 992,
}, },
Item { Item {
album_artist: String::from("Album_Artist A"), album_artist: String::from("Album_Artist ‘A’"),
album_artist_sort: None, album_artist_sort: None,
album_year: 1998, album_year: 1998,
album_title: String::from("album_title a.a"), album_title: String::from("album_title a.a"),
@ -30,7 +30,7 @@ pub static LIBRARY_ITEMS: Lazy<Vec<Item>> = Lazy::new(|| -> Vec<Item> {
track_bitrate: 320, track_bitrate: 320,
}, },
Item { Item {
album_artist: String::from("Album_Artist A"), album_artist: String::from("Album_Artist ‘A’"),
album_artist_sort: None, album_artist_sort: None,
album_year: 1998, album_year: 1998,
album_title: String::from("album_title a.a"), album_title: String::from("album_title a.a"),
@ -41,7 +41,7 @@ pub static LIBRARY_ITEMS: Lazy<Vec<Item>> = Lazy::new(|| -> Vec<Item> {
track_bitrate: 1061, track_bitrate: 1061,
}, },
Item { Item {
album_artist: String::from("Album_Artist A"), album_artist: String::from("Album_Artist ‘A’"),
album_artist_sort: None, album_artist_sort: None,
album_year: 1998, album_year: 1998,
album_title: String::from("album_title a.a"), album_title: String::from("album_title a.a"),
@ -52,7 +52,7 @@ pub static LIBRARY_ITEMS: Lazy<Vec<Item>> = Lazy::new(|| -> Vec<Item> {
track_bitrate: 1042, track_bitrate: 1042,
}, },
Item { Item {
album_artist: String::from("Album_Artist A"), album_artist: String::from("Album_Artist ‘A’"),
album_artist_sort: None, album_artist_sort: None,
album_year: 2015, album_year: 2015,
album_title: String::from("album_title a.b"), album_title: String::from("album_title a.b"),
@ -63,7 +63,7 @@ pub static LIBRARY_ITEMS: Lazy<Vec<Item>> = Lazy::new(|| -> Vec<Item> {
track_bitrate: 1004, track_bitrate: 1004,
}, },
Item { Item {
album_artist: String::from("Album_Artist A"), album_artist: String::from("Album_Artist ‘A’"),
album_artist_sort: None, album_artist_sort: None,
album_year: 2015, album_year: 2015,
album_title: String::from("album_title a.b"), album_title: String::from("album_title a.b"),
@ -74,7 +74,7 @@ pub static LIBRARY_ITEMS: Lazy<Vec<Item>> = Lazy::new(|| -> Vec<Item> {
track_bitrate: 1077, track_bitrate: 1077,
}, },
Item { Item {
album_artist: String::from("Album_Artist B"), album_artist: String::from("Album_Artist ‘B’"),
album_artist_sort: None, album_artist_sort: None,
album_year: 2003, album_year: 2003,
album_title: String::from("album_title b.a"), album_title: String::from("album_title b.a"),
@ -85,7 +85,7 @@ pub static LIBRARY_ITEMS: Lazy<Vec<Item>> = Lazy::new(|| -> Vec<Item> {
track_bitrate: 190, track_bitrate: 190,
}, },
Item { Item {
album_artist: String::from("Album_Artist B"), album_artist: String::from("Album_Artist ‘B’"),
album_artist_sort: None, album_artist_sort: None,
album_year: 2003, album_year: 2003,
album_title: String::from("album_title b.a"), album_title: String::from("album_title b.a"),
@ -99,7 +99,7 @@ pub static LIBRARY_ITEMS: Lazy<Vec<Item>> = Lazy::new(|| -> Vec<Item> {
track_bitrate: 120, track_bitrate: 120,
}, },
Item { Item {
album_artist: String::from("Album_Artist B"), album_artist: String::from("Album_Artist ‘B’"),
album_artist_sort: None, album_artist_sort: None,
album_year: 2008, album_year: 2008,
album_title: String::from("album_title b.b"), album_title: String::from("album_title b.b"),
@ -110,7 +110,7 @@ pub static LIBRARY_ITEMS: Lazy<Vec<Item>> = Lazy::new(|| -> Vec<Item> {
track_bitrate: 1077, track_bitrate: 1077,
}, },
Item { Item {
album_artist: String::from("Album_Artist B"), album_artist: String::from("Album_Artist ‘B’"),
album_artist_sort: None, album_artist_sort: None,
album_year: 2008, album_year: 2008,
album_title: String::from("album_title b.b"), album_title: String::from("album_title b.b"),
@ -124,7 +124,7 @@ pub static LIBRARY_ITEMS: Lazy<Vec<Item>> = Lazy::new(|| -> Vec<Item> {
track_bitrate: 320, track_bitrate: 320,
}, },
Item { Item {
album_artist: String::from("Album_Artist B"), album_artist: String::from("Album_Artist ‘B’"),
album_artist_sort: None, album_artist_sort: None,
album_year: 2009, album_year: 2009,
album_title: String::from("album_title b.c"), album_title: String::from("album_title b.c"),
@ -135,7 +135,7 @@ pub static LIBRARY_ITEMS: Lazy<Vec<Item>> = Lazy::new(|| -> Vec<Item> {
track_bitrate: 190, track_bitrate: 190,
}, },
Item { Item {
album_artist: String::from("Album_Artist B"), album_artist: String::from("Album_Artist ‘B’"),
album_artist_sort: None, album_artist_sort: None,
album_year: 2009, album_year: 2009,
album_title: String::from("album_title b.c"), album_title: String::from("album_title b.c"),
@ -149,7 +149,7 @@ pub static LIBRARY_ITEMS: Lazy<Vec<Item>> = Lazy::new(|| -> Vec<Item> {
track_bitrate: 120, track_bitrate: 120,
}, },
Item { Item {
album_artist: String::from("Album_Artist B"), album_artist: String::from("Album_Artist ‘B’"),
album_artist_sort: None, album_artist_sort: None,
album_year: 2015, album_year: 2015,
album_title: String::from("album_title b.d"), album_title: String::from("album_title b.d"),
@ -160,7 +160,7 @@ pub static LIBRARY_ITEMS: Lazy<Vec<Item>> = Lazy::new(|| -> Vec<Item> {
track_bitrate: 190, track_bitrate: 190,
}, },
Item { Item {
album_artist: String::from("Album_Artist B"), album_artist: String::from("Album_Artist ‘B’"),
album_artist_sort: None, album_artist_sort: None,
album_year: 2015, album_year: 2015,
album_title: String::from("album_title b.d"), album_title: String::from("album_title b.d"),
@ -174,8 +174,8 @@ pub static LIBRARY_ITEMS: Lazy<Vec<Item>> = Lazy::new(|| -> Vec<Item> {
track_bitrate: 120, track_bitrate: 120,
}, },
Item { Item {
album_artist: String::from("Album_Artist C"), album_artist: String::from("The Album_Artist ‘C’"),
album_artist_sort: None, album_artist_sort: Some(String::from("Album_Artist ‘C’, The")),
album_year: 1985, album_year: 1985,
album_title: String::from("album_title c.a"), album_title: String::from("album_title c.a"),
track_number: 1, track_number: 1,
@ -185,8 +185,8 @@ pub static LIBRARY_ITEMS: Lazy<Vec<Item>> = Lazy::new(|| -> Vec<Item> {
track_bitrate: 320, track_bitrate: 320,
}, },
Item { Item {
album_artist: String::from("Album_Artist C"), album_artist: String::from("The Album_Artist ‘C’"),
album_artist_sort: None, album_artist_sort: Some(String::from("Album_Artist ‘C’, The")),
album_year: 1985, album_year: 1985,
album_title: String::from("album_title c.a"), album_title: String::from("album_title c.a"),
track_number: 2, track_number: 2,
@ -199,8 +199,8 @@ pub static LIBRARY_ITEMS: Lazy<Vec<Item>> = Lazy::new(|| -> Vec<Item> {
track_bitrate: 120, track_bitrate: 120,
}, },
Item { Item {
album_artist: String::from("Album_Artist C"), album_artist: String::from("The Album_Artist ‘C’"),
album_artist_sort: None, album_artist_sort: Some(String::from("Album_Artist ‘C’, The")),
album_year: 2018, album_year: 2018,
album_title: String::from("album_title c.b"), album_title: String::from("album_title c.b"),
track_number: 1, track_number: 1,
@ -210,8 +210,8 @@ pub static LIBRARY_ITEMS: Lazy<Vec<Item>> = Lazy::new(|| -> Vec<Item> {
track_bitrate: 1041, track_bitrate: 1041,
}, },
Item { Item {
album_artist: String::from("Album_Artist C"), album_artist: String::from("The Album_Artist ‘C’"),
album_artist_sort: None, album_artist_sort: Some(String::from("Album_Artist ‘C’, The")),
album_year: 2018, album_year: 2018,
album_title: String::from("album_title c.b"), album_title: String::from("album_title c.b"),
track_number: 2, track_number: 2,
@ -224,7 +224,7 @@ pub static LIBRARY_ITEMS: Lazy<Vec<Item>> = Lazy::new(|| -> Vec<Item> {
track_bitrate: 756, track_bitrate: 756,
}, },
Item { Item {
album_artist: String::from("Album_Artist D"), album_artist: String::from("Album_Artist ‘D’"),
album_artist_sort: None, album_artist_sort: None,
album_year: 1995, album_year: 1995,
album_title: String::from("album_title d.a"), album_title: String::from("album_title d.a"),
@ -235,7 +235,7 @@ pub static LIBRARY_ITEMS: Lazy<Vec<Item>> = Lazy::new(|| -> Vec<Item> {
track_bitrate: 120, track_bitrate: 120,
}, },
Item { Item {
album_artist: String::from("Album_Artist D"), album_artist: String::from("Album_Artist ‘D’"),
album_artist_sort: None, album_artist_sort: None,
album_year: 1995, album_year: 1995,
album_title: String::from("album_title d.a"), album_title: String::from("album_title d.a"),
@ -249,7 +249,7 @@ pub static LIBRARY_ITEMS: Lazy<Vec<Item>> = Lazy::new(|| -> Vec<Item> {
track_bitrate: 120, track_bitrate: 120,
}, },
Item { Item {
album_artist: String::from("Album_Artist D"), album_artist: String::from("Album_Artist ‘D’"),
album_artist_sort: None, album_artist_sort: None,
album_year: 2028, album_year: 2028,
album_title: String::from("album_title d.b"), album_title: String::from("album_title d.b"),
@ -260,7 +260,7 @@ pub static LIBRARY_ITEMS: Lazy<Vec<Item>> = Lazy::new(|| -> Vec<Item> {
track_bitrate: 841, track_bitrate: 841,
}, },
Item { Item {
album_artist: String::from("Album_Artist D"), album_artist: String::from("Album_Artist ‘D’"),
album_artist_sort: None, album_artist_sort: None,
album_year: 2028, album_year: 2028,
album_title: String::from("album_title d.b"), album_title: String::from("album_title d.b"),

18
src/tests.rs
View File

@ -3,7 +3,7 @@ macro_rules! library_collection {
vec![ vec![
Artist { Artist {
id: ArtistId { id: ArtistId {
name: "Album_Artist A".to_string(), name: "Album_Artist ‘A’".to_string(),
}, },
sort: None, sort: None,
musicbrainz: None, musicbrainz: None,
@ -98,7 +98,7 @@ macro_rules! library_collection {
}, },
Artist { Artist {
id: ArtistId { id: ArtistId {
name: "Album_Artist B".to_string(), name: "Album_Artist ‘B’".to_string(),
}, },
sort: None, sort: None,
musicbrainz: None, musicbrainz: None,
@ -240,9 +240,11 @@ macro_rules! library_collection {
}, },
Artist { Artist {
id: ArtistId { id: ArtistId {
name: "Album_Artist C".to_string(), name: "The Album_Artist ‘C’".to_string(),
}, },
sort: None, sort: Some(ArtistId {
name: "Album_Artist ‘C’, The".to_string(),
}),
musicbrainz: None, musicbrainz: None,
properties: HashMap::new(), properties: HashMap::new(),
albums: vec![ albums: vec![
@ -316,7 +318,7 @@ macro_rules! library_collection {
}, },
Artist { Artist {
id: ArtistId { id: ArtistId {
name: "Album_Artist D".to_string(), name: "Album_Artist ‘D’".to_string(),
}, },
sort: None, sort: None,
musicbrainz: None, musicbrainz: None,
@ -400,7 +402,7 @@ macro_rules! full_collection {
let mut iter = collection.iter_mut(); let mut iter = collection.iter_mut();
let artist_a = iter.next().unwrap(); let artist_a = iter.next().unwrap();
assert_eq!(artist_a.id.name, "Album_Artist A"); assert_eq!(artist_a.id.name, "Album_Artist ‘A’");
artist_a.musicbrainz = Some( artist_a.musicbrainz = Some(
MusicBrainz::new( MusicBrainz::new(
@ -421,7 +423,7 @@ macro_rules! full_collection {
]); ]);
let artist_b = iter.next().unwrap(); let artist_b = iter.next().unwrap();
assert_eq!(artist_b.id.name, "Album_Artist B"); assert_eq!(artist_b.id.name, "Album_Artist ‘B’");
artist_b.musicbrainz = Some( artist_b.musicbrainz = Some(
MusicBrainz::new( MusicBrainz::new(
@ -443,7 +445,7 @@ macro_rules! full_collection {
]); ]);
let artist_c = iter.next().unwrap(); let artist_c = iter.next().unwrap();
assert_eq!(artist_c.id.name, "Album_Artist C"); assert_eq!(artist_c.id.name, "The Album_Artist ‘C’");
artist_c.musicbrainz = Some( artist_c.musicbrainz = Some(
MusicBrainz::new( MusicBrainz::new(

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

@ -3,7 +3,7 @@
use musichoard::collection::Collection; use musichoard::collection::Collection;
use crate::tui::{ use crate::tui::{
app::selection::{Delta, IdSelection, Selection, ListSelection}, app::selection::{Delta, IdSelection, ListSelection, Selection},
lib::IMusicHoard, lib::IMusicHoard,
}; };
@ -144,7 +144,12 @@ pub struct App<MH: IMusicHoard> {
// FIXME: is it possible to use a wrapper struct? - when state() is called return a wrapper // FIXME: is it possible to use a wrapper struct? - when state() is called return a wrapper
// around App<MH> which will contain App. // around App<MH> which will contain App.
orig: Option<ListSelection>, orig: Option<ListSelection>,
memo: Vec<(Option<usize>, bool)>, memo: Vec<AppSearchMemo>,
}
struct AppSearchMemo {
index: Option<usize>,
char: bool,
} }
impl<MH: IMusicHoard> App<MH> { impl<MH: IMusicHoard> App<MH> {
@ -306,31 +311,31 @@ impl<MH: IMusicHoard> IAppInteractSearch for App<MH> {
let collection = self.music_hoard.get_collection(); let collection = self.music_hoard.get_collection();
let search = self.state.as_mut().unwrap_search(); let search = self.state.as_mut().unwrap_search();
search.push(ch); search.push(ch);
let prev = self let index = self
.selection .selection
.incremental_artist_search(collection, search, false); .incremental_artist_search(collection, search, false);
self.memo.push((prev, true)); self.memo.push(AppSearchMemo { index, char: true });
} }
fn search_next(&mut self) { fn search_next(&mut self) {
let collection = self.music_hoard.get_collection(); let collection = self.music_hoard.get_collection();
let search = self.state.as_mut().unwrap_search(); let search = self.state.as_mut().unwrap_search();
if !search.is_empty() { if !search.is_empty() {
let prev = self let index = self
.selection .selection
.incremental_artist_search(collection, search, true); .incremental_artist_search(collection, search, true);
self.memo.push((prev, false)); self.memo.push(AppSearchMemo { index, char: false });
} }
} }
fn step_back(&mut self) { fn step_back(&mut self) {
let collection = self.music_hoard.get_collection(); let collection = self.music_hoard.get_collection();
if let Some((prev, pop_char)) = self.memo.pop() { if let Some(memo) = self.memo.pop() {
if pop_char { if memo.char {
let search = self.state.as_mut().unwrap_search(); let search = self.state.as_mut().unwrap_search();
search.pop(); search.pop();
} }
self.selection.select_artist(collection, prev); self.selection.select_artist(collection, memo.index);
} }
} }
@ -880,17 +885,23 @@ mod tests {
assert_eq!(app.selection.active, Category::Album); assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), Some(0)); assert_eq!(app.selection.artist.state.list.selected(), Some(0));
app.append_character('\'');
app.append_character('c'); app.append_character('c');
app.append_character('\'');
assert_eq!(app.selection.active, Category::Album); assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), Some(2)); assert_eq!(app.selection.artist.state.list.selected(), Some(2));
app.remove_character(); app.step_back();
app.step_back();
app.step_back();
assert_eq!(app.selection.active, Category::Album); assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), Some(0)); assert_eq!(app.selection.artist.state.list.selected(), Some(0));
app.append_character('\'');
app.append_character('b'); app.append_character('b');
app.append_character('\'');
assert_eq!(app.selection.active, Category::Album); assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), Some(1)); assert_eq!(app.selection.artist.state.list.selected(), Some(1));
@ -901,4 +912,160 @@ mod tests {
assert_eq!(app.selection.active, Category::Album); assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), Some(1)); assert_eq!(app.selection.artist.state.list.selected(), Some(1));
} }
#[test]
fn search_next() {
let mut app = App::new(music_hoard(COLLECTION.to_owned()));
assert!(app.state().is_browse());
app.increment_selection(Delta::Line);
app.increment_category();
assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), Some(1));
app.begin_search();
assert!(app.state().is_search());
assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), Some(0));
app.step_back();
assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), Some(0));
app.append_character('a');
app.search_next();
assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), Some(1));
app.search_next();
assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), Some(2));
app.search_next();
assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), Some(3));
app.search_next();
assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), Some(3));
app.step_back();
assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), Some(3));
app.step_back();
assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), Some(2));
app.step_back();
assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), Some(1));
app.step_back();
assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), Some(0));
app.step_back();
assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), Some(0));
}
#[test]
fn cancel_search() {
let mut app = App::new(music_hoard(COLLECTION.to_owned()));
assert!(app.state().is_browse());
app.increment_selection(Delta::Line);
app.increment_category();
assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), Some(1));
app.begin_search();
assert!(app.state().is_search());
assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), Some(0));
app.append_character('a');
app.append_character('l');
app.append_character('b');
app.append_character('u');
app.append_character('m');
app.append_character('_');
app.append_character('a');
app.append_character('r');
app.append_character('t');
app.append_character('i');
app.append_character('s');
app.append_character('t');
app.append_character(' ');
app.append_character('\'');
app.append_character('c');
app.append_character('\'');
assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), Some(2));
app.cancel_search();
assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), Some(1));
}
#[test]
fn empty_search() {
let mut app = App::new(music_hoard(vec![]));
assert!(app.state().is_browse());
app.increment_selection(Delta::Line);
app.increment_category();
assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), None);
app.begin_search();
assert!(app.state().is_search());
assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), None);
app.append_character('a');
assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), None);
app.search_next();
assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), None);
app.step_back();
assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), None);
app.step_back();
assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), None);
app.cancel_search();
assert_eq!(app.selection.active, Category::Album);
assert_eq!(app.selection.artist.state.list.selected(), None);
}
} }

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

@ -214,7 +214,8 @@ impl ArtistSelection {
} }
} }
// FIXME: use aho_corasick for normalization // FIXME: use aho_corasick for normalization - AhoCorasick does not implement PartialEq. It
// makes more sense to be places in app.rs as it would make ArtistSelection non-trivial.
fn normalize_search(search: &str, lowercase: bool, asciify: bool) -> String { fn normalize_search(search: &str, lowercase: bool, asciify: bool) -> String {
let normalized = if lowercase { let normalized = if lowercase {
search.to_lowercase() search.to_lowercase()
@ -910,46 +911,78 @@ mod tests {
fn artist_incremental_search() { fn artist_incremental_search() {
let artists = &COLLECTION; let artists = &COLLECTION;
// Empty collection.
let mut sel = ArtistSelection::initialise(&[]); let mut sel = ArtistSelection::initialise(&[]);
assert_eq!(sel.state.list.selected(), None); assert_eq!(sel.state.list.selected(), None);
sel.incremental_search(artists, "album_artist a"); sel.incremental_search(artists, "album_artist 'a'", false);
assert_eq!(sel.state.list.selected(), None); assert_eq!(sel.state.list.selected(), None);
// Basic test, first element.
let mut sel = ArtistSelection::initialise(artists); let mut sel = ArtistSelection::initialise(artists);
assert_eq!(sel.state.list.selected(), Some(0)); assert_eq!(sel.state.list.selected(), Some(0));
sel.incremental_search(artists, "album_artist a"); sel.incremental_search(artists, "", false);
assert_eq!(sel.state.list.selected(), Some(0)); assert_eq!(sel.state.list.selected(), Some(0));
sel.incremental_search(artists, "album_artist ", false);
assert_eq!(sel.state.list.selected(), Some(0));
sel.incremental_search(artists, "album_artist 'a'", false);
assert_eq!(sel.state.list.selected(), Some(0));
// Basic test, non-first element.
sel.reinitialise(artists, None); sel.reinitialise(artists, None);
sel.incremental_search(artists, "album_artist ", false);
assert_eq!(sel.state.list.selected(), Some(0)); assert_eq!(sel.state.list.selected(), Some(0));
sel.incremental_search(artists, "album_artist b"); sel.incremental_search(artists, "album_artist 'c'", false);
assert_eq!(sel.state.list.selected(), Some(1));
sel.reinitialise(artists, None);
assert_eq!(sel.state.list.selected(), Some(0));
sel.incremental_search(artists, "Album_Artist B");
assert_eq!(sel.state.list.selected(), Some(1));
sel.reinitialise(artists, None);
assert_eq!(sel.state.list.selected(), Some(0));
sel.incremental_search(artists, "album_artist ba");
assert_eq!(sel.state.list.selected(), Some(2)); assert_eq!(sel.state.list.selected(), Some(2));
// Non-lowercase.
sel.reinitialise(artists, None); sel.reinitialise(artists, None);
sel.incremental_search(artists, "Album_Artist ", false);
assert_eq!(sel.state.list.selected(), Some(0)); assert_eq!(sel.state.list.selected(), Some(0));
sel.incremental_search(artists, "album_artist c"); sel.incremental_search(artists, "Album_Artist 'C'", false);
assert_eq!(sel.state.list.selected(), Some(2)); assert_eq!(sel.state.list.selected(), Some(2));
// Non-ascii.
sel.reinitialise(artists, None); sel.reinitialise(artists, None);
sel.incremental_search(artists, "album_artist ", false);
assert_eq!(sel.state.list.selected(), Some(0)); assert_eq!(sel.state.list.selected(), Some(0));
sel.incremental_search(artists, "album_artist d"); sel.incremental_search(artists, "album_artist ‘c’", false);
assert_eq!(sel.state.list.selected(), Some(2));
// Stop at name, not sort name.
sel.reinitialise(artists, None);
sel.incremental_search(artists, "the", false);
assert_eq!(sel.state.list.selected(), Some(2));
sel.incremental_search(artists, "the album_artist 'c'", false);
assert_eq!(sel.state.list.selected(), Some(2));
// Search next with common prefix.
sel.reinitialise(artists, None);
sel.incremental_search(artists, "album_artist ", false);
assert_eq!(sel.state.list.selected(), Some(0));
sel.incremental_search(artists, "album_artist ", true);
assert_eq!(sel.state.list.selected(), Some(1));
sel.incremental_search(artists, "album_artist ", true);
assert_eq!(sel.state.list.selected(), Some(2));
sel.incremental_search(artists, "album_artist ", true);
assert_eq!(sel.state.list.selected(), Some(3));
sel.incremental_search(artists, "album_artist ", true);
assert_eq!(sel.state.list.selected(), Some(3)); assert_eq!(sel.state.list.selected(), Some(3));
} }
} }