mirror of
https://github.com/starovoid/rxing.git
synced 2026-07-26 04:12:34 +00:00
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
137 lines
3.5 KiB
Rust
137 lines
3.5 KiB
Rust
/*
|
|
* Copyright 2012 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.
|
|
*/
|
|
|
|
// package com.google.zxing.common;
|
|
|
|
// import org.junit.Assert;
|
|
// import org.junit.Test;
|
|
|
|
// import java.nio.charset.Charset;
|
|
// import java.nio.charset.StandardCharsets;
|
|
// import java.util.Random;
|
|
|
|
use encoding::{Encoding, EncodingRef};
|
|
use rand::Rng;
|
|
use std::collections::HashMap;
|
|
|
|
use crate::common::StringUtils;
|
|
|
|
#[test]
|
|
fn test_random() {
|
|
let mut r = rand::thread_rng();
|
|
let mut bytes: Vec<u8> = vec![0; 1000];
|
|
bytes.fill_with(|| r.gen());
|
|
// for byte in &mut bytes {
|
|
// *byte = r.gen();
|
|
// }
|
|
assert_eq!(
|
|
encoding::all::UTF_8.name(),
|
|
StringUtils::guessCharset(&bytes, &HashMap::new())
|
|
.unwrap()
|
|
.name()
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_short_shift_jis1() {
|
|
// 金魚
|
|
do_test(
|
|
&[0x8b, 0xe0, 0x8b, 0x9b],
|
|
encoding::label::encoding_from_whatwg_label("SJIS").unwrap(),
|
|
"SJIS",
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_short_iso885911() {
|
|
// båd
|
|
do_test(&[0x62, 0xe5, 0x64], encoding::all::ISO_8859_1, "ISO8859_1");
|
|
}
|
|
|
|
#[test]
|
|
fn test_short_utf8() {
|
|
// Español
|
|
do_test(
|
|
&[0x45, 0x73, 0x70, 0x61, 0xc3, 0xb1, 0x6f, 0x6c],
|
|
encoding::all::UTF_8,
|
|
"UTF8",
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_mixed_shift_jis1() {
|
|
// Hello 金!
|
|
do_test(
|
|
&[0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x8b, 0xe0, 0x21],
|
|
encoding::label::encoding_from_whatwg_label("SJIS").unwrap(),
|
|
"SJIS",
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_utf16_be() {
|
|
// 调压柜
|
|
do_test(
|
|
&[0xFE, 0xFF, 0x8c, 0x03, 0x53, 0x8b, 0x67, 0xdc],
|
|
encoding::all::UTF_16BE,
|
|
encoding::all::UTF_16BE.name(),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_utf16_le() {
|
|
// 调压柜
|
|
do_test(
|
|
&[0xFF, 0xFE, 0x03, 0x8c, 0x8b, 0x53, 0xdc, 0x67],
|
|
encoding::all::UTF_16LE,
|
|
encoding::all::UTF_16LE.name(),
|
|
);
|
|
}
|
|
|
|
fn do_test(bytes: &[u8], charset: EncodingRef, encoding: &str) {
|
|
let guessedCharset = StringUtils::guessCharset(bytes, &HashMap::new()).unwrap();
|
|
let guessedEncoding = StringUtils::guessEncoding(bytes, &HashMap::new()).unwrap();
|
|
assert_eq!(charset.name(), guessedCharset.name());
|
|
assert_eq!(encoding, guessedEncoding);
|
|
}
|
|
|
|
// /**
|
|
// * Utility for printing out a string in given encoding as a Java statement, since it's better
|
|
// * to write that into the Java source file rather than risk character encoding issues in the
|
|
// * source file itself.
|
|
// *
|
|
// * @param args command line arguments
|
|
// */
|
|
// fn main(String[] args) {
|
|
// String text = args[0];
|
|
// Charset charset = Charset.forName(args[1]);
|
|
// StringBuilder declaration = new StringBuilder();
|
|
// declaration.append("new byte[] { ");
|
|
// for (byte b : text.getBytes(charset)) {
|
|
// declaration.append("(byte) 0x");
|
|
// int value = b & 0xFF;
|
|
// if (value < 0x10) {
|
|
// declaration.append('0');
|
|
// }
|
|
// declaration.append(Integer.toHexString(value));
|
|
// declaration.append(", ");
|
|
// }
|
|
// declaration.append('}');
|
|
// System.out.println(declaration);
|
|
// }
|
|
|
|
// }
|