From 1a68d9b177bce434ae113edaeaadf87d7890f9a2 Mon Sep 17 00:00:00 2001 From: tretrauit Date: Wed, 31 Jan 2024 23:34:53 +0700 Subject: [PATCH] fix(katana/parser): remove -PRINT] part from name fk calf --- swordfish-common/src/database/katana.rs | 2 +- swordfish-common/src/utils/katana.rs | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/swordfish-common/src/database/katana.rs b/swordfish-common/src/database/katana.rs index 77590b4..fe03236 100644 --- a/swordfish-common/src/database/katana.rs +++ b/swordfish-common/src/database/katana.rs @@ -147,7 +147,7 @@ async fn query_characters_regex_internal( characters.push(None) } } - } + } } Err(e) => { error!("Failed to get cursor: {}", e); diff --git a/swordfish-common/src/utils/katana.rs b/swordfish-common/src/utils/katana.rs index 3baa129..2ebe133 100644 --- a/swordfish-common/src/utils/katana.rs +++ b/swordfish-common/src/utils/katana.rs @@ -311,6 +311,10 @@ pub fn parse_cards_from_calf_analysis(content: &String) -> Vec { None => {} } name_string.remove_matches("**"); + let open_square_bracket = name_string.rfind('['); + if name_string.contains("-PRINT]") && open_square_bracket.is_some() { + name_string.drain((open_square_bracket.unwrap() - 1)..); + } name_string } None => continue,