zenithsiz/dcb
1
0
Fork 0
mirror of https://github.com/Zenithsiz/dcb.git synced 2026-02-04 00:21:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved searching using a regex.

Browse Source
This commit is contained in:
Filipe Rodrigues 2021-05-15 07:54:23 +01:00
parent 7ae2d3717b
commit 1b6c808c08
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dcb-tools/dcb-card-editor/Cargo.toml
View File

@ -17,4 +17,5 @@ eframe = "0.11.0"
anyhow = "1.0.40"
# Utils
native-dialog = "0.5.5"
native-dialog = "0.5.5"
regex = {version = "1.5.4", features = ["pattern"]}

18
dcb-tools/dcb-card-editor/src/main.rs
View File

@ -20,6 +20,7 @@ use dcb::{
};
use eframe::{egui, epi};
use native_dialog::{FileDialog, MessageDialog, MessageType};
use regex::{Regex, RegexBuilder};
use std::{
borrow::Cow,
fs,
@ -51,6 +52,9 @@ pub struct CardEditor {
/// Card edit status
cur_card_edit_status: Option<Cow<'static, str>>,
/// Regex used to compare the search string with card names
search_regex: Option<Regex>,
}
impl CardEditor {
@ -123,6 +127,7 @@ impl Default for CardEditor {
selected_card_idx: None,
cur_card_edit_state: None,
cur_card_edit_status: None,
search_regex: None,
}
}
}
@ -136,6 +141,7 @@ impl epi::App for CardEditor {
selected_card_idx,
cur_card_edit_state,
cur_card_edit_status,
search_regex,
} = self;
// Top panel
@ -199,7 +205,15 @@ impl epi::App for CardEditor {
ui.vertical(|ui| {
ui.label("Search");
ui.text_edit_singleline(card_search);
// Update the regex if changed
if ui.text_edit_singleline(card_search).changed() {
let regex = RegexBuilder::new(&regex::escape(card_search))
.case_insensitive(true)
.build()
.expect("Unable to compile regex");
*search_regex = Some(regex);
}
});
// If we have a card table, display all cards
@ -211,7 +225,7 @@ impl epi::App for CardEditor {
.chain(card_table.items.iter().map(|item| item.name.as_str()))
.chain(card_table.digivolves.iter().map(|digivolve| digivolve.name.as_str()))
.enumerate()
.filter(|(_, name)| name.contains(card_search.as_str())); // TODO: Switch to better searching
.filter(|(_, name)| search_regex.as_ref().map_or(true, |regex| name.contains(regex)));
egui::ScrollArea::auto_sized().show(ui, |ui| {
for (idx, name) in names {