+1 -1

CHANGELOG.md

Reviewed

··· 1 1 # Changelog 2 2 3 3 ## Next 4 4 - - Add filtering for specific fields in search, like `artist:apashe`. You can also right-click a column header to add a filter. 4 4 + - Add filtering for specific fields in search, like `artist:apashe` or `album:"mirai sekai"`. You can also right-click a column header to add a filter. 5 5 - Add genre autocomplete 6 6 - Make macOS media key permission request non-intrusive 7 7 - Improve error and crashing behaviour

+46 -7

src-native/filter.rs

Reviewed

··· 174 174 filtered_tracks 175 175 } 176 176 177 177 + #[derive(Default, Debug)] 177 178 struct Keyword { 178 179 full_word: String, 179 180 field: Option<String>, 180 181 literal: String, 181 182 } 182 183 impl Keyword { 183 183 - fn parse(word: &str) -> Keyword { 184 184 + fn from_word(word: &str) -> Keyword { 184 185 let mut parts = word.splitn(2, ':'); 185 186 let field = parts.next(); 186 187 let literal = parts.next(); ··· 197 198 }, 198 199 } 199 200 } 201 201 + fn parse_next_keyword(query: &mut String) -> Option<Keyword> { 202 202 + *query = query.trim_start().to_string(); 203 203 + if query.is_empty() { 204 204 + return None; 205 205 + } 206 206 + 207 207 + // get next word 208 208 + let (word, rest) = match query.find(char::is_whitespace) { 209 209 + Some(i) => { 210 210 + let (word, rest) = query.split_at(i); 211 211 + (word.to_string(), rest.to_string()) 212 212 + } 213 213 + None => (query.to_string(), "".to_string()), 214 214 + }; 215 215 + *query = rest.to_string(); 216 216 + println!("word: {}", word); 217 217 + println!("rest: {}", query); 218 218 + 219 219 + let mut keyword = Keyword::from_word(&word); 220 220 + 221 221 + // parse field:"literal" 222 222 + if keyword.field.is_some() && keyword.literal.starts_with('\"') { 223 223 + keyword.literal = keyword.literal.trim_start_matches('\"').to_string(); 224 224 + let (literal, rest) = match query.split_once('\"') { 225 225 + Some((literal, rest)) => (literal.to_string(), rest.to_string()), 226 226 + None => (query.to_string(), "".to_string()), 227 227 + }; 228 228 + keyword.literal.push_str(&literal); 229 229 + *query = rest; 230 230 + println!("word: {}", keyword.literal); 231 231 + println!("rest: {}", query); 232 232 + } 233 233 + 234 234 + Some(keyword) 235 235 + } 200 236 } 201 237 202 238 pub fn filter(mut item_ids: Vec<ItemId>, query: String, library: &Library) -> Vec<ItemId> { ··· 204 240 if query == "" { 205 241 return item_ids; 206 242 } 207 207 - let query: String = query.nfc().collect(); 243 243 + let mut query: String = query.nfc().collect(); 208 244 209 209 - for word in query.split(' ') { 210 210 - if word == "" { 211 211 - continue; 212 212 - } 213 213 - let keyword = Keyword::parse(word); 245 245 + let mut keywords = Vec::new(); 246 246 + while let Some(keyword) = Keyword::parse_next_keyword(&mut query) { 247 247 + keywords.push(keyword); 248 248 + } 249 249 + 250 250 + println!("Keywords: {keywords:?}"); 251 251 + 252 252 + for keyword in keywords { 214 253 item_ids = filter_keyword(item_ids, keyword, &library); 215 254 } 216 255 println!("Filter: {}ms", now.elapsed().as_millis());

-1

src/components/TrackList.svelte

Reviewed

··· 549 549 }} 550 550 on:contextmenu={() => { 551 551 const column_filter = 'filter' in column ? column.filter : null 552 552 - console.log('cf', column_filter) 553 552 ipc_renderer.invoke('show_columns_menu', { 554 553 column_filter: typeof column_filter === 'string' ? column_filter : null, 555 554 menu: all_columns.map((col) => {