diff options
Diffstat (limited to 'src/frontend')
| -rw-r--r-- | src/frontend/app.rs | 16 | ||||
| -rw-r--r-- | src/frontend/entries.rs | 1 | ||||
| -rw-r--r-- | src/frontend/keywords.rs | 27 |
3 files changed, 35 insertions, 9 deletions
diff --git a/src/frontend/app.rs b/src/frontend/app.rs index fc04f74..00c1b45 100644 --- a/src/frontend/app.rs +++ b/src/frontend/app.rs @@ -146,16 +146,14 @@ impl App { } pub fn reset_current_list(&mut self) { - if let CurrentArea::EntryArea = self.current_area { - self.entry_table = - EntryTable::from_iter(self.biblio_data.entry_list.bibentries.clone()); - if self.search_struct.inner_search { - self.tag_list = TagList::from_iter(self.main_biblio.keyword_list.clone()) - } - } else if let CurrentArea::TagArea = self.current_area { - self.tag_list = TagList::from_iter(self.main_biblio.keyword_list.clone()); + self.entry_table = EntryTable::from_iter(self.biblio_data.entry_list.bibentries.clone()); + self.tag_list = TagList::from_iter(self.main_biblio.keyword_list.clone()); + if let CurrentArea::TagArea = self.current_area { self.tag_list.tag_list_state.select(Some(0)) } + self.search_struct.filtered_entry_list.clear(); + self.search_struct.filtered_tag_list.clear(); + self.search_struct.inner_search = false; self.former_area = None } @@ -224,6 +222,7 @@ impl App { self.search_struct.search_string.pop(); if let Some(FormerArea::EntryArea) = self.former_area { self.search_entries(); + self.filter_tags_by_entries(); } else if let Some(FormerArea::TagArea) = self.former_area { self.search_tags(); } @@ -234,6 +233,7 @@ impl App { self.search_struct.search_string.push(search_pattern); if let Some(FormerArea::EntryArea) = self.former_area { self.search_entries(); + self.filter_tags_by_entries(); } else if let Some(FormerArea::TagArea) = self.former_area { self.search_tags(); } diff --git a/src/frontend/entries.rs b/src/frontend/entries.rs index c370507..46adcff 100644 --- a/src/frontend/entries.rs +++ b/src/frontend/entries.rs @@ -195,6 +195,7 @@ impl App { let filtered_list = BibiSearch::search_entry_list(&mut self.search_struct.search_string, orig_list.clone()); //search::search_entry_list(&self.search_string, orig_list.clone()); + self.search_struct.filtered_entry_list = filtered_list.clone(); self.entry_table = EntryTable::from_iter(filtered_list) } } diff --git a/src/frontend/keywords.rs b/src/frontend/keywords.rs index cb0c28f..311366a 100644 --- a/src/frontend/keywords.rs +++ b/src/frontend/keywords.rs @@ -88,7 +88,31 @@ impl App { self.tag_list = TagList::from_iter(filtered_list) } - // Filter the entry list by tags + pub fn filter_tags_by_entries(&mut self) { + if !self.search_struct.filtered_entry_list.is_empty() { + let orig_list = &self.search_struct.filtered_entry_list; + let mut filtered_keywords: Vec<String> = Vec::new(); + + for e in orig_list { + if !e[4].is_empty() { + let mut key_vec: Vec<String> = e[4] + .split(',') + .map(|s| s.trim().to_string()) + .filter(|s| !s.is_empty()) + .collect(); + filtered_keywords.append(&mut key_vec); + } + } + + filtered_keywords.sort_by(|a, b| a.to_lowercase().cmp(&b.to_lowercase())); + filtered_keywords.dedup(); + + self.search_struct.filtered_tag_list = filtered_keywords.clone(); + self.tag_list = TagList::from_iter(filtered_keywords); + } + } + + // Filter the entry list by tags when hitting enter // If already inside a filtered tag or entry list, apply the filtering // to the already filtered list only pub fn filter_for_tags(&mut self) { @@ -105,6 +129,7 @@ impl App { let filtered_list = BibiSearch::filter_entries_by_tag(&keyword, &orig_list); self.search_struct.filtered_entry_list = filtered_list; self.entry_table = EntryTable::from_iter(self.search_struct.filtered_entry_list.clone()); + self.filter_tags_by_entries(); self.toggle_area(); self.former_area = Some(FormerArea::TagArea); } |