Files
rxing/src/client/result/ExpandedProductResultParser.rs
Henry 28723be2eb Cleanup of many components of the code.
Many unwraps, expects, and panics removed or handled.

More rustification of the codebase.

Squashed commit of the following:

commit 80c6483cf8c819496a7b781f9e3a149d1f18d5fe
Author: Henry <henry@azule.info>
Date:   Fri Feb 10 20:36:57 2023 -0600

    add other parsed result option

commit 412d92ae585e7bf194697f5282dbc045e448bace
Author: Henry <henry@azule.info>
Date:   Fri Feb 10 19:06:34 2023 -0600

    fix some panics

commit 9108d3e931aadec00fc0bf346ebc52d24e5d8146
Author: Henry <henry@azule.info>
Date:   Fri Feb 10 18:56:30 2023 -0600

    clippy --fix

commit 8cd89d314323f54f342f15fc73297b62d418ac79
Author: Henry <henry@azule.info>
Date:   Fri Feb 10 18:55:45 2023 -0600

    some more cleanup in aztec

commit fb7f9242e273b85a4bb212f22a185a0dcbfafc36
Author: Henry <henry@azule.info>
Date:   Fri Feb 10 18:19:54 2023 -0600

    cleanup root

commit 4fb7c0639830869149332b29be789e891eade3e7
Author: Henry Schimke <henry@azule.info>
Date:   Fri Feb 10 16:50:15 2023 -0600

    format

commit 3ac271af657b25fbe5ee39cbdf8859e5aa38ea41
Author: Henry Schimke <henry@azule.info>
Date:   Fri Feb 10 16:43:14 2023 -0600

    clippy --fix

commit 0c5b4c1477159db93a9da9645039f51cd1a7c574
Author: Henry Schimke <henry@azule.info>
Date:   Fri Feb 10 16:04:31 2023 -0600

    qrcode cleanup complete

commit 70c1d107cc672e45d46567c650c46fece7e7da9c
Author: Henry Schimke <henry@azule.info>
Date:   Fri Feb 10 13:28:25 2023 -0600

    clippy --fix

commit e13263d0f1f2a13dbb59b6e60d8b871a32babc92
Author: Henry Schimke <henry@azule.info>
Date:   Fri Feb 10 13:27:44 2023 -0600

    qrcode detector cleanup

commit f7f2855099e469fe1091868c6099196705d0ae83
Author: Henry Schimke <henry@azule.info>
Date:   Fri Feb 10 11:48:13 2023 -0600

    qrcode decoder

commit bdbaaba597b3479639c2ed3726465a69e3004471
Author: Henry Schimke <henry@azule.info>
Date:   Fri Feb 10 11:13:18 2023 -0600

    clippy --fix

commit fd6dbcaeb1f45dc91ae98f0e7c58aad48d67df78
Author: Henry Schimke <henry@azule.info>
Date:   Fri Feb 10 11:12:28 2023 -0600

    pdf417 cleanup complete

commit 7bbd47604c2639a5eb61bdb5533e71be3bce95a1
Author: Henry Schimke <henry@azule.info>
Date:   Fri Feb 10 10:39:28 2023 -0600

    clippy --fix

commit 8f4962b7bb5f133524fe4d3d4948e5672a88c545
Author: Henry Schimke <henry@azule.info>
Date:   Fri Feb 10 10:39:00 2023 -0600

    cleanup on pdf417 hie

commit 254c8243953776d3c8704dd81529aadd05d5a94e
Author: Henry <henry@azule.info>
Date:   Fri Feb 10 02:51:21 2023 +0000

    partway through pdf417 hle

commit d4a5b00fde8c0282b0c6e4175a21c1e111b11533
Author: Henry <henry@azule.info>
Date:   Wed Feb 8 21:35:25 2023 +0000

    clippy --fix

commit 2bd4a8e218aa963a88997b50bc5a198f9a88205e
Author: Henry <henry@azule.info>
Date:   Wed Feb 8 21:31:55 2023 +0000

    pdf417 decode and detect cleanup

commit 05130ac54a72c2303045d64507bf6185aa74e531
Author: Henry Schimke <henry@azule.info>
Date:   Tue Feb 7 08:06:25 2023 -0600

    at decodeTextCompaction in decoded_bit_straem_parser

commit 924c023a7d2339dfffa6ef0c4a805fb192576796
Author: Henry Schimke <henry@azule.info>
Date:   Mon Feb 6 18:22:02 2023 -0600

    clippy --fix

commit 5cfb81a885c22b4b5ec937a79be31d0815def211
Author: Henry Schimke <henry@azule.info>
Date:   Mon Feb 6 18:20:22 2023 -0600

    oned cleanup

commit 0649b64854baf56a8e3314728d4f6cf4063db8b2
Author: Henry Schimke <henry@azule.info>
Date:   Mon Feb 6 11:47:28 2023 -0600

    rss cleanup

commit 2d3127898fc11f7e65d590e983cda799b798b646
Author: Henry Schimke <henry@azule.info>
Date:   Mon Feb 6 10:19:56 2023 -0600

    multi cleanup

commit 7e8b43a159083a2096123e6204d4d1d359c59981
Author: Henry <henry@azule.info>
Date:   Sun Feb 5 21:41:59 2023 -0600

    cargo fmt

commit df8285e8da07b4bffd48ca6e596de3f010eb8d9e
Author: Henry <henry@azule.info>
Date:   Sun Feb 5 21:41:29 2023 -0600

    maxicode cleanup

commit a51f923a14016eb416ca202b2194258808dde3e7
Author: Henry <henry@azule.info>
Date:   Sun Feb 5 21:27:57 2023 -0600

    cargo fmt

commit 332d7eef4a25318611025a3fcb0b70c604d917be
Author: Henry <henry@azule.info>
Date:   Sun Feb 5 21:27:48 2023 -0600

    cleanup datamatrix

commit eb2311c476a9c9993f271ab6cf9fd359aedca26f
Author: Henry <henry@azule.info>
Date:   Sun Feb 5 21:27:26 2023 -0600

    cargo clippy --fix

commit 2abaa4c51d287f619d4c7a438f85ba2a30f159cf
Author: Henry <henry@azule.info>
Date:   Sun Feb 5 19:13:02 2023 -0600

    finish cleanup in parsers

commit 716aa2fbf728716cff36657a5fd80e7bca5276b7
Author: Henry Schimke <henry@azule.info>
Date:   Sun Feb 5 17:44:56 2023 -0600

    cleanup continues

commit 7d843788a49fa9cc82c4616d226c0f882e73612b
Author: Henry Schimke <henry@azule.info>
Date:   Sun Feb 5 15:15:09 2023 -0600

    common cleanup

commit fd251866c68f22d450dd428c93d7a3620bf1be27
Author: Henry Schimke <henry@azule.info>
Date:   Sun Feb 5 10:24:54 2023 -0600

    cleanup reedsolomon

commit 132e27ed1468f5c1ce998516ff5a00687217c3e6
Author: Henry Schimke <henry@azule.info>
Date:   Sun Feb 5 09:52:04 2023 -0600

    make MathUtils more generic

commit d8352b7fff4cb4f9ecc8e8a969710d26ef410e8b
Author: Henry Schimke <henry@azule.info>
Date:   Sun Feb 5 09:29:33 2023 -0600

    cleanup some string handling in ResultParser

    There may still be some edge cases where multi-byte characters break the parser
2023-02-10 20:41:25 -06:00

286 lines
9.5 KiB
Rust

/*
* Copyright (C) 2010 ZXing authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/*
* These authors would like to acknowledge the Spanish Ministry of Industry,
* Tourism and Trade, for the support in the project TSI020301-2008-2
* "PIRAmIDE: Personalizable Interactions with Resources on AmI-enabled
* Mobile Dynamic Environments", led by Treelogic
* ( http://www.treelogic.com/ ):
*
* http://www.piramidepse.com/
*/
// package com.google.zxing.client.result;
// import java.util.HashMap;
// import java.util.Map;
// import com.google.zxing.BarcodeFormat;
// import com.google.zxing.RXingResult;
use std::collections::HashMap;
use crate::BarcodeFormat;
use super::{ExpandedProductParsedRXingResult, ParsedClientResult, ResultParser};
/**
* Parses strings of digits that represent a RSS Extended code.
*
* @author Antonio Manuel Benjumea Conde, Servinform, S.A.
* @author Agustín Delgado, Servinform, S.A.
*/
pub fn parse(result: &crate::RXingResult) -> Option<super::ParsedClientResult> {
let barcode_format = result.getBarcodeFormat();
if barcode_format != &BarcodeFormat::RSS_EXPANDED {
// ExtendedProductParsedRXingResult NOT created. Not a RSS Expanded barcode
return None;
}
let rawText = ResultParser::getMassagedText(result);
let mut productID: String = String::default(); // = null;
let mut sscc: String = String::default();
let mut lotNumber: String = String::default();
let mut productionDate: String = String::default();
let mut packagingDate: String = String::default();
let mut bestBeforeDate: String = String::default();
let mut expirationDate: String = String::default();
let mut weight: String = String::default();
let mut weightType: String = String::default();
let mut weightIncrement: String = String::default();
let mut price: String = String::default();
let mut priceIncrement: String = String::default();
let mut priceCurrency: String = String::default();
let mut uncommonAIs = HashMap::new();
let mut i = 0;
while i < rawText.len() {
let ai = findAIvalue(i, &rawText)?;
// if ai == null {
// Error. Code doesn't match with RSS expanded pattern
// ExtendedProductParsedRXingResult NOT created. Not match with RSS Expanded pattern
// return None;
// }
i += ai.len() + 2;
let value = findValue(i, &rawText)?;
i += value.len();
match ai.as_str() {
"00" => sscc = value,
"01" => productID = value,
"10" => lotNumber = value,
"11" => productionDate = value,
"13" => packagingDate = value,
"15" => bestBeforeDate = value,
"17" => expirationDate = value,
"3100" | "3101" | "3102" | "3103" | "3104" | "3105" | "3106" | "3107" | "3108"
| "3109" => {
weight = value;
weightType = ExpandedProductParsedRXingResult::KILOGRAM.into();
weightIncrement = ai[3..].to_owned()
}
"3200" | "3201" | "3202" | "3203" | "3204" | "3205" | "3206" | "3207" | "3208"
| "3209" => {
weight = value;
weightType = ExpandedProductParsedRXingResult::POUND.into();
weightIncrement = ai[3..].to_owned();
}
"3920" | "3921" | "3922" | "3923" => {
price = value;
priceIncrement = ai[3..].to_owned();
}
"3930" | "3931" | "3932" | "3933" => {
if value.len() < 4 {
// The value must have more of 3 symbols (3 for currency and
// 1 at least for the price)
// ExtendedProductParsedRXingResult NOT created. Not match with RSS Expanded pattern
return None;
}
price = value[3..].to_owned();
priceCurrency = value[0..3].to_owned();
priceIncrement = ai[3..].to_owned();
}
_ => {
// No match with common AIs
uncommonAIs.insert(ai, value);
}
};
// switch (ai) {
// case "00":
// sscc = value;
// break;
// case "01":
// productID = value;
// break;
// case "10":
// lotNumber = value;
// break;
// case "11":
// productionDate = value;
// break;
// case "13":
// packagingDate = value;
// break;
// case "15":
// bestBeforeDate = value;
// break;
// case "17":
// expirationDate = value;
// break;
// case "3100":
// case "3101":
// case "3102":
// case "3103":
// case "3104":
// case "3105":
// case "3106":
// case "3107":
// case "3108":
// case "3109":
// weight = value;
// weightType = ExpandedProductParsedRXingResult.KILOGRAM;
// weightIncrement = ai.substring(3);
// break;
// case "3200":
// case "3201":
// case "3202":
// case "3203":
// case "3204":
// case "3205":
// case "3206":
// case "3207":
// case "3208":
// case "3209":
// weight = value;
// weightType = ExpandedProductParsedRXingResult.POUND;
// weightIncrement = ai.substring(3);
// break;
// case "3920":
// case "3921":
// case "3922":
// case "3923":
// price = value;
// priceIncrement = ai.substring(3);
// break;
// case "3930":
// case "3931":
// case "3932":
// case "3933":
// if (value.length() < 4) {
// // The value must have more of 3 symbols (3 for currency and
// // 1 at least for the price)
// // ExtendedProductParsedRXingResult NOT created. Not match with RSS Expanded pattern
// return null;
// }
// price = value.substring(3);
// priceCurrency = value.substring(0, 3);
// priceIncrement = ai.substring(3);
// break;
// default:
// // No match with common AIs
// uncommonAIs.put(ai, value);
// break;
// }
}
Some(ParsedClientResult::ExpandedProductResult(
ExpandedProductParsedRXingResult::new(
rawText,
productID,
sscc,
lotNumber,
productionDate,
packagingDate,
bestBeforeDate,
expirationDate,
weight,
weightType,
weightIncrement,
price,
priceIncrement,
priceCurrency,
uncommonAIs,
),
))
// return new ExpandedProductParsedRXingResult(rawText,
// productID,
// sscc,
// lotNumber,
// productionDate,
// packagingDate,
// bestBeforeDate,
// expirationDate,
// weight,
// weightType,
// weightIncrement,
// price,
// priceIncrement,
// priceCurrency,
// uncommonAIs);
}
fn findAIvalue(i: usize, rawText: &str) -> Option<String> {
let c = rawText.chars().nth(i)?;
// First character must be a open parenthesis.If not, ERROR
if c != '(' {
return None;
}
let rawTextAux = &rawText[i + 1..];
let mut buf = String::new();
for index in 0..rawTextAux.len() {
// for (int index = 0; index < rawTextAux.length(); index++) {
let currentChar = rawTextAux.chars().nth(index)?;
if currentChar == ')' {
return Some(buf);
}
if !('0'..='9').contains(&currentChar) {
return None;
}
buf.push(currentChar);
}
Some(buf)
}
fn findValue(i: usize, rawText: &str) -> Option<String> {
let mut buf = String::new();
let rawTextAux = &rawText[i..];
for index in 0..rawTextAux.len() {
// for (int index = 0; index < rawTextAux.length(); index++) {
let c = rawTextAux.chars().nth(index)?;
if c == '(' {
// We look for a new AI. If it doesn't exist (ERROR), we continue
// with the iteration
if findAIvalue(index, rawTextAux).is_some() {
break;
}
// if findAIvalue(index, rawTextAux) != null {
// break;
// }
buf.push('(');
} else {
buf.push(c);
}
}
Some(buf)
}