all client parsing tests pass except known upce

This commit is contained in:
Henry Schimke
2022-09-16 16:56:22 -05:00
parent ed646d3a63
commit f0e83abf7e
6 changed files with 125 additions and 105 deletions

View File

@@ -47,7 +47,8 @@ pub fn parse(result: &RXingResult) -> Option<ParsedClientResult> {
let phoneNumbers = matchMultipleValuePrefix("TEL", &rawText);
let emails = matchMultipleValuePrefix("MAIL", &rawText);
let note = ResultParser::matchSinglePrefixedField("MEMORY:", &rawText, '\r', false)?;
let note = ResultParser::matchSinglePrefixedField("MEMORY:", &rawText, '\r', false)
.unwrap_or_default();
let address = ResultParser::matchSinglePrefixedField("ADD:", &rawText, '\r', true);
let addresses = if address.is_none() {
Vec::new()
@@ -55,7 +56,11 @@ pub fn parse(result: &RXingResult) -> Option<ParsedClientResult> {
vec![address?]
};
if let Ok(new_data) = AddressBookParsedRXingResult::with_details(
ResultParser::maybeWrap(name)?,
if let Some(nm) = ResultParser::maybeWrap(name) {
nm
} else {
Vec::new()
},
Vec::new(),
"".to_owned(),
phoneNumbers,