diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 3b4f61c..110bef0 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -16,6 +16,8 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Check + run: cargo check --release --verbose - name: Build run: cargo build --release --verbose - name: Run tests diff --git a/src/aztec/aztec_reader.rs b/src/aztec/aztec_reader.rs index ac9417e..76e392c 100644 --- a/src/aztec/aztec_reader.rs +++ b/src/aztec/aztec_reader.rs @@ -61,7 +61,7 @@ impl Reader for AztecReader { } else if let Ok(det) = detector.detect(true) { det } else { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); }; let points = detectorRXingResult.getPoints(); diff --git a/src/aztec/aztec_writer.rs b/src/aztec/aztec_writer.rs index 0a32ad7..fb36ae0 100644 --- a/src/aztec/aztec_writer.rs +++ b/src/aztec/aztec_writer.rs @@ -60,7 +60,7 @@ impl Writer for AztecWriter { if cset_name.to_lowercase() != "iso-8859-1" { charset = Some( encoding::label::encoding_from_whatwg_label(cset_name) - .ok_or(Exceptions::IllegalArgumentException(None))?, + .ok_or(Exceptions::illegalArgument)?, ); } } @@ -96,9 +96,9 @@ fn encode( layers: i32, ) -> Result { if format != BarcodeFormat::AZTEC { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "can only encode AZTEC, but got {format:?}" - )))); + ))); } let aztec = if let Some(cset) = charset { // dbg!(cset.name(), cset.whatwg_name()); diff --git a/src/aztec/decoder.rs b/src/aztec/decoder.rs index 895f2ae..52b217b 100644 --- a/src/aztec/decoder.rs +++ b/src/aztec/decoder.rs @@ -162,17 +162,13 @@ fn get_encoded_data(corrected_bits: &[bool]) -> Result { result.push_str( &encdr .decode(&decoded_bytes, encoding::DecoderTrap::Strict) - .map_err(|a| Exceptions::IllegalStateException(Some(a.to_string())))?, + .map_err(|a| Exceptions::illegalStateWith(a))?, ); decoded_bytes.clear(); match n { 0 => result.push(29 as char), // translate FNC1 as ASCII 29 - 7 => { - return Err(Exceptions::FormatException(Some( - "FLG(7) is reserved and illegal".to_owned(), - ))) - } // FLG(7) is reserved and illegal + 7 => return Err(Exceptions::formatWith("FLG(7) is reserved and illegal")), // FLG(7) is reserved and illegal _ => { // ECI is decimal integer encoded as 1-6 codes in DIGIT mode let mut eci = 0; @@ -184,18 +180,15 @@ fn get_encoded_data(corrected_bits: &[bool]) -> Result { let next_digit = read_code(corrected_bits, index, 4); index += 4; if !(2..=11).contains(&next_digit) { - return Err(Exceptions::FormatException(Some( - "Not a decimal digit".to_owned(), - ))); // Not a decimal digit + return Err(Exceptions::formatWith("Not a decimal digit")); + // Not a decimal digit } eci = eci * 10 + (next_digit - 2); n -= 1; } let charset_eci = CharacterSetECI::getCharacterSetECIByValue(eci); if charset_eci.is_err() { - return Err(Exceptions::FormatException(Some( - "Charset must exist".to_owned(), - ))); + return Err(Exceptions::formatWith("Charset must exist")); } encdr = CharacterSetECI::getCharset(&charset_eci?); } @@ -208,17 +201,8 @@ fn get_encoded_data(corrected_bits: &[bool]) -> Result { // That's including when that mode is a shift. // Our test case dlusbs.png for issue #642 exercises that. latch_table = shift_table; // Latch the current mode, so as to return to Upper after U/S B/S - shift_table = getTable( - str.chars() - .nth(5) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?, - ); - if str - .chars() - .nth(6) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? - == 'L' - { + shift_table = getTable(str.chars().nth(5).ok_or(Exceptions::indexOutOfBounds)?); + if str.chars().nth(6).ok_or(Exceptions::indexOutOfBounds)? == 'L' { latch_table = shift_table; } } else { @@ -239,9 +223,7 @@ fn get_encoded_data(corrected_bits: &[bool]) -> Result { if let Ok(str) = encdr.decode(&decoded_bytes, encoding::DecoderTrap::Strict) { result.push_str(&str); } else { - return Err(Exceptions::IllegalStateException(Some( - "bad encoding".to_owned(), - ))); + return Err(Exceptions::illegalStateWith("bad encoding")); } // result.push_str(decodedBytes.toString(encoding.name())); //} catch (UnsupportedEncodingException uee) { @@ -293,9 +275,7 @@ fn get_character(table: Table, code: u32) -> Result<&'static str> { Table::Mixed => Ok(MIXED_TABLE[code as usize]), Table::Digit => Ok(DIGIT_TABLE[code as usize]), Table::Punct => Ok(PUNCT_TABLE[code as usize]), - _ => Err(Exceptions::IllegalStateException(Some( - "Bad table".to_owned(), - ))), + _ => Err(Exceptions::illegalStateWith("Bad table")), } // switch (table) { // case UPPER: @@ -356,9 +336,9 @@ fn correct_bits( let num_data_codewords = ddata.getNbDatablocks(); let num_codewords = rawbits.len() / codeword_size; if num_codewords < num_data_codewords as usize { - return Err(Exceptions::FormatException(Some(format!( + return Err(Exceptions::formatWith(format!( "numCodewords {num_codewords}< numDataCodewords{num_data_codewords}" - )))); + ))); } let mut offset = rawbits.len() % codeword_size; @@ -389,7 +369,7 @@ fn correct_bits( // for (int i = 0; i < numDataCodewords; i++) { // let data_word = data_words[i]; if data_word == &0 || data_word == &mask { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); //throw FormatException.getFormatInstance(); } else if data_word == &1 || data_word == &(mask - 1) { stuffed_bits += 1; diff --git a/src/aztec/detector.rs b/src/aztec/detector.rs index 4d1fea6..4cbae88 100644 --- a/src/aztec/detector.rs +++ b/src/aztec/detector.rs @@ -124,9 +124,7 @@ impl<'a> Detector<'_> { || !self.is_valid(bulls_eye_corners[2]) || !self.is_valid(bulls_eye_corners[3]) { - return Err(Exceptions::NotFoundException(Some( - "no valid points".to_owned(), - ))); + return Err(Exceptions::notFoundWith("no valid points")); } let length = 2 * self.nb_center_layers; // Get the bits around the bull's eye @@ -207,9 +205,7 @@ impl<'a> Detector<'_> { return Ok(shift); } } - Err(Exceptions::NotFoundException(Some( - "rotation failure".to_owned(), - ))) + Err(Exceptions::notFoundWith("rotation failure")) } /** @@ -318,7 +314,7 @@ impl<'a> Detector<'_> { } if self.nb_center_layers != 5 && self.nb_center_layers != 7 { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } self.compact = self.nb_center_layers == 5; diff --git a/src/aztec/encoder/aztec_encoder.rs b/src/aztec/encoder/aztec_encoder.rs index 6c8ea51..e8b8544 100644 --- a/src/aztec/encoder/aztec_encoder.rs +++ b/src/aztec/encoder/aztec_encoder.rs @@ -53,7 +53,7 @@ pub const WORD_SIZE: [u32; 33] = [ pub fn encode_simple(data: &str) -> Result { let Ok(bytes) = encoding::all::ISO_8859_1 .encode(data, encoding::EncoderTrap::Replace) else { - return Err(Exceptions::IllegalArgumentException(Some(format!("'{data}' cannot be encoded as ISO_8859_1")))); + return Err(Exceptions::illegalArgumentWith(format!("'{data}' cannot be encoded as ISO_8859_1"))); }; encode_bytes_simple(&bytes) } @@ -71,9 +71,9 @@ pub fn encode(data: &str, minECCPercent: u32, userSpecifiedLayers: i32) -> Resul if let Ok(bytes) = encoding::all::ISO_8859_1.encode(data, encoding::EncoderTrap::Strict) { encode_bytes(&bytes, minECCPercent, userSpecifiedLayers) } else { - Err(Exceptions::IllegalArgumentException(Some(format!( + Err(Exceptions::illegalArgumentWith(format!( "'{data}' cannot be encoded as ISO_8859_1" - )))) + ))) } } @@ -98,9 +98,9 @@ pub fn encode_with_charset( if let Ok(bytes) = charset.encode(data, encoding::EncoderTrap::Strict) { encode_bytes_with_charset(&bytes, minECCPercent, userSpecifiedLayers, charset) } else { - Err(Exceptions::IllegalArgumentException(Some(format!( + Err(Exceptions::illegalArgumentWith(format!( "'{data}' cannot be encoded as ISO_8859_1" - )))) + ))) } } @@ -174,24 +174,24 @@ pub fn encode_bytes_with_charset( MAX_NB_BITS }) { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Illegal value {user_specified_layers} for layers" - )))); + ))); } total_bits_in_layer_var = total_bits_in_layer(layers, compact); word_size = WORD_SIZE[layers as usize]; let usable_bits_in_layers = total_bits_in_layer_var - (total_bits_in_layer_var % word_size); stuffed_bits = stuffBits(&bits, word_size as usize)?; if stuffed_bits.getSize() as u32 + ecc_bits > usable_bits_in_layers { - return Err(Exceptions::IllegalArgumentException(Some( - "Data to large for user specified layer".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "Data to large for user specified layer", + )); } if compact && stuffed_bits.getSize() as u32 > word_size * 64 { // Compact format only allows 64 data words, though C4 can hold more words than that - return Err(Exceptions::IllegalArgumentException(Some( - "Data to large for user specified layer".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "Data to large for user specified layer", + )); } } else { word_size = 0; @@ -203,9 +203,9 @@ pub fn encode_bytes_with_charset( loop { // for (int i = 0; ; i++) { if i > MAX_NB_BITS { - return Err(Exceptions::IllegalArgumentException(Some( - "Data too large for an Aztec code".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "Data too large for an Aztec code", + )); } compact = i <= 3; layers = if compact { i + 1 } else { i }; @@ -474,9 +474,9 @@ fn getGF(wordSize: usize) -> Result { 8 => Ok(get_predefined_genericgf(PredefinedGenericGF::AztecData8)), 10 => Ok(get_predefined_genericgf(PredefinedGenericGF::AztecData10)), 12 => Ok(get_predefined_genericgf(PredefinedGenericGF::AztecData12)), - _ => Err(Exceptions::IllegalArgumentException(Some(format!( + _ => Err(Exceptions::illegalArgumentWith(format!( "Unsupported word size {wordSize}" - )))), + ))), } } diff --git a/src/aztec/encoder/high_level_encoder.rs b/src/aztec/encoder/high_level_encoder.rs index b61098e..3c4dde2 100644 --- a/src/aztec/encoder/high_level_encoder.rs +++ b/src/aztec/encoder/high_level_encoder.rs @@ -248,9 +248,9 @@ impl HighLevelEncoder { initial_state = initial_state.appendFLGn(CharacterSetECI::getValue(&eci))?; } } else { - return Err(Exceptions::IllegalArgumentException(Some( - "No ECI code for character set".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "No ECI code for character set", + )); } // if self.charset != null { // CharacterSetECI eci = CharacterSetECI.getCharacterSetECI(charset); diff --git a/src/aztec/encoder/state.rs b/src/aztec/encoder/state.rs index 067a9eb..62a99f5 100644 --- a/src/aztec/encoder/state.rs +++ b/src/aztec/encoder/state.rs @@ -83,15 +83,15 @@ impl State { token.add(0, 3); // 0: FNC1 } else */ if eci > 999999 { - return Err(Exceptions::IllegalArgumentException(Some( - "ECI code must be between 0 and 999999".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "ECI code must be between 0 and 999999", + )); // throw new IllegalArgumentException("ECI code must be between 0 and 999999"); } else { let Ok(eci_digits) = encoding::all::ISO_8859_1 .encode(&format!("{eci}"), encoding::EncoderTrap::Strict) else { - return Err(Exceptions::IllegalArgumentException(None)) + return Err(Exceptions::illegalArgument) }; // let eciDigits = Integer.toString(eci).getBytes(StandardCharsets.ISO_8859_1); token.add(eci_digits.len() as i32, 3); // 1-6: number of ECI digits diff --git a/src/aztec/encoder/token.rs b/src/aztec/encoder/token.rs index 125e996..671ecca 100644 --- a/src/aztec/encoder/token.rs +++ b/src/aztec/encoder/token.rs @@ -34,9 +34,9 @@ impl TokenType { match self { TokenType::Simple(a) => a.appendTo(bit_array, text), TokenType::BinaryShift(a) => a.appendTo(bit_array, text), - TokenType::Empty => Err(Exceptions::IllegalStateException(Some(String::from( + TokenType::Empty => Err(Exceptions::illegalStateWith( "cannot appendTo on Empty final item", - )))), + )), } } } diff --git a/src/client/result/AddressBookParsedResult.rs b/src/client/result/AddressBookParsedResult.rs index fd71bd1..dcb6e76 100644 --- a/src/client/result/AddressBookParsedResult.rs +++ b/src/client/result/AddressBookParsedResult.rs @@ -121,19 +121,19 @@ impl AddressBookParsedRXingResult { geo: Vec, ) -> Result { if phone_numbers.len() != phone_types.len() && !phone_types.is_empty() { - return Err(Exceptions::IllegalArgumentException(Some( - "Phone numbers and types lengths differ".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "Phone numbers and types lengths differ", + )); } if emails.len() != email_types.len() && !email_types.is_empty() { - return Err(Exceptions::IllegalArgumentException(Some( - "Emails and types lengths differ".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "Emails and types lengths differ", + )); } if addresses.len() != address_types.len() && !address_types.is_empty() { - return Err(Exceptions::IllegalArgumentException(Some( - "Addresses and types lengths differ".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "Addresses and types lengths differ", + )); } Ok(Self { names, diff --git a/src/client/result/CalendarParsedResult.rs b/src/client/result/CalendarParsedResult.rs index cc50f4f..ece40fd 100644 --- a/src/client/result/CalendarParsedResult.rs +++ b/src/client/result/CalendarParsedResult.rs @@ -167,7 +167,7 @@ impl CalendarParsedRXingResult { */ fn parseDate(when: String) -> Result { if !DATE_TIME.is_match(&when) { - return Err(Exceptions::ParseException(Some(when))); + return Err(Exceptions::parseWith(when)); } if when.len() == 8 { // Show only year/month/day @@ -178,22 +178,14 @@ impl CalendarParsedRXingResult { // http://code.google.com/p/android/issues/detail?id=8330 return match Utc.datetime_from_str(&format!("{}T000000Z", &when,), date_format_string) { Ok(dtm) => Ok(dtm.timestamp()), - Err(e) => Err(Exceptions::ParseException(Some(e.to_string()))), + Err(e) => Err(Exceptions::parseWith(e.to_string())), }; } // The when string can be local time, or UTC if it ends with a Z - if when.len() == 16 - && when - .chars() - .nth(15) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? - == 'Z' - { + if when.len() == 16 && when.chars().nth(15).ok_or(Exceptions::indexOutOfBounds)? == 'Z' { return match Utc.datetime_from_str(&when, "%Y%m%dT%H%M%SZ") { Ok(dtm) => Ok(dtm.with_timezone(&Utc).timestamp()), - Err(e) => Err(Exceptions::ParseException(Some(format!( - "couldn't parse string: {e}" - )))), + Err(e) => Err(Exceptions::parseWith(format!("couldn't parse string: {e}"))), }; } // Try once more, with weird tz formatting @@ -203,16 +195,14 @@ impl CalendarParsedRXingResult { let tz_parsed: Tz = match tz_part.parse() { Ok(time_zone) => time_zone, Err(e) => { - return Err(Exceptions::ParseException(Some(format!( + return Err(Exceptions::parseWith(format!( "couldn't parse timezone '{tz_part}': {e}" - )))) + ))) } }; return match Utc.datetime_from_str(time_part, "%Y%m%dT%H%M%S") { Ok(dtm) => Ok(dtm.with_timezone(&tz_parsed).timestamp()), - Err(e) => Err(Exceptions::ParseException(Some(format!( - "couldn't parse string: {e}" - )))), + Err(e) => Err(Exceptions::parseWith(format!("couldn't parse string: {e}"))), }; } @@ -220,9 +210,9 @@ impl CalendarParsedRXingResult { if when.len() == 15 { return match Utc.datetime_from_str(&when, "%Y%m%dT%H%M%S") { Ok(dtm) => Ok(dtm.timestamp()), - Err(e) => Err(Exceptions::ParseException(Some(format!( + Err(e) => Err(Exceptions::parseWith(format!( "couldn't parse local time: {e}" - )))), + ))), }; } Self::parseDateTimeString(&when) @@ -259,7 +249,7 @@ impl CalendarParsedRXingResult { let z = parseable .as_str() .parse::() - .map_err(|e| Exceptions::ParseException(Some(e.to_string())))?; + .map_err(|e| Exceptions::parseWith(e.to_string()))?; durationMS += unit * z; } } @@ -284,9 +274,9 @@ impl CalendarParsedRXingResult { if let Ok(dtm) = DateTime::parse_from_str(dateTimeString, "%Y%m%dT%H%M%S") { Ok(dtm.timestamp()) } else { - Err(Exceptions::ParseException(Some(format!( + Err(Exceptions::parseWith(format!( "Couldn't parse {dateTimeString}" - )))) + ))) } // DateFormat format = new SimpleDateFormat("yyyyMMdd'T'HHmmss", Locale.ENGLISH); // return format.parse(dateTimeString).getTime(); diff --git a/src/client/result/ResultParser.rs b/src/client/result/ResultParser.rs index eb84d2a..8da188f 100644 --- a/src/client/result/ResultParser.rs +++ b/src/client/result/ResultParser.rs @@ -300,9 +300,7 @@ pub fn urlDecode(encoded: &str) -> Result { if let Ok(decoded) = decode(encoded) { Ok(decoded.to_string()) } else { - Err(Exceptions::IllegalStateException(Some(String::from( - "UnsupportedEncodingException", - )))) + Err(Exceptions::illegalStateWith("UnsupportedEncodingException")) } } diff --git a/src/client/result/VINResultParser.rs b/src/client/result/VINResultParser.rs index e6feafa..6c25925 100644 --- a/src/client/result/VINResultParser.rs +++ b/src/client/result/VINResultParser.rs @@ -72,16 +72,9 @@ fn check_checksum(vin: &str) -> Result { let mut sum = 0; for i in 0..vin.len() { sum += vin_position_weight(i + 1)? as u32 - * vin_char_value( - vin.chars() - .nth(i) - .ok_or(Exceptions::IllegalArgumentException(None))?, - )?; + * vin_char_value(vin.chars().nth(i).ok_or(Exceptions::illegalArgument)?)?; } - let check_to_char = vin - .chars() - .nth(8) - .ok_or(Exceptions::IllegalArgumentException(None))?; + let check_to_char = vin.chars().nth(8).ok_or(Exceptions::illegalArgument)?; let expected_check_char = check_char((sum % 11) as u8)?; Ok(check_to_char == expected_check_char) } @@ -92,9 +85,7 @@ fn vin_char_value(c: char) -> Result { 'J'..='R' => Ok((c as u8 as u32 - b'J' as u32) + 1), 'S'..='Z' => Ok((c as u8 as u32 - b'S' as u32) + 2), '0'..='9' => Ok(c as u8 as u32 - b'0' as u32), - _ => Err(Exceptions::IllegalArgumentException(Some( - "vin char out of range".to_owned(), - ))), + _ => Err(Exceptions::illegalArgumentWith("vin char out of range")), } } @@ -104,9 +95,9 @@ fn vin_position_weight(position: usize) -> Result { 8 => Ok(10), 9 => Ok(0), 10..=17 => Ok(19 - position), - _ => Err(Exceptions::IllegalArgumentException(Some( - "vin position weight out of bounds".to_owned(), - ))), + _ => Err(Exceptions::illegalArgumentWith( + "vin position weight out of bounds", + )), } } @@ -114,9 +105,7 @@ fn check_char(remainder: u8) -> Result { match remainder { 0..=9 => Ok((b'0' + remainder) as char), 10 => Ok('X'), - _ => Err(Exceptions::IllegalArgumentException(Some( - "remainder too high".to_owned(), - ))), + _ => Err(Exceptions::illegalArgumentWith("remainder too high")), } } @@ -129,9 +118,9 @@ fn model_year(c: char) -> Result { 'V'..='Y' => Ok((c as u8 as u32 - b'V' as u32) + 1997), '1'..='9' => Ok((c as u8 as u32 - b'1' as u32) + 2001), 'A'..='D' => Ok((c as u8 as u32 - b'A' as u32) + 2010), - _ => Err(Exceptions::IllegalArgumentException(Some(String::from( + _ => Err(Exceptions::illegalArgumentWith( "model year argument out of range", - )))), + )), } } diff --git a/src/common/bit_array.rs b/src/common/bit_array.rs index d20f59e..471c4a8 100644 --- a/src/common/bit_array.rs +++ b/src/common/bit_array.rs @@ -169,7 +169,7 @@ impl BitArray { pub fn setRange(&mut self, start: usize, end: usize) -> Result<()> { let mut end = end; if end < start || end > self.size { - return Err(Exceptions::IllegalArgumentException(None)); + return Err(Exceptions::illegalArgument); } if end == start { return Ok(()); @@ -212,7 +212,7 @@ impl BitArray { pub fn isRange(&self, start: usize, end: usize, value: bool) -> Result { let mut end = end; if end < start || end > self.size { - return Err(Exceptions::IllegalArgumentException(None)); + return Err(Exceptions::illegalArgument); } if end == start { return Ok(true); // empty range matches @@ -254,9 +254,9 @@ impl BitArray { */ pub fn appendBits(&mut self, value: u32, num_bits: usize) -> Result<()> { if num_bits > 32 { - return Err(Exceptions::IllegalArgumentException(Some( - "num bits must be between 0 and 32".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "num bits must be between 0 and 32", + )); } if num_bits == 0 { @@ -287,9 +287,7 @@ impl BitArray { pub fn xor(&mut self, other: &BitArray) -> Result<()> { if self.size != other.size { - return Err(Exceptions::IllegalArgumentException(Some( - "Sizes don't match".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith("Sizes don't match")); } for i in 0..self.bits.len() { //for (int i = 0; i < bits.length; i++) { diff --git a/src/common/bit_matrix.rs b/src/common/bit_matrix.rs index 1b8fa9f..7f1e7a4 100644 --- a/src/common/bit_matrix.rs +++ b/src/common/bit_matrix.rs @@ -66,9 +66,9 @@ impl BitMatrix { */ pub fn new(width: u32, height: u32) -> Result { if width < 1 || height < 1 { - return Err(Exceptions::IllegalArgumentException(Some( - "Both dimensions must be greater than 0".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "Both dimensions must be greater than 0", + )); } Ok(Self { width, @@ -138,12 +138,12 @@ impl BitMatrix { if string_representation .chars() .nth(pos) - .ok_or(Exceptions::IllegalStateException(None))? + .ok_or(Exceptions::illegalState)? == '\n' || string_representation .chars() .nth(pos) - .ok_or(Exceptions::IllegalStateException(None))? + .ok_or(Exceptions::illegalState)? == '\r' { if bitsPos > rowStartPos { @@ -152,9 +152,7 @@ impl BitMatrix { first_run = false; rowLength = bitsPos - rowStartPos; } else if bitsPos - rowStartPos != rowLength { - return Err(Exceptions::IllegalArgumentException(Some( - "row lengths do not match".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith("row lengths do not match")); } rowStartPos = bitsPos; nRows += 1; @@ -169,10 +167,10 @@ impl BitMatrix { bits[bitsPos] = false; bitsPos += 1; } else { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "illegal character encountered: {}", string_representation[pos..].to_owned() - )))); + ))); } } @@ -183,9 +181,7 @@ impl BitMatrix { // first_run = false; rowLength = bitsPos - rowStartPos; } else if bitsPos - rowStartPos != rowLength { - return Err(Exceptions::IllegalArgumentException(Some( - "row lengths do not match".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith("row lengths do not match")); } nRows += 1; } @@ -312,9 +308,9 @@ impl BitMatrix { pub fn xor(&mut self, mask: &BitMatrix) -> Result<()> { if self.width != mask.width || self.height != mask.height || self.row_size != mask.row_size { - return Err(Exceptions::IllegalArgumentException(Some( - "input matrix dimensions do not match".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "input matrix dimensions do not match", + )); } // let mut rowArray = BitArray::with_size(self.width as usize); for y in 0..self.height { @@ -358,16 +354,16 @@ impl BitMatrix { // )); // } if height < 1 || width < 1 { - return Err(Exceptions::IllegalArgumentException(Some( - "height and width must be at least 1".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "height and width must be at least 1", + )); } let right = left + width; let bottom = top + height; if bottom > self.height || right > self.width { - return Err(Exceptions::IllegalArgumentException(Some( - "the region must fit inside the matrix".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "the region must fit inside the matrix", + )); } for y in top..bottom { //for (int y = top; y < bottom; y++) { @@ -439,9 +435,9 @@ impl BitMatrix { self.rotate180(); Ok(()) } - _ => Err(Exceptions::IllegalArgumentException(Some( - "degrees must be a multiple of 0, 90, 180, or 270".to_owned(), - ))), + _ => Err(Exceptions::illegalArgumentWith( + "degrees must be a multiple of 0, 90, 180, or 270", + )), } } diff --git a/src/common/bit_source.rs b/src/common/bit_source.rs index 968329e..ae97e48 100644 --- a/src/common/bit_source.rs +++ b/src/common/bit_source.rs @@ -71,9 +71,7 @@ impl BitSource { */ pub fn readBits(&mut self, numBits: usize) -> Result { if !(1..=32).contains(&numBits) || numBits > self.available() { - return Err(Exceptions::IllegalArgumentException(Some( - numBits.to_string(), - ))); + return Err(Exceptions::illegalArgumentWith(numBits.to_string())); } let mut result: u32 = 0; diff --git a/src/common/character_set_eci.rs b/src/common/character_set_eci.rs index 87a149c..0d08479 100644 --- a/src/common/character_set_eci.rs +++ b/src/common/character_set_eci.rs @@ -245,9 +245,7 @@ impl CharacterSetECI { 28 => Ok(CharacterSetECI::Big5), 29 => Ok(CharacterSetECI::GB18030), 30 => Ok(CharacterSetECI::EUC_KR), - _ => Err(Exceptions::NotFoundException(Some( - "Bad ECI Value".to_owned(), - ))), + _ => Err(Exceptions::notFoundWith("Bad ECI Value")), } } diff --git a/src/common/default_grid_sampler.rs b/src/common/default_grid_sampler.rs index fd77a35..96886f7 100644 --- a/src/common/default_grid_sampler.rs +++ b/src/common/default_grid_sampler.rs @@ -68,7 +68,7 @@ impl GridSampler for DefaultGridSampler { transform: &PerspectiveTransform, ) -> Result { if dimensionX == 0 || dimensionY == 0 { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let mut bits = BitMatrix::new(dimensionX, dimensionY)?; let mut points = vec![0.0; 2 * dimensionX as usize]; @@ -93,15 +93,15 @@ impl GridSampler for DefaultGridSampler { // for (int x = 0; x < max; x += 2) { // if points[x] as u32 >= image.getWidth() || points[x + 1] as u32 >= image.getHeight() // { - // return Err(Exceptions::NotFoundException(Some( + // return Err(Exceptions::notFound( // "index out of bounds, see documentation in file for explanation".to_owned(), - // ))); + // )); // } if image .try_get(points[x] as u32, points[x + 1] as u32) - .ok_or(Exceptions::NotFoundException(Some( - "index out of bounds, see documentation in file for explanation".to_owned(), - )))? + .ok_or(Exceptions::notFoundWith( + "index out of bounds, see documentation in file for explanation", + ))? { // Black(-ish) pixel bits.set(x as u32 / 2, y); diff --git a/src/common/detector/monochrome_rectangle_detector.rs b/src/common/detector/monochrome_rectangle_detector.rs index 21fc072..c7dfc86 100644 --- a/src/common/detector/monochrome_rectangle_detector.rs +++ b/src/common/detector/monochrome_rectangle_detector.rs @@ -203,13 +203,13 @@ impl<'a> MonochromeRectangleDetector<'_> { } } } else { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } lastRange_z = range; y += deltaY; x += deltaX } - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } /** diff --git a/src/common/detector/white_rectangle_detector.rs b/src/common/detector/white_rectangle_detector.rs index 9a553b6..bb53065 100644 --- a/src/common/detector/white_rectangle_detector.rs +++ b/src/common/detector/white_rectangle_detector.rs @@ -78,7 +78,7 @@ impl<'a> WhiteRectangleDetector<'_> { || downInit >= image.getHeight() as i32 || rightInit >= image.getWidth() as i32 { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } Ok(WhiteRectangleDetector { @@ -224,7 +224,7 @@ impl<'a> WhiteRectangleDetector<'_> { } if z.is_none() { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let mut t: Option = None; @@ -242,7 +242,7 @@ impl<'a> WhiteRectangleDetector<'_> { } if t.is_none() { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let mut x: Option = None; @@ -260,7 +260,7 @@ impl<'a> WhiteRectangleDetector<'_> { } if x.is_none() { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let mut y: Option = None; @@ -278,12 +278,12 @@ impl<'a> WhiteRectangleDetector<'_> { } if y.is_none() { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } Ok(self.center_edges(y.unwrap(), z.unwrap(), x.unwrap(), t.unwrap())) } else { - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } } diff --git a/src/common/global_histogram_binarizer.rs b/src/common/global_histogram_binarizer.rs index a8757ba..82f2091 100644 --- a/src/common/global_histogram_binarizer.rs +++ b/src/common/global_histogram_binarizer.rs @@ -234,9 +234,9 @@ impl GlobalHistogramBinarizer { // If there is too little contrast in the image to pick a meaningful black point, throw rather // than waste time trying to decode the image, and risk false positives. if secondPeak - firstPeak <= numBuckets / 16 { - return Err(Exceptions::NotFoundException(Some( - "secondPeak - firstPeak <= numBuckets / 16 ".to_owned(), - ))); + return Err(Exceptions::notFoundWith( + "secondPeak - firstPeak <= numBuckets / 16 ", + )); } // Find a valley between them that is low and closer to the white peak. diff --git a/src/common/grid_sampler.rs b/src/common/grid_sampler.rs index 9bf7f47..f5cee06 100644 --- a/src/common/grid_sampler.rs +++ b/src/common/grid_sampler.rs @@ -146,7 +146,7 @@ pub trait GridSampler { let x = points[offset] as i32; let y = points[offset + 1] as i32; if x < -1 || x > width as i32 || y < -1 || y > height as i32 { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } nudged = false; if x == -1 { @@ -173,7 +173,7 @@ pub trait GridSampler { let x = points[offset as usize] as i32; let y = points[offset as usize + 1] as i32; if x < -1 || x > width as i32 || y < -1 || y > height as i32 { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } nudged = false; if x == -1 { diff --git a/src/common/minimal_eci_input.rs b/src/common/minimal_eci_input.rs index 1acbef9..881b18f 100644 --- a/src/common/minimal_eci_input.rs +++ b/src/common/minimal_eci_input.rs @@ -68,14 +68,12 @@ impl ECIInput for MinimalECIInput { */ fn charAt(&self, index: usize) -> Result { if index >= self.length() { - return Err(Exceptions::IndexOutOfBoundsException(Some( - index.to_string(), - ))); + return Err(Exceptions::indexOutOfBoundsWith(index.to_string())); } if self.isECI(index as u32)? { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "value at {index} is not a character but an ECI" - )))); + ))); } if self.isFNC1(index)? { Ok(self.fnc1 as u8 as char) @@ -106,15 +104,15 @@ impl ECIInput for MinimalECIInput { */ fn subSequence(&self, start: usize, end: usize) -> Result> { if start > end || end > self.length() { - return Err(Exceptions::IndexOutOfBoundsException(None)); + return Err(Exceptions::indexOutOfBounds); } let mut result = String::new(); for i in start..end { // for (int i = start; i < end; i++) { if self.isECI(i as u32)? { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "value at {i} is not a character but an ECI" - )))); + ))); } result.push_str(&self.charAt(i)?.to_string()); } @@ -134,7 +132,7 @@ impl ECIInput for MinimalECIInput { */ fn isECI(&self, index: u32) -> Result { if index >= self.length() as u32 { - return Err(Exceptions::IndexOutOfBoundsException(None)); + return Err(Exceptions::indexOutOfBounds); } Ok(self.bytes[index as usize] > 255) // && self.bytes[index as usize] <= u16::MAX) } @@ -159,12 +157,12 @@ impl ECIInput for MinimalECIInput { */ fn getECIValue(&self, index: usize) -> Result { if index >= self.length() { - return Err(Exceptions::IndexOutOfBoundsException(None)); + return Err(Exceptions::indexOutOfBounds); } if !self.isECI(index as u32)? { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "value at {index} is not an ECI but a character" - )))); + ))); } Ok((self.bytes[index] as u32 - 256) as i32) } @@ -251,7 +249,7 @@ impl MinimalECIInput { */ pub fn isFNC1(&self, index: usize) -> Result { if index >= self.length() { - return Err(Exceptions::IndexOutOfBoundsException(None)); + return Err(Exceptions::indexOutOfBounds); } Ok(self.bytes[index] == 1000) } diff --git a/src/common/otsu_level_binarizer.rs b/src/common/otsu_level_binarizer.rs index 35757ac..2fbe692 100644 --- a/src/common/otsu_level_binarizer.rs +++ b/src/common/otsu_level_binarizer.rs @@ -20,7 +20,7 @@ impl OtsuLevelBinarizer { fn generate_threshold_matrix(source: &dyn LuminanceSource) -> Result { let image_buffer = { let Some(buff) : Option,Vec>> = ImageBuffer::from_vec(source.getWidth() as u32, source.getHeight() as u32, source.getMatrix()) else { - return Err(Exceptions::IllegalArgumentException(None)) + return Err(Exceptions::illegalArgument) }; buff }; diff --git a/src/common/reedsolomon/generic_gf.rs b/src/common/reedsolomon/generic_gf.rs index 1759ab7..a7e0628 100644 --- a/src/common/reedsolomon/generic_gf.rs +++ b/src/common/reedsolomon/generic_gf.rs @@ -134,7 +134,7 @@ impl GenericGF { */ pub fn log(&self, a: i32) -> Result { if a == 0 { - return Err(Exceptions::IllegalArgumentException(None)); + return Err(Exceptions::illegalArgument); } // let pos: usize = a.try_into().unwrap(); Ok(self.logTable[a as usize]) @@ -145,7 +145,7 @@ impl GenericGF { */ pub fn inverse(&self, a: i32) -> Result { if a == 0 { - return Err(Exceptions::ArithmeticException(None)); + return Err(Exceptions::arithmetic); } let log_t_loc: usize = a as usize; let loc: usize = ((self.size as i32) - self.logTable[log_t_loc] - 1) as usize; diff --git a/src/common/reedsolomon/generic_gf_poly.rs b/src/common/reedsolomon/generic_gf_poly.rs index 1583ea7..0c6ee12 100644 --- a/src/common/reedsolomon/generic_gf_poly.rs +++ b/src/common/reedsolomon/generic_gf_poly.rs @@ -50,9 +50,9 @@ impl GenericGFPoly { */ pub fn new(field: GenericGFRef, coefficients: &[i32]) -> Result { if coefficients.is_empty() { - return Err(Exceptions::IllegalArgumentException(Some(String::from( + return Err(Exceptions::illegalArgumentWith( "coefficients cannot be empty", - )))); + )); } Ok(Self { field, @@ -141,9 +141,9 @@ impl GenericGFPoly { pub fn addOrSubtract(&self, other: &GenericGFPoly) -> Result { if self.field != other.field { - return Err(Exceptions::IllegalArgumentException(Some( - "GenericGFPolys do not have same GenericGF field".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "GenericGFPolys do not have same GenericGF field", + )); } if self.isZero() { return Ok(other.clone()); @@ -178,9 +178,9 @@ impl GenericGFPoly { pub fn multiply(&self, other: &GenericGFPoly) -> Result { if self.field != other.field { //if (!field.equals(other.field)) { - return Err(Exceptions::IllegalArgumentException(Some( - "GenericGFPolys do not have same GenericGF field".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "GenericGFPolys do not have same GenericGF field", + )); } if self.isZero() || other.isZero() { return Ok(self.getZero()); @@ -246,14 +246,12 @@ impl GenericGFPoly { pub fn divide(&self, other: &GenericGFPoly) -> Result<(GenericGFPoly, GenericGFPoly)> { if self.field != other.field { - return Err(Exceptions::IllegalArgumentException(Some( - "GenericGFPolys do not have same GenericGF field".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "GenericGFPolys do not have same GenericGF field", + )); } if other.isZero() { - return Err(Exceptions::IllegalArgumentException(Some( - "Divide by 0".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith("Divide by 0")); } let mut quotient = self.getZero(); @@ -262,11 +260,7 @@ impl GenericGFPoly { let denominator_leading_term = other.getCoefficient(other.getDegree()); let inverse_denominator_leading_term = match self.field.inverse(denominator_leading_term) { Ok(val) => val, - Err(_issue) => { - return Err(Exceptions::IllegalArgumentException(Some( - "arithmetic issue".to_owned(), - ))) - } + Err(_issue) => return Err(Exceptions::illegalArgumentWith("arithmetic issue")), }; while remainder.getDegree() >= other.getDegree() && !remainder.isZero() { diff --git a/src/common/reedsolomon/reedsolomon_decoder.rs b/src/common/reedsolomon/reedsolomon_decoder.rs index 354f7fd..50a0c5e 100644 --- a/src/common/reedsolomon/reedsolomon_decoder.rs +++ b/src/common/reedsolomon/reedsolomon_decoder.rs @@ -78,7 +78,7 @@ impl ReedSolomonDecoder { return Ok(0); } let Ok(syndrome) = GenericGFPoly::new(self.field, &syndromeCoefficients) else { - return Err(Exceptions::ReedSolomonException(None)); + return Err(Exceptions::reedSolomon); }; let sigmaOmega = self.runEuclideanAlgorithm( &GenericGF::buildMonomial(self.field, twoS as usize, 1), @@ -93,15 +93,11 @@ impl ReedSolomonDecoder { //for (int i = 0; i < errorLocations.length; i++) { let log_value = self.field.log(errorLocations[i] as i32)?; if log_value > received.len() as i32 - 1 { - return Err(Exceptions::ReedSolomonException(Some( - "Bad error location".to_owned(), - ))); + return Err(Exceptions::reedSolomonWith("Bad error location")); } let position: isize = received.len() as isize - 1 - log_value as isize; if position < 0 { - return Err(Exceptions::ReedSolomonException(Some( - "Bad error location".to_owned(), - ))); + return Err(Exceptions::reedSolomonWith("Bad error location")); } received[position as usize] = GenericGF::addOrSubtract(received[position as usize], errorMagnitudes[i]); @@ -139,9 +135,7 @@ impl ReedSolomonDecoder { // Divide rLastLast by rLast, with quotient in q and remainder in r if rLast.isZero() { // Oops, Euclidean algorithm already terminated? - return Err(Exceptions::ReedSolomonException(Some( - "r_{i-1} was zero".to_owned(), - ))); + return Err(Exceptions::reedSolomonWith("r_{i-1} was zero")); } r = rLastLast; let mut q = r.getZero(); @@ -159,26 +153,20 @@ impl ReedSolomonDecoder { t = (q.multiply(&tLast)?).addOrSubtract(&tLastLast)?; if r.getDegree() >= rLast.getDegree() { - return Err(Exceptions::ReedSolomonException(Some(format!( + return Err(Exceptions::reedSolomonWith(format!( "Division algorithm failed to reduce polynomial? r: {r}, rLast: {rLast}" - )))); + ))); } } let sigmaTildeAtZero = t.getCoefficient(0); if sigmaTildeAtZero == 0 { - return Err(Exceptions::ReedSolomonException(Some( - "sigmaTilde(0) was zero".to_owned(), - ))); + return Err(Exceptions::reedSolomonWith("sigmaTilde(0) was zero")); } let inverse = match self.field.inverse(sigmaTildeAtZero) { Ok(res) => res, - Err(_err) => { - return Err(Exceptions::ReedSolomonException(Some( - "ArithmetricException".to_owned(), - ))) - } + Err(_err) => return Err(Exceptions::reedSolomonWith("ArithmetricException")), }; let sigma = t.multiply_with_scalar(inverse); let omega = r.multiply_with_scalar(inverse); @@ -206,9 +194,9 @@ impl ReedSolomonDecoder { } } if e != numErrors { - return Err(Exceptions::ReedSolomonException(Some( - "Error locator degree does not match number of roots".to_owned(), - ))); + return Err(Exceptions::reedSolomonWith( + "Error locator degree does not match number of roots", + )); } Ok(result) } diff --git a/src/common/reedsolomon/reedsolomon_encoder.rs b/src/common/reedsolomon/reedsolomon_encoder.rs index 097caba..1b54556 100644 --- a/src/common/reedsolomon/reedsolomon_encoder.rs +++ b/src/common/reedsolomon/reedsolomon_encoder.rs @@ -74,15 +74,11 @@ impl ReedSolomonEncoder { pub fn encode(&mut self, to_encode: &mut Vec, ec_bytes: usize) -> Result<()> { if ec_bytes == 0 { - return Err(Exceptions::IllegalArgumentException(Some( - "No error correction bytes".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith("No error correction bytes")); } let data_bytes = to_encode.len() - ec_bytes; if data_bytes == 0 { - return Err(Exceptions::IllegalArgumentException(Some( - "No data bytes provided".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith("No data bytes provided")); } let fld = self.field; let generator = self.buildGenerator(ec_bytes); @@ -91,9 +87,7 @@ impl ReedSolomonEncoder { //System.arraycopy(toEncode, 0, infoCoefficients, 0, dataBytes); let mut info = GenericGFPoly::new(fld, &info_coefficients)?; info = info.multiply_by_monomial(ec_bytes, 1)?; - let remainder = &info - .divide(generator.ok_or(Exceptions::ReedSolomonException(None))?)? - .1; + let remainder = &info.divide(generator.ok_or(Exceptions::reedSolomon)?)?.1; let coefficients = remainder.getCoefficients(); let num_zero_coefficients = ec_bytes - coefficients.len(); for i in 0..num_zero_coefficients { diff --git a/src/datamatrix/data_matrix_reader.rs b/src/datamatrix/data_matrix_reader.rs index 40ebb6e..ae16eed 100644 --- a/src/datamatrix/data_matrix_reader.rs +++ b/src/datamatrix/data_matrix_reader.rs @@ -102,7 +102,7 @@ impl Reader for DataMatrixReader { DECODER.decode(&bits)? } } else { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); }; // decoderRXingResult = DECODER.decode(detectorRXingResult.getBits())?; @@ -178,10 +178,10 @@ impl DataMatrixReader { */ fn extractPureBits(&self, image: &BitMatrix) -> Result { let Some(leftTopBlack) = image.getTopLeftOnBit() else { - return Err(Exceptions::NotFoundException(None)) + return Err(Exceptions::notFound) }; let Some(rightBottomBlack) = image.getBottomRightOnBit()else { - return Err(Exceptions::NotFoundException(None)) + return Err(Exceptions::notFound) }; let moduleSize = Self::moduleSize(&leftTopBlack, image)?; @@ -194,7 +194,7 @@ impl DataMatrixReader { let matrixWidth = (right as i32 - left as i32 + 1) / moduleSize as i32; let matrixHeight = (bottom as i32 - top as i32 + 1) / moduleSize as i32; if matrixWidth <= 0 || matrixHeight <= 0 { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); // throw NotFoundException.getNotFoundInstance(); } @@ -231,12 +231,12 @@ impl DataMatrixReader { x += 1; } if x == width { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let moduleSize = x - leftTopBlack[0]; if moduleSize == 0 { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } Ok(moduleSize) diff --git a/src/datamatrix/data_matrix_writer.rs b/src/datamatrix/data_matrix_writer.rs index 520ce2f..c060f95 100644 --- a/src/datamatrix/data_matrix_writer.rs +++ b/src/datamatrix/data_matrix_writer.rs @@ -61,21 +61,19 @@ impl Writer for DataMatrixWriter { hints: &crate::EncodingHintDictionary, ) -> Result { if contents.is_empty() { - return Err(Exceptions::IllegalArgumentException(Some( - "Found empty contents".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith("Found empty contents")); } if format != &BarcodeFormat::DATA_MATRIX { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Can only encode DATA_MATRIX, but got {format:?}" - )))); + ))); } if width < 0 || height < 0 { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Requested dimensions can't be negative: {width}x{height}" - )))); + ))); } // Try to get force shape & min / max size @@ -124,7 +122,7 @@ impl Writer for DataMatrixWriter { if hasEncodingHint { let Some(EncodeHintValue::CharacterSet(char_set_name)) = hints.get(&EncodeHintType::CHARACTER_SET) else { - return Err(Exceptions::IllegalArgumentException(Some("charset does not exist".to_owned()))) + return Err(Exceptions::illegalArgumentWith("charset does not exist")) }; charset = encoding::label::encoding_from_whatwg_label(char_set_name); // charset = Charset.forName(hints.get(EncodeHintType.CHARACTER_SET).toString()); @@ -158,7 +156,7 @@ impl Writer for DataMatrixWriter { let symbol_lookup = SymbolInfoLookup::new(); let Some(symbolInfo) = symbol_lookup.lookup_with_codewords_shape_size_fail(encoded.chars().count() as u32, *shape, &minSize, &maxSize, true)? else { - return Err(Exceptions::NotFoundException(Some("symbol info is bad".to_owned()))) + return Err(Exceptions::notFoundWith("symbol info is bad")) }; //2. step: ECC generation diff --git a/src/datamatrix/decoder/bit_matrix_parser.rs b/src/datamatrix/decoder/bit_matrix_parser.rs index 44b26c8..f38845f 100644 --- a/src/datamatrix/decoder/bit_matrix_parser.rs +++ b/src/datamatrix/decoder/bit_matrix_parser.rs @@ -37,7 +37,7 @@ impl BitMatrixParser { pub fn new(bitMatrix: &BitMatrix) -> Result { let dimension = bitMatrix.getHeight(); if !(8..=144).contains(&dimension) || (dimension & 0x01) != 0 { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } let version = Self::readVersion(bitMatrix)?; @@ -181,7 +181,7 @@ impl BitMatrixParser { } if resultOffset != self.version.getTotalCodewords() as usize { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } Ok(result) @@ -456,9 +456,9 @@ impl BitMatrixParser { let symbolSizeColumns = version.getSymbolSizeColumns(); if bitMatrix.getHeight() != symbolSizeRows { - return Err(Exceptions::IllegalArgumentException(Some( - "Dimension of bitMatrix must match the version size".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "Dimension of bitMatrix must match the version size", + )); } let dataRegionSizeRows = version.getDataRegionSizeRows(); diff --git a/src/datamatrix/decoder/data_block.rs b/src/datamatrix/decoder/data_block.rs index c58d020..2f3ea05 100644 --- a/src/datamatrix/decoder/data_block.rs +++ b/src/datamatrix/decoder/data_block.rs @@ -139,7 +139,7 @@ impl DataBlock { } if rawCodewordsOffset != rawCodewords.len() { - return Err(Exceptions::IllegalArgumentException(None)); + return Err(Exceptions::illegalArgument); } Ok(result) diff --git a/src/datamatrix/decoder/decoded_bit_stream_parser.rs b/src/datamatrix/decoder/decoded_bit_stream_parser.rs index f542575..455e313 100644 --- a/src/datamatrix/decoder/decoded_bit_stream_parser.rs +++ b/src/datamatrix/decoder/decoded_bit_stream_parser.rs @@ -158,7 +158,7 @@ pub fn decode(bytes: &[u8], is_flipped: bool) -> Result { isECIencoded = true; // ECI detection only, atm continue decoding as ASCII mode = Mode::ASCII_ENCODE; } - _ => return Err(Exceptions::FormatException(None)), + _ => return Err(Exceptions::format), } if !(mode != Mode::PAD_ENCODE && bits.available() > 0) { @@ -225,16 +225,14 @@ fn decodeAsciiSegment( loop { let mut oneByte = bits.readBits(8)?; match oneByte { - 0 => return Err(Exceptions::FormatException(None)), + 0 => return Err(Exceptions::format), 1..=128 => { // ASCII data (ASCII value + 1) if upperShift { oneByte += 128; //upperShift = false; } - result.append_char( - char::from_u32(oneByte - 1).ok_or(Exceptions::ParseException(None))?, - ); + result.append_char(char::from_u32(oneByte - 1).ok_or(Exceptions::parse)?); return Ok(Mode::ASCII_ENCODE); } 129 => return Ok(Mode::PAD_ENCODE), // Pad @@ -280,9 +278,9 @@ fn decodeAsciiSegment( if !firstCodeword // Must be first ISO 16022:2006 5.6.1 { - return Err(Exceptions::FormatException(Some( - "structured append tag must be first code word".to_owned(), - ))); + return Err(Exceptions::formatWith( + "structured append tag must be first code word", + )); } parse_structured_append(bits, &mut sai)?; firstFNC1Position = 5; @@ -333,7 +331,7 @@ fn decodeAsciiSegment( // Not to be used in ASCII encodation // but work around encoders that end with 254, latch back to ASCII if oneByte != 254 || bits.available() != 0 { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } } } @@ -387,27 +385,22 @@ fn decodeC40Segment( let c40char = C40_BASIC_SET_CHARS[cValue as usize]; if upperShift { result.append_char( - char::from_u32(c40char as u32 + 128) - .ok_or(Exceptions::ParseException(None))?, + char::from_u32(c40char as u32 + 128).ok_or(Exceptions::parse)?, ); upperShift = false; } else { result.append_char(c40char); } } else { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } } 1 => { if upperShift { - result.append_char( - char::from_u32(cValue + 128).ok_or(Exceptions::ParseException(None))?, - ); + result.append_char(char::from_u32(cValue + 128).ok_or(Exceptions::parse)?); upperShift = false; } else { - result.append_char( - char::from_u32(cValue).ok_or(Exceptions::ParseException(None))?, - ); + result.append_char(char::from_u32(cValue).ok_or(Exceptions::parse)?); } shift = 0; } @@ -416,8 +409,7 @@ fn decodeC40Segment( let c40char = C40_SHIFT2_SET_CHARS[cValue as usize]; if upperShift { result.append_char( - char::from_u32(c40char as u32 + 128) - .ok_or(Exceptions::ParseException(None))?, + char::from_u32(c40char as u32 + 128).ok_or(Exceptions::parse)?, ); upperShift = false; } else { @@ -436,26 +428,22 @@ fn decodeC40Segment( upperShift = true } - _ => return Err(Exceptions::FormatException(None)), + _ => return Err(Exceptions::format), } } shift = 0; } 3 => { if upperShift { - result.append_char( - char::from_u32(cValue + 224).ok_or(Exceptions::ParseException(None))?, - ); + result.append_char(char::from_u32(cValue + 224).ok_or(Exceptions::parse)?); upperShift = false; } else { - result.append_char( - char::from_u32(cValue + 96).ok_or(Exceptions::ParseException(None))?, - ); + result.append_char(char::from_u32(cValue + 96).ok_or(Exceptions::parse)?); } shift = 0; } - _ => return Err(Exceptions::FormatException(None)), + _ => return Err(Exceptions::format), } } if bits.available() == 0 { @@ -504,27 +492,22 @@ fn decodeTextSegment( let textChar = TEXT_BASIC_SET_CHARS[cValue as usize]; if upperShift { result.append_char( - char::from_u32(textChar as u32 + 128) - .ok_or(Exceptions::ParseException(None))?, + char::from_u32(textChar as u32 + 128).ok_or(Exceptions::parse)?, ); upperShift = false; } else { result.append_char(textChar); } } else { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } } 1 => { if upperShift { - result.append_char( - char::from_u32(cValue + 128).ok_or(Exceptions::ParseException(None))?, - ); + result.append_char(char::from_u32(cValue + 128).ok_or(Exceptions::parse)?); upperShift = false; } else { - result.append_char( - char::from_u32(cValue).ok_or(Exceptions::ParseException(None))?, - ); + result.append_char(char::from_u32(cValue).ok_or(Exceptions::parse)?); } shift = 0; } @@ -535,8 +518,7 @@ fn decodeTextSegment( let textChar = TEXT_SHIFT2_SET_CHARS[cValue as usize]; if upperShift { result.append_char( - char::from_u32(textChar as u32 + 128) - .ok_or(Exceptions::ParseException(None))?, + char::from_u32(textChar as u32 + 128).ok_or(Exceptions::parse)?, ); upperShift = false; } else { @@ -555,7 +537,7 @@ fn decodeTextSegment( upperShift = true } - _ => return Err(Exceptions::FormatException(None)), + _ => return Err(Exceptions::format), } } shift = 0; @@ -565,8 +547,7 @@ fn decodeTextSegment( let textChar = TEXT_SHIFT3_SET_CHARS[cValue as usize]; if upperShift { result.append_char( - char::from_u32(textChar as u32 + 128) - .ok_or(Exceptions::ParseException(None))?, + char::from_u32(textChar as u32 + 128).ok_or(Exceptions::parse)?, ); upperShift = false; } else { @@ -574,11 +555,11 @@ fn decodeTextSegment( } shift = 0; } else { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } } - _ => return Err(Exceptions::FormatException(None)), + _ => return Err(Exceptions::format), } } if bits.available() == 0 { @@ -641,16 +622,12 @@ fn decodeAnsiX12Segment(bits: &mut BitSource, result: &mut ECIStringBuilder) -> _ => { if cValue < 14 { // 0 - 9 - result.append_char( - char::from_u32(cValue + 44).ok_or(Exceptions::ParseException(None))?, - ); + result.append_char(char::from_u32(cValue + 44).ok_or(Exceptions::parse)?); } else if cValue < 40 { // A - Z - result.append_char( - char::from_u32(cValue + 51).ok_or(Exceptions::ParseException(None))?, - ); + result.append_char(char::from_u32(cValue + 51).ok_or(Exceptions::parse)?); } else { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } } } @@ -702,8 +679,7 @@ fn decodeEdifactSegment(bits: &mut BitSource, result: &mut ECIStringBuilder) -> // no 1 in the leading (6th) bit edifactValue |= 0x40; // Add a leading 01 to the 6 bit binary value } - result - .append_char(char::from_u32(edifactValue).ok_or(Exceptions::ParseException(None))?); + result.append_char(char::from_u32(edifactValue).ok_or(Exceptions::parse)?); } if bits.available() == 0 { @@ -740,7 +716,7 @@ fn decodeBase256Segment( // We're seeing NegativeArraySizeException errors from users. // but we shouldn't in rust because it's unsigned // if count < 0 { - // return Err(Exceptions::FormatException(None)); + // return Err(Exceptions::formatEmpty()); // } let mut bytes = vec![0u8; count as usize]; @@ -748,7 +724,7 @@ fn decodeBase256Segment( // Have seen this particular error in the wild, such as at // http://www.bcgen.com/demo/IDAutomationStreamingDataMatrix.aspx?MODE=3&D=Fred&PFMT=3&PT=F&X=0.3&O=0&LM=0.2 if bits.available() < 8 { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } *byte = unrandomize255State(bits.readBits(8)?, codewordPosition) as u8; codewordPosition += 1; @@ -756,7 +732,7 @@ fn decodeBase256Segment( result.append_string( &encoding::all::ISO_8859_1 .decode(&bytes, encoding::DecoderTrap::Strict) - .map_err(|e| Exceptions::ParseException(Some(e.to_string())))?, + .map_err(|e| Exceptions::parseWith(e))?, ); byteSegments.push(bytes); diff --git a/src/datamatrix/decoder/version.rs b/src/datamatrix/decoder/version.rs index 2eb9b8f..72e983e 100644 --- a/src/datamatrix/decoder/version.rs +++ b/src/datamatrix/decoder/version.rs @@ -103,7 +103,7 @@ impl Version { */ pub fn getVersionForDimensions(numRows: u32, numColumns: u32) -> Result<&'static Version> { if (numRows & 0x01) != 0 || (numColumns & 0x01) != 0 { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } for version in VERSIONS.iter() { @@ -112,7 +112,7 @@ impl Version { } } - Err(Exceptions::FormatException(None)) + Err(Exceptions::format) } /** diff --git a/src/datamatrix/detector/datamatrix_detector.rs b/src/datamatrix/detector/datamatrix_detector.rs index f9bd048..bf7dcd8 100644 --- a/src/datamatrix/detector/datamatrix_detector.rs +++ b/src/datamatrix/detector/datamatrix_detector.rs @@ -55,9 +55,7 @@ impl<'a> Detector<'_> { if let Some(point) = self.correctTopRight(&points) { points[3] = point; } else { - return Err(Exceptions::NotFoundException(Some( - "point 4 unfound".to_owned(), - ))); + return Err(Exceptions::notFoundWith("point 4 unfound")); } // points[3] = self.correctTopRight(&points); // if points[3] == null { diff --git a/src/datamatrix/detector/zxing_cpp_detector/cpp_new_detector.rs b/src/datamatrix/detector/zxing_cpp_detector/cpp_new_detector.rs index d499263..885a98a 100644 --- a/src/datamatrix/detector/zxing_cpp_detector/cpp_new_detector.rs +++ b/src/datamatrix/detector/zxing_cpp_detector/cpp_new_detector.rs @@ -247,7 +247,7 @@ fn Scan( )); } - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } pub fn detect( @@ -351,6 +351,6 @@ pub fn detect( } // #ifndef __cpp_impl_coroutine - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) // #endif } diff --git a/src/datamatrix/detector/zxing_cpp_detector/dm_regression_line.rs b/src/datamatrix/detector/zxing_cpp_detector/dm_regression_line.rs index 2641409..0f0c375 100644 --- a/src/datamatrix/detector/zxing_cpp_detector/dm_regression_line.rs +++ b/src/datamatrix/detector/zxing_cpp_detector/dm_regression_line.rs @@ -76,7 +76,7 @@ impl RegressionLine for DMRegressionLine { fn add(&mut self, p: Point) -> Result<()> { if self.direction_inward == Point::default() { - return Err(Exceptions::IllegalStateException(None)); + return Err(Exceptions::illegalState); } self.points.push(p); if self.points.len() == 1 { @@ -237,7 +237,7 @@ impl DMRegressionLine { pub fn modules(&mut self, beg: Point, end: Point) -> Result { if self.points.len() <= 3 { - return Err(Exceptions::IllegalStateException(None)); + return Err(Exceptions::illegalState); } // re-evaluate and filter out all points too far away. required for the gapSizes calculation. @@ -263,12 +263,12 @@ impl DMRegressionLine { self.points .last() .copied() - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? - self .points .first() .copied() - .ok_or(Exceptions::IndexOutOfBoundsException(None))?, + .ok_or(Exceptions::indexOutOfBounds)?, )) as f64; // calculate the width of 2 modules (first black pixel to first black pixel) @@ -295,7 +295,7 @@ impl DMRegressionLine { self.points .last() .copied() - .ok_or(Exceptions::IndexOutOfBoundsException(None))?, + .ok_or(Exceptions::indexOutOfBounds)?, ), ) as f64, ); diff --git a/src/datamatrix/detector/zxing_cpp_detector/edge_tracer.rs b/src/datamatrix/detector/zxing_cpp_detector/edge_tracer.rs index aae5139..f709e1a 100644 --- a/src/datamatrix/detector/zxing_cpp_detector/edge_tracer.rs +++ b/src/datamatrix/detector/zxing_cpp_detector/edge_tracer.rs @@ -203,7 +203,7 @@ impl<'a> EdgeTracer<'_> { if self.whiteAt(pEdge) { // if we are not making any progress, we still have another endless loop bug if self.p == pEdge.centered() { - return Err(Exceptions::IllegalStateException(None)); + return Err(Exceptions::illegalState); } self.p = pEdge.centered(); @@ -274,7 +274,7 @@ impl<'a> EdgeTracer<'_> { .points() .first() .as_ref() - .ok_or(Exceptions::IndexOutOfBoundsException(None))?, + .ok_or(Exceptions::indexOutOfBounds)?, ) { return Ok(false); } @@ -304,9 +304,9 @@ impl<'a> EdgeTracer<'_> { .points() .last() .as_ref() - .ok_or(Exceptions::IndexOutOfBoundsException(None))?) + .ok_or(Exceptions::indexOutOfBounds)?) { - return Err(Exceptions::IllegalStateException(None)); + return Err(Exceptions::illegalState); } if !line.points().is_empty() && &&self.p @@ -314,7 +314,7 @@ impl<'a> EdgeTracer<'_> { .points() .last() .as_ref() - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? { return Ok(false); } @@ -358,7 +358,7 @@ impl<'a> EdgeTracer<'_> { line.points() .last() .copied() - .ok_or(Exceptions::IndexOutOfBoundsException(None))?, + .ok_or(Exceptions::indexOutOfBounds)?, ), ) < 1.0 { @@ -376,7 +376,7 @@ impl<'a> EdgeTracer<'_> { .points() .last() .copied() - .ok_or(Exceptions::IndexOutOfBoundsException(None))?, + .ok_or(Exceptions::indexOutOfBounds)?, ) }; line.add(self.p)?; @@ -393,7 +393,7 @@ impl<'a> EdgeTracer<'_> { .points() .first() .copied() - .ok_or(Exceptions::IndexOutOfBoundsException(None))?, + .ok_or(Exceptions::indexOutOfBounds)?, ) { return Ok(false); } diff --git a/src/datamatrix/detector/zxing_cpp_detector/util.rs b/src/datamatrix/detector/zxing_cpp_detector/util.rs index 22d87f9..28380cb 100644 --- a/src/datamatrix/detector/zxing_cpp_detector/util.rs +++ b/src/datamatrix/detector/zxing_cpp_detector/util.rs @@ -24,7 +24,7 @@ pub fn float_max(a: T, b: T) -> T { #[inline(always)] pub fn intersect(l1: &DMRegressionLine, l2: &DMRegressionLine) -> Result { if !(l1.isValid() && l2.isValid()) { - return Err(Exceptions::IllegalStateException(None)); + return Err(Exceptions::illegalState); } let d = l1.a * l2.b - l1.b * l2.a; let x = (l1.c * l2.b - l1.b * l2.c) / d; diff --git a/src/datamatrix/encoder/ascii_encoder.rs b/src/datamatrix/encoder/ascii_encoder.rs index b6a0def..df14f13 100644 --- a/src/datamatrix/encoder/ascii_encoder.rs +++ b/src/datamatrix/encoder/ascii_encoder.rs @@ -32,12 +32,12 @@ impl Encoder for ASCIIEncoder { .getMessage() .chars() .nth(context.pos as usize) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?, + .ok_or(Exceptions::indexOutOfBounds)?, context .getMessage() .chars() .nth(context.pos as usize + 1) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?, + .ok_or(Exceptions::indexOutOfBounds)?, )? as u8); context.pos += 2; } else { @@ -74,9 +74,9 @@ impl Encoder for ASCIIEncoder { } _ => { - return Err(Exceptions::IllegalStateException(Some(format!( + return Err(Exceptions::illegalStateWith(format!( "Illegal mode: {newMode}" - )))); + ))); } } } else if high_level_encoder::isExtendedASCII(c) { @@ -105,9 +105,9 @@ impl ASCIIEncoder { let num = (digit1 as u8 - 48) * 10 + (digit2 as u8 - 48); Ok((num + 130) as char) } else { - Err(Exceptions::IllegalArgumentException(Some(format!( + Err(Exceptions::illegalArgumentWith(format!( "not digits: {digit1}{digit2}" - )))) + ))) } } } diff --git a/src/datamatrix/encoder/base256_encoder.rs b/src/datamatrix/encoder/base256_encoder.rs index 0d7ada3..326e9cd 100644 --- a/src/datamatrix/encoder/base256_encoder.rs +++ b/src/datamatrix/encoder/base256_encoder.rs @@ -54,7 +54,7 @@ impl Encoder for Base256Encoder { context.updateSymbolInfoWithLength(currentSize); let mustPad = (context .getSymbolInfo() - .ok_or(Exceptions::IllegalStateException(None))? + .ok_or(Exceptions::illegalState)? .getDataCapacity() - currentSize as u32) > 0; @@ -63,29 +63,28 @@ impl Encoder for Base256Encoder { buffer.replace_range( 0..1, &char::from_u32(dataCount as u32) - .ok_or(Exceptions::ParseException(None))? + .ok_or(Exceptions::parse)? .to_string(), ); } else if dataCount <= 1555 { buffer.replace_range( 0..1, &char::from_u32((dataCount as u32 / 250) + 249) - .ok_or(Exceptions::ParseException(None))? + .ok_or(Exceptions::parse)? .to_string(), ); let (ci_pos, _) = buffer .char_indices() .nth(1) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?; + .ok_or(Exceptions::indexOutOfBounds)?; buffer.insert( ci_pos, - char::from_u32(dataCount as u32 % 250) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?, + char::from_u32(dataCount as u32 % 250).ok_or(Exceptions::indexOutOfBounds)?, ); } else { - return Err(Exceptions::IllegalStateException(Some(format!( + return Err(Exceptions::illegalStateWith(format!( "Message length not in valid ranges: {dataCount}" - )))); + ))); } } let c = buffer.chars().count(); @@ -93,13 +92,10 @@ impl Encoder for Base256Encoder { // for (int i = 0, c = buffer.length(); i < c; i++) { context.writeCodeword( Self::randomize255State( - buffer - .chars() - .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?, + buffer.chars().nth(i).ok_or(Exceptions::indexOutOfBounds)?, context.getCodewordCount() as u32 + 1, ) - .ok_or(Exceptions::ParseException(None))? as u8, + .ok_or(Exceptions::parse)? as u8, ); } Ok(()) diff --git a/src/datamatrix/encoder/c40_encoder.rs b/src/datamatrix/encoder/c40_encoder.rs index fa8bbce..7ee5a97 100644 --- a/src/datamatrix/encoder/c40_encoder.rs +++ b/src/datamatrix/encoder/c40_encoder.rs @@ -66,7 +66,7 @@ impl C40Encoder { context.updateSymbolInfoWithLength(curCodewordCount); let available = context .getSymbolInfo() - .ok_or(Exceptions::IllegalStateException(None))? + .ok_or(Exceptions::illegalState)? .getDataCapacity() as usize - curCodewordCount; @@ -141,7 +141,7 @@ impl C40Encoder { context.updateSymbolInfoWithLength(curCodewordCount); let available = context .getSymbolInfo() - .ok_or(Exceptions::IllegalStateException(None))? + .ok_or(Exceptions::illegalState)? .getDataCapacity() as usize - curCodewordCount; let rest = buffer.chars().count() % 3; @@ -205,7 +205,7 @@ impl C40Encoder { context.updateSymbolInfoWithLength(curCodewordCount); let available = context .getSymbolInfo() - .ok_or(Exceptions::IllegalStateException(None))? + .ok_or(Exceptions::illegalState)? .getDataCapacity() as usize - curCodewordCount; @@ -234,9 +234,9 @@ impl C40Encoder { context.writeCodeword(C40_UNLATCH); } } else { - return Err(Exceptions::IllegalStateException(Some( - "Unexpected case. Please report!".to_owned(), - ))); + return Err(Exceptions::illegalStateWith( + "Unexpected case. Please report!", + )); } context.signalEncoderChange(ASCII_ENCODATION); diff --git a/src/datamatrix/encoder/default_placement.rs b/src/datamatrix/encoder/default_placement.rs index 46137b5..fbdaacb 100644 --- a/src/datamatrix/encoder/default_placement.rs +++ b/src/datamatrix/encoder/default_placement.rs @@ -165,7 +165,7 @@ impl DefaultPlacement { .codewords .chars() .nth(pos) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? as u32; + .ok_or(Exceptions::indexOutOfBounds)? as u32; v &= 1 << (8 - bit); self.setBit(col as usize, row as usize, v != 0); diff --git a/src/datamatrix/encoder/edifact_encoder.rs b/src/datamatrix/encoder/edifact_encoder.rs index 88d3c1c..603c6c8 100644 --- a/src/datamatrix/encoder/edifact_encoder.rs +++ b/src/datamatrix/encoder/edifact_encoder.rs @@ -77,7 +77,7 @@ impl EdifactEncoder { context.updateSymbolInfo(); let mut available = context .getSymbolInfo() - .ok_or(Exceptions::IllegalStateException(None))? + .ok_or(Exceptions::illegalState)? .getDataCapacity() - context.getCodewordCount() as u32; let remaining = context.getRemainingCharacters(); @@ -86,7 +86,7 @@ impl EdifactEncoder { context.updateSymbolInfoWithLength(context.getCodewordCount() + 1); available = context .getSymbolInfo() - .ok_or(Exceptions::IllegalStateException(None))? + .ok_or(Exceptions::illegalState)? .getDataCapacity() - context.getCodewordCount() as u32; } @@ -96,9 +96,7 @@ impl EdifactEncoder { } if count > 4 { - return Err(Exceptions::IllegalStateException(Some( - "Count must not exceed 4".to_owned(), - ))); + return Err(Exceptions::illegalStateWith("Count must not exceed 4")); } let restChars = count - 1; let encoded = Self::encodeToCodewords(buffer)?; @@ -109,7 +107,7 @@ impl EdifactEncoder { context.updateSymbolInfoWithLength(context.getCodewordCount() + restChars); let available = context .getSymbolInfo() - .ok_or(Exceptions::IllegalStateException(None))? + .ok_or(Exceptions::illegalState)? .getDataCapacity() - context.getCodewordCount() as u32; if available >= 3 { @@ -150,32 +148,23 @@ impl EdifactEncoder { fn encodeToCodewords(sb: &str) -> Result { let len = sb.chars().count(); if len == 0 { - return Err(Exceptions::IllegalStateException(Some( - "StringBuilder must not be empty".to_owned(), - ))); + return Err(Exceptions::illegalStateWith( + "StringBuilder must not be empty", + )); } - let c1 = sb - .chars() - .next() - .ok_or(Exceptions::IndexOutOfBoundsException(None))?; + let c1 = sb.chars().next().ok_or(Exceptions::indexOutOfBounds)?; let c2 = if len >= 2 { - sb.chars() - .nth(1) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + sb.chars().nth(1).ok_or(Exceptions::indexOutOfBounds)? } else { 0 as char }; let c3 = if len >= 3 { - sb.chars() - .nth(2) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + sb.chars().nth(2).ok_or(Exceptions::indexOutOfBounds)? } else { 0 as char }; let c4 = if len >= 4 { - sb.chars() - .nth(3) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + sb.chars().nth(3).ok_or(Exceptions::indexOutOfBounds)? } else { 0 as char }; @@ -185,12 +174,12 @@ impl EdifactEncoder { let cw2 = (v >> 8) & 255; let cw3 = v & 255; let mut res = String::with_capacity(3); - res.push(char::from_u32(cw1).ok_or(Exceptions::IndexOutOfBoundsException(None))?); + res.push(char::from_u32(cw1).ok_or(Exceptions::indexOutOfBounds)?); if len >= 2 { - res.push(char::from_u32(cw2).ok_or(Exceptions::IndexOutOfBoundsException(None))?); + res.push(char::from_u32(cw2).ok_or(Exceptions::indexOutOfBounds)?); } if len >= 3 { - res.push(char::from_u32(cw3).ok_or(Exceptions::IndexOutOfBoundsException(None))?); + res.push(char::from_u32(cw3).ok_or(Exceptions::indexOutOfBounds)?); } Ok(res) diff --git a/src/datamatrix/encoder/encoder_context.rs b/src/datamatrix/encoder/encoder_context.rs index 0c1c5f0..bb49293 100644 --- a/src/datamatrix/encoder/encoder_context.rs +++ b/src/datamatrix/encoder/encoder_context.rs @@ -64,14 +64,12 @@ impl<'a> EncoderContext<'_> { ISO_8859_1_ENCODER .decode(&encoded_bytes, encoding::DecoderTrap::Strict) .map_err(|e| { - Exceptions::ParseException(Some(format!( - "round trip decode should always work: {e}" - ))) + Exceptions::parseWith(format!("round trip decode should always work: {e}")) })? } else { - return Err(Exceptions::IllegalArgumentException(Some( - "Message contains characters outside ISO-8859-1 encoding.".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "Message contains characters outside ISO-8859-1 encoding.", + )); }; Ok(Self { symbol_lookup: Rc::new(SymbolInfoLookup::new()), diff --git a/src/datamatrix/encoder/error_correction.rs b/src/datamatrix/encoder/error_correction.rs index 3a623e6..10d18ea 100644 --- a/src/datamatrix/encoder/error_correction.rs +++ b/src/datamatrix/encoder/error_correction.rs @@ -155,9 +155,9 @@ const ALOG: [u32; 255] = { */ pub fn encodeECC200(codewords: &str, symbolInfo: &SymbolInfo) -> Result { if codewords.chars().count() != symbolInfo.getDataCapacity() as usize { - return Err(Exceptions::IllegalArgumentException(Some( - "The number of codewords does not match the selected symbol".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "The number of codewords does not match the selected symbol", + )); } let mut sb = String::with_capacity( (symbolInfo.getDataCapacity() + symbolInfo.getErrorCodewords()) as usize, @@ -186,7 +186,7 @@ pub fn encodeECC200(codewords: &str, symbolInfo: &SymbolInfo) -> Result codewords .chars() .nth(d) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?, + .ok_or(Exceptions::indexOutOfBounds)?, ); d += blockCount; @@ -199,12 +199,12 @@ pub fn encodeECC200(codewords: &str, symbolInfo: &SymbolInfo) -> Result let (char_index, replace_char) = sb .char_indices() .nth(symbolInfo.getDataCapacity() as usize + e) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?; + .ok_or(Exceptions::indexOutOfBounds)?; sb.replace_range( char_index..(replace_char.len_utf8()), &ecc.chars() .nth(pos) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? .to_string(), ); // sb.setCharAt(symbolInfo.getDataCapacity() + e, ecc.charAt(pos)); @@ -229,9 +229,9 @@ fn createECCBlock(codewords: &str, numECWords: usize) -> Result { } } if table < 0 { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Illegal number of error correction codewords specified: {numECWords}" - )))); + ))); } let poly = &FACTORS[table as usize]; let mut ecc = vec![0 as char; numECWords]; @@ -245,21 +245,21 @@ fn createECCBlock(codewords: &str, numECWords: usize) -> Result { ^ codewords .chars() .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? as usize; + .ok_or(Exceptions::indexOutOfBounds)? as usize; for k in (1..numECWords).rev() { // for (int k = numECWords - 1; k > 0; k--) { if m != 0 && poly[k] != 0 { ecc[k] = char::from_u32( ecc[k - 1] as u32 ^ ALOG[(LOG[m] + LOG[poly[k] as usize]) as usize % 255], ) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?; + .ok_or(Exceptions::indexOutOfBounds)?; } else { ecc[k] = ecc[k - 1]; } } if m != 0 && poly[0] != 0 { ecc[0] = char::from_u32(ALOG[(LOG[m] + LOG[poly[0] as usize]) as usize % 255]) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?; + .ok_or(Exceptions::indexOutOfBounds)?; } else { ecc[0] = 0 as char; } diff --git a/src/datamatrix/encoder/high_level_encoder.rs b/src/datamatrix/encoder/high_level_encoder.rs index 5baa97b..a25ac82 100644 --- a/src/datamatrix/encoder/high_level_encoder.rs +++ b/src/datamatrix/encoder/high_level_encoder.rs @@ -222,18 +222,14 @@ pub fn encodeHighLevelWithDimensionForceC40WithSymbolInfoLookup( if forceC40 { c40Encoder.encodeMaximalC40(&mut context)?; - encodingMode = context - .getNewEncoding() - .ok_or(Exceptions::IllegalStateException(None))?; + encodingMode = context.getNewEncoding().ok_or(Exceptions::illegalState)?; context.resetEncoderSignal(); } while context.hasMoreCharacters() { encoders[encodingMode].encode(&mut context)?; if context.getNewEncoding().is_some() { - encodingMode = context - .getNewEncoding() - .ok_or(Exceptions::IllegalStateException(None))?; + encodingMode = context.getNewEncoding().ok_or(Exceptions::illegalState)?; context.resetEncoderSignal(); } } @@ -241,7 +237,7 @@ pub fn encodeHighLevelWithDimensionForceC40WithSymbolInfoLookup( context.updateSymbolInfo(); let capacity = context .getSymbolInfo() - .ok_or(Exceptions::IllegalStateException(None))? + .ok_or(Exceptions::illegalState)? .getDataCapacity(); if len < capacity as usize && encodingMode != ASCII_ENCODATION @@ -612,7 +608,7 @@ pub fn determineConsecutiveDigitCount(msg: &str, startpos: u32) -> u32 { pub fn illegalCharacter(c: char) -> Result<()> { // let hex = Integer.toHexString(c); // hex = "0000".substring(0, 4 - hex.length()) + hex; - Err(Exceptions::IllegalArgumentException(Some(format!( + Err(Exceptions::illegalArgumentWith(format!( "Illegal character: {c} (0x{c})" - )))) + ))) } diff --git a/src/datamatrix/encoder/minimal_encoder.rs b/src/datamatrix/encoder/minimal_encoder.rs index bd7f84f..248a670 100755 --- a/src/datamatrix/encoder/minimal_encoder.rs +++ b/src/datamatrix/encoder/minimal_encoder.rs @@ -218,7 +218,7 @@ fn addEdge(edges: &mut [Vec>>], edge: Rc) -> Result<()> { if edges[vertexIndex][edge.getEndMode()?.ordinal()].is_none() || edges[vertexIndex][edge.getEndMode()?.ordinal()] .as_ref() - .ok_or(Exceptions::IllegalStateException(None))? + .ok_or(Exceptions::illegalState)? .cachedTotalSize > edge.cachedTotalSize { @@ -635,9 +635,9 @@ fn encodeMinimally(input: Rc) -> Result { } if minimalJ < 0 { - return Err(Exceptions::IllegalStateException(Some(format!( + return Err(Exceptions::illegalStateWith(format!( "Internal error: failed to encode \"{input}\"" - )))); + ))); } RXingResult::new(edges[inputLength][minimalJ as usize].clone()) } @@ -669,7 +669,7 @@ impl Edge { previous: Option>, ) -> Result { if fromPosition + characterLength > input.length() as u32 { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } let mut size = if let Some(previous) = previous.clone() { @@ -1276,7 +1276,7 @@ impl RXingResult { let solution = if let Some(edge) = solution { edge } else { - return Err(Exceptions::IllegalArgumentException(None)); + return Err(Exceptions::illegalArgument); }; let input = solution.input.clone(); let mut size = 0; diff --git a/src/datamatrix/encoder/symbol_info.rs b/src/datamatrix/encoder/symbol_info.rs index d3c4d6e..1975385 100644 --- a/src/datamatrix/encoder/symbol_info.rs +++ b/src/datamatrix/encoder/symbol_info.rs @@ -129,9 +129,9 @@ impl SymbolInfo { 2 | 4 => Ok(2), 16 => Ok(4), 36 => Ok(6), - _ => Err(Exceptions::IllegalStateException(Some( - "Cannot handle this number of data regions".to_owned(), - ))), + _ => Err(Exceptions::illegalStateWith( + "Cannot handle this number of data regions", + )), } } @@ -141,9 +141,9 @@ impl SymbolInfo { 4 => Ok(2), 16 => Ok(4), 36 => Ok(6), - _ => Err(Exceptions::IllegalStateException(Some( - "Cannot handle this number of data regions".to_owned(), - ))), + _ => Err(Exceptions::illegalStateWith( + "Cannot handle this number of data regions", + )), } } @@ -311,9 +311,9 @@ impl<'a> SymbolInfoLookup<'a> { } } if fail { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Can't find a symbol arrangement that matches the message. Data codewords: {dataCodewords}" - )))); + ))); } Ok(None) } diff --git a/src/datamatrix/encoder/x12_encoder.rs b/src/datamatrix/encoder/x12_encoder.rs index fd55031..174c81a 100644 --- a/src/datamatrix/encoder/x12_encoder.rs +++ b/src/datamatrix/encoder/x12_encoder.rs @@ -82,7 +82,7 @@ impl X12Encoder { context.updateSymbolInfo(); let available = context .getSymbolInfo() - .ok_or(Exceptions::IllegalStateException(None))? + .ok_or(Exceptions::illegalState)? .getDataCapacity() - context.getCodewordCount() as u32; let count = buffer.chars().count(); diff --git a/src/exceptions.rs b/src/exceptions.rs index b0c4c30..e33197a 100644 --- a/src/exceptions.rs +++ b/src/exceptions.rs @@ -22,6 +22,74 @@ pub enum Exceptions { ReaderDecodeException(), } +#[allow(non_upper_case_globals)] +impl Exceptions { + pub const illegalArgument: Self = Self::IllegalArgumentException(None); + pub fn illegalArgumentWith>(x: I) -> Self { + Self::IllegalArgumentException(Some(x.into())) + } + + pub const unsupportedOperation: Self = Self::UnsupportedOperationException(None); + pub fn unsupportedOperationWith>(x: I) -> Self { + Self::UnsupportedOperationException(Some(x.into())) + } + + pub const illegalState: Self = Self::IllegalStateException(None); + pub fn illegalStateWith>(x: I) -> Self { + Self::IllegalStateException(Some(x.into())) + } + + pub const arithmetic: Self = Self::ArithmeticException(None); + pub fn arithmeticWith>(x: I) -> Self { + Self::ArithmeticException(Some(x.into())) + } + + pub const notFound: Self = Self::NotFoundException(None); + pub fn notFoundWith>(x: I) -> Self { + Self::NotFoundException(Some(x.into())) + } + + pub const format: Self = Self::FormatException(None); + pub fn formatWith>(x: I) -> Self { + Self::FormatException(Some(x.into())) + } + + pub const checksum: Self = Self::ChecksumException(None); + pub fn checksumWith>(x: I) -> Self { + Self::ChecksumException(Some(x.into())) + } + + pub const reader: Self = Self::ReaderException(None); + pub fn readerWith>(x: I) -> Self { + Self::ReaderException(Some(x.into())) + } + + pub const writer: Self = Self::WriterException(None); + pub fn writerWith>(x: I) -> Self { + Self::WriterException(Some(x.into())) + } + + pub const reedSolomon: Self = Self::ReedSolomonException(None); + pub fn reedSolomonWith>(x: I) -> Self { + Self::ReedSolomonException(Some(x.into())) + } + + pub const indexOutOfBounds: Self = Self::IndexOutOfBoundsException(None); + pub fn indexOutOfBoundsWith>(x: I) -> Self { + Self::IndexOutOfBoundsException(Some(x.into())) + } + + pub const runtime: Self = Self::RuntimeException(None); + pub fn runtimeWith>(x: I) -> Self { + Self::RuntimeException(Some(x.into())) + } + + pub const parse: Self = Self::ParseException(None); + pub fn parseWith>(x: I) -> Self { + Self::ParseException(Some(x.into())) + } +} + impl fmt::Display for Exceptions { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { diff --git a/src/helpers.rs b/src/helpers.rs index 02e694b..8cc2ab7 100644 --- a/src/helpers.rs +++ b/src/helpers.rs @@ -32,20 +32,16 @@ pub fn detect_in_svg_with_hints( let path = PathBuf::from(file_name); if !path.exists() { - return Err(Exceptions::IllegalArgumentException(Some( - "file does not exist".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith("file does not exist")); } let Ok(mut file) = File::open(path) else { - return Err(Exceptions::IllegalArgumentException(Some("file cannot be opened".to_owned()))); + return Err(Exceptions::illegalArgumentWith("file cannot be opened")); }; let mut svg_data = Vec::new(); if file.read_to_end(&mut svg_data).is_err() { - return Err(Exceptions::IllegalArgumentException(Some( - "file cannot be read".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith("file cannot be read")); } let mut multi_format_reader = MultiFormatReader::default(); @@ -85,20 +81,16 @@ pub fn detect_multiple_in_svg_with_hints( let path = PathBuf::from(file_name); if !path.exists() { - return Err(Exceptions::IllegalArgumentException(Some( - "file does not exist".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith("file does not exist")); } let Ok(mut file) = File::open(path) else { - return Err(Exceptions::IllegalArgumentException(Some("file cannot be opened".to_owned()))); + return Err(Exceptions::illegalArgumentWith("file cannot be opened")); }; let mut svg_data = Vec::new(); if file.read_to_end(&mut svg_data).is_err() { - return Err(Exceptions::IllegalArgumentException(Some( - "file cannot be read".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith("file cannot be read")); } let multi_format_reader = MultiFormatReader::default(); @@ -128,7 +120,7 @@ pub fn detect_in_file_with_hints( hints: &mut DecodingHintDictionary, ) -> Result { let Ok(img) = image::open(file_name) else { - return Err(Exceptions::IllegalArgumentException(Some(format!("file '{file_name}' not found or cannot be opened")))); + return Err(Exceptions::illegalArgumentWith(format!("file '{file_name}' not found or cannot be opened"))); }; let mut multi_format_reader = MultiFormatReader::default(); @@ -246,9 +238,9 @@ pub fn save_image(file_name: &str, bit_matrix: &BitMatrix) -> Result<()> { let image: image::DynamicImage = bit_matrix.into(); match image.save(file_name) { Ok(_) => Ok(()), - Err(err) => Err(Exceptions::IllegalArgumentException(Some(format!( + Err(err) => Err(Exceptions::illegalArgumentWith(format!( "could not save file '{file_name}': {err}" - )))), + ))), } } @@ -258,10 +250,10 @@ pub fn save_svg(file_name: &str, bit_matrix: &BitMatrix) -> Result<()> { match svg::save(file_name, &svg) { Ok(_) => Ok(()), - Err(err) => Err(Exceptions::IllegalArgumentException(Some(format!( + Err(err) => Err(Exceptions::illegalArgumentWith(format!( "could not save file '{}': {}", file_name, err - )))), + ))), } } @@ -293,8 +285,8 @@ pub fn save_file(file_name: &str, bit_matrix: &BitMatrix) -> Result<()> { Ok(()) }() { Ok(_) => Ok(()), - Err(_) => Err(Exceptions::IllegalArgumentException(Some(format!( + Err(_) => Err(Exceptions::illegalArgumentWith(format!( "could not write to '{file_name}'" - )))), + ))), } } diff --git a/src/maxicode/decoder/decoded_bit_stream_parser.rs b/src/maxicode/decoder/decoded_bit_stream_parser.rs index 7120ecb..14c1d18 100644 --- a/src/maxicode/decoder/decoded_bit_stream_parser.rs +++ b/src/maxicode/decoder/decoded_bit_stream_parser.rs @@ -89,7 +89,7 @@ pub fn decode(bytes: &[u8], mode: u8) -> Result { let pc = getPostCode2(bytes); let ps2Length = getPostCode2Length(bytes) as usize; if ps2Length > 10 { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } // NumberFormat df = new DecimalFormat("0000000000".substring(0, ps2Length)); // postcode = df.format(pc); diff --git a/src/maxicode/decoder/maxicode_decoder.rs b/src/maxicode/decoder/maxicode_decoder.rs index d77c05d..95bbf41 100644 --- a/src/maxicode/decoder/maxicode_decoder.rs +++ b/src/maxicode/decoder/maxicode_decoder.rs @@ -70,7 +70,7 @@ pub fn decode_with_hints( correctErrors(&mut codewords, 20, 68, 56, ODD)?; datawords = vec![0u8; 78]; } - _ => return Err(Exceptions::NotFoundException(None)), + _ => return Err(Exceptions::notFound), } datawords[0..10].clone_from_slice(&codewords[0..10]); diff --git a/src/maxicode/detector.rs b/src/maxicode/detector.rs index de1a0d7..d0bfc0d 100644 --- a/src/maxicode/detector.rs +++ b/src/maxicode/detector.rs @@ -316,7 +316,7 @@ impl Circle<'_> { pub fn detect(image: &BitMatrix, try_harder: bool) -> Result { // find concentric circles let Some( mut circles) = find_concentric_circles(image) else { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); }; // we should have an idea where the center is at this point, @@ -339,7 +339,7 @@ pub fn detect(image: &BitMatrix, try_harder: bool) -> Result Result Result Result<([(f32, f32); 4] #[cfg(feature = "experimental_features")] if is_ellipse { // we don't deal with ellipses yet - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let mut final_rotation = 0.0; diff --git a/src/maxicode/maxi_code_reader.rs b/src/maxicode/maxi_code_reader.rs index 1f5ab77..d024110 100644 --- a/src/maxicode/maxi_code_reader.rs +++ b/src/maxicode/maxi_code_reader.rs @@ -123,11 +123,10 @@ impl MaxiCodeReader { fn extractPureBits(image: &BitMatrix) -> Result { let enclosingRectangleOption = image.getEnclosingRectangle(); if enclosingRectangleOption.is_none() { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } - let enclosingRectangle = - enclosingRectangleOption.ok_or(Exceptions::NotFoundException(None))?; + let enclosingRectangle = enclosingRectangleOption.ok_or(Exceptions::notFound)?; let left = enclosingRectangle[0]; let top = enclosingRectangle[1]; diff --git a/src/multi/generic_multiple_barcode_reader.rs b/src/multi/generic_multiple_barcode_reader.rs index af6b201..a9b2910 100644 --- a/src/multi/generic_multiple_barcode_reader.rs +++ b/src/multi/generic_multiple_barcode_reader.rs @@ -56,7 +56,7 @@ impl MultipleBarcodeReader for GenericMultipleBarcodeReader { let mut results = Vec::new(); self.doDecodeMultiple(image, hints, &mut results, 0, 0, 0); if results.is_empty() { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } Ok(results) } diff --git a/src/multi/qrcode/detector/multi_detector.rs b/src/multi/qrcode/detector/multi_detector.rs index aabae83..26eb4f5 100644 --- a/src/multi/qrcode/detector/multi_detector.rs +++ b/src/multi/qrcode/detector/multi_detector.rs @@ -50,7 +50,7 @@ impl<'a> MultiDetector<'_> { let infos = finder.findMulti(hints)?; if infos.is_empty() { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let mut result = Vec::new(); diff --git a/src/multi/qrcode/detector/multi_finder_pattern_finder.rs b/src/multi/qrcode/detector/multi_finder_pattern_finder.rs index 9e5da69..8065bac 100644 --- a/src/multi/qrcode/detector/multi_finder_pattern_finder.rs +++ b/src/multi/qrcode/detector/multi_finder_pattern_finder.rs @@ -92,9 +92,9 @@ impl<'a> MultiFinderPatternFinder<'_> { if size < 3 { // Couldn't find enough finder patterns - return Err(Exceptions::NotFoundException(Some( - "Couldn't find enough finder patterns".to_owned(), - ))); + return Err(Exceptions::notFoundWith( + "Couldn't find enough finder patterns", + )); } /* @@ -212,7 +212,7 @@ impl<'a> MultiFinderPatternFinder<'_> { if !results.is_empty() { Ok(results) } else { - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } } diff --git a/src/multi/qrcode/qr_code_multi_reader.rs b/src/multi/qrcode/qr_code_multi_reader.rs index 67eed66..4b8b259 100644 --- a/src/multi/qrcode/qr_code_multi_reader.rs +++ b/src/multi/qrcode/qr_code_multi_reader.rs @@ -111,7 +111,7 @@ impl MultipleBarcodeReader for QRCodeMultiReader { // ignore and continue continue; } else { - return Err(output.err().unwrap_or(Exceptions::NotFoundException(None))); + return Err(output.err().unwrap_or(Exceptions::notFound)); } } diff --git a/src/multi_format_reader.rs b/src/multi_format_reader.rs index e74df4e..23cd8d9 100644 --- a/src/multi_format_reader.rs +++ b/src/multi_format_reader.rs @@ -187,6 +187,6 @@ impl MultiFormatReader { } } } - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } } diff --git a/src/multi_format_writer.rs b/src/multi_format_writer.rs index a6e3d61..fecf30e 100644 --- a/src/multi_format_writer.rs +++ b/src/multi_format_writer.rs @@ -72,9 +72,9 @@ impl Writer for MultiFormatWriter { BarcodeFormat::DATA_MATRIX => Box::::default(), BarcodeFormat::AZTEC => Box::::default(), _ => { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "No encoder available for format {format:?}" - )))) + ))) } }; diff --git a/src/oned/coda_bar_reader.rs b/src/oned/coda_bar_reader.rs index dccb79b..c16a0d1 100644 --- a/src/oned/coda_bar_reader.rs +++ b/src/oned/coda_bar_reader.rs @@ -65,13 +65,13 @@ impl OneDReader for CodaBarReader { loop { let charOffset = self.toNarrowWidePattern(nextStart); if charOffset == -1 { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } // Hack: We store the position in the alphabet table into a // StringBuilder, so that we can access the decoded patterns in // validatePattern. We'll translate to the actual characters later. self.decodeRowRXingResult - .push(char::from_u32(charOffset as u32).ok_or(Exceptions::ParseException(None))?); + .push(char::from_u32(charOffset as u32).ok_or(Exceptions::parse)?); nextStart += 8; // Stop as soon as we see the end character. if self.decodeRowRXingResult.chars().count() > 1 @@ -99,7 +99,7 @@ impl OneDReader for CodaBarReader { // otherwise this is probably a false positive. The exception is if we are // at the end of the row. (I.e. the barcode barely fits.) if nextStart < self.counterLength && trailingWhitespace < lastPatternSize / 2 { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } self.validatePattern(startOffset)?; @@ -113,8 +113,7 @@ impl OneDReader for CodaBarReader { .decodeRowRXingResult .chars() .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? - as usize] + .ok_or(Exceptions::indexOutOfBounds)? as usize] .to_string(), ); } @@ -123,23 +122,23 @@ impl OneDReader for CodaBarReader { .decodeRowRXingResult .chars() .next() - .ok_or(Exceptions::IndexOutOfBoundsException(None))?; + .ok_or(Exceptions::indexOutOfBounds)?; if !Self::arrayContains(&Self::STARTEND_ENCODING, startchar) { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let endchar = self .decodeRowRXingResult .chars() .nth(self.decodeRowRXingResult.chars().count() - 1) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?; + .ok_or(Exceptions::indexOutOfBounds)?; if !Self::arrayContains(&Self::STARTEND_ENCODING, endchar) { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } // remove stop/start characters character and check if a long enough string is contained if (self.decodeRowRXingResult.chars().count()) <= Self::MIN_CHARACTER_LENGTH as usize { // Almost surely a false positive ( start + stop + at least 1 character) - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } if !matches!( @@ -243,7 +242,7 @@ impl CodaBarReader { .decodeRowRXingResult .chars() .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? as usize]; for j in (0_usize..=6).rev() { // Even j = bars, while odd j = spaces. Categories 2 and 3 are for @@ -282,7 +281,7 @@ impl CodaBarReader { .decodeRowRXingResult .chars() .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? as usize]; for j in (0usize..=6).rev() { // Even j = bars, while odd j = spaces. Categories 2 and 3 are for @@ -290,7 +289,7 @@ impl CodaBarReader { let category = (j & 1) + ((pattern as usize) & 1) * 2; let size = self.counters[(pos + j)]; if (size as f32) < mins[category] || (size as f32) > maxes[category] { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } pattern >>= 1; } @@ -311,7 +310,7 @@ impl CodaBarReader { let mut i = row.getNextUnset(0); let end = row.getSize(); if i >= end { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let mut isWhite = true; let mut count = 0; @@ -363,7 +362,7 @@ impl CodaBarReader { i += 2; } - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } pub fn arrayContains(array: &[char], key: char) -> bool { diff --git a/src/oned/coda_bar_writer.rs b/src/oned/coda_bar_writer.rs index be15305..a57a4a9 100644 --- a/src/oned/coda_bar_writer.rs +++ b/src/oned/coda_bar_writer.rs @@ -44,12 +44,12 @@ impl OneDimensionalCodeWriter for CodaBarWriter { let firstChar = contents .chars() .next() - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? .to_ascii_uppercase(); let lastChar = contents .chars() .nth(contents.chars().count() - 1) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? .to_ascii_uppercase(); let startsNormal = CodaBarReader::arrayContains(&START_END_CHARS, firstChar); let endsNormal = CodaBarReader::arrayContains(&START_END_CHARS, lastChar); @@ -57,26 +57,26 @@ impl OneDimensionalCodeWriter for CodaBarWriter { let endsAlt = CodaBarReader::arrayContains(&ALT_START_END_CHARS, lastChar); if startsNormal { if !endsNormal { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Invalid start/end guards: {contents}" - )))); + ))); } // else already has valid start/end contents.to_owned() } else if startsAlt { if !endsAlt { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Invalid start/end guards: {contents}" - )))); + ))); } // else already has valid start/end contents.to_owned() } else { // Doesn't start with a guard if endsNormal || endsAlt { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Invalid start/end guards: {contents}" - )))); + ))); } // else doesn't end with guard either, so add a default format!("{DEFAULT_GUARD}{contents}{DEFAULT_GUARD}") @@ -94,9 +94,9 @@ impl OneDimensionalCodeWriter for CodaBarWriter { ) { resultLength += 10; } else { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Cannot encode : '{ch}'" - )))); + ))); } } // A blank is placed between each character. @@ -109,7 +109,7 @@ impl OneDimensionalCodeWriter for CodaBarWriter { let mut c = contents .chars() .nth(index) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? .to_ascii_uppercase(); if index == 0 || index == contents.chars().count() - 1 { // The start/end chars are not in the CodaBarReader.ALPHABET. diff --git a/src/oned/code_128_reader.rs b/src/oned/code_128_reader.rs index f5cd128..ed6d8b8 100644 --- a/src/oned/code_128_reader.rs +++ b/src/oned/code_128_reader.rs @@ -53,7 +53,7 @@ impl OneDReader for Code128Reader { CODE_START_A => CODE_CODE_A, CODE_START_B => CODE_CODE_B, CODE_START_C => CODE_CODE_C, - _ => return Err(Exceptions::FormatException(None)), + _ => return Err(Exceptions::format), }; let mut done = false; @@ -103,9 +103,7 @@ impl OneDReader for Code128Reader { // Take care of illegal start codes match code { - CODE_START_A | CODE_START_B | CODE_START_C => { - return Err(Exceptions::FormatException(None)) - } + CODE_START_A | CODE_START_B | CODE_START_C => return Err(Exceptions::format), _ => {} } @@ -299,21 +297,21 @@ impl OneDReader for Code128Reader { row.getSize().min(nextStart + (nextStart - lastStart) / 2), false, )? { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } // Pull out from sum the value of the penultimate check code checksumTotal -= multiplier as usize * lastCode as usize; // lastCode is the checksum then: if (checksumTotal % 103) as u8 != lastCode { - return Err(Exceptions::ChecksumException(None)); + return Err(Exceptions::checksum); } // Need to pull out the check digits from string let resultLength = result.chars().count(); if resultLength == 0 { // false positive - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } // Only bother if the result had at least one character, and if the checksum digit happened to @@ -334,9 +332,7 @@ impl OneDReader for Code128Reader { let rawCodesSize = rawCodes.len(); let mut rawBytes = vec![0u8; rawCodesSize]; for (i, rawByte) in rawBytes.iter_mut().enumerate().take(rawCodesSize) { - *rawByte = *rawCodes - .get(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?; + *rawByte = *rawCodes.get(i).ok_or(Exceptions::indexOutOfBounds)?; } let mut resultObject = RXingResult::new( &result, @@ -410,7 +406,7 @@ impl Code128Reader { } } - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } fn decodeCode(&self, row: &BitArray, counters: &mut [u32; 6], rowOffset: usize) -> Result { @@ -430,7 +426,7 @@ impl Code128Reader { if bestMatch >= 0 { Ok(bestMatch as u8) } else { - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } } } diff --git a/src/oned/code_128_writer.rs b/src/oned/code_128_writer.rs index 3515045..d6ff6d8 100644 --- a/src/oned/code_128_writer.rs +++ b/src/oned/code_128_writer.rs @@ -100,23 +100,23 @@ fn check(contents: &str, hints: &crate::EncodingHintDictionary) -> Result { let length = contents.chars().count(); // Check length if !(1..=80).contains(&length) { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Contents length should be between 1 and 80 characters, but got {length}" - )))); + ))); } // Check for forced code set hint. let mut forcedCodeSet = -1_i32; if hints.contains_key(&EncodeHintType::FORCE_CODE_SET) { - let Some(EncodeHintValue::ForceCodeSet(codeSetHint)) = hints.get(&EncodeHintType::FORCE_CODE_SET) else { return Err(Exceptions::IllegalStateException(None)) }; + let Some(EncodeHintValue::ForceCodeSet(codeSetHint)) = hints.get(&EncodeHintType::FORCE_CODE_SET) else { return Err(Exceptions::illegalState) }; match codeSetHint.as_str() { "A" => forcedCodeSet = CODE_CODE_A as i32, "B" => forcedCodeSet = CODE_CODE_B as i32, "C" => forcedCodeSet = CODE_CODE_C as i32, _ => { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Unsupported code set hint: {codeSetHint}" - )))) + ))) } } } @@ -135,9 +135,9 @@ fn check(contents: &str, hints: &crate::EncodingHintDictionary) -> Result { if c > 127 { // no full Latin-1 character set available at the moment // shift and manual code change are not supported - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Bad character in input: ASCII value={c}" - )))); + ))); } } } @@ -150,18 +150,18 @@ fn check(contents: &str, hints: &crate::EncodingHintDictionary) -> Result { // allows no ascii above 95 (no lower caps, no special symbols) { if c > 95 && c <= 127 { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Bad character in input for forced code set A: ASCII value={c}" - )))); + ))); } } CODE_CODE_B_I32 => // allows no ascii below 32 (terminal symbols) { if c <= 32 { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Bad character in input for forced code set B: ASCII value={c}" - )))); + ))); } } CODE_CODE_C_I32 => @@ -173,9 +173,9 @@ fn check(contents: &str, hints: &crate::EncodingHintDictionary) -> Result { || ch == ESCAPE_FNC_3 || ch == ESCAPE_FNC_4 { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Bad character in input for forced code set C: ASCII value={c}" - )))); + ))); } } _ => {} @@ -196,8 +196,7 @@ fn encodeFast(contents: &str, forcedCodeSet: i32) -> Result> { while position < length { //Select code to use let newCodeSet = if forcedCodeSet == -1 { - chooseCode(contents, position, codeSet) - .ok_or(Exceptions::IllegalStateException(None))? + chooseCode(contents, position, codeSet).ok_or(Exceptions::illegalState)? } else { forcedCodeSet as usize // THIS IS RISKY }; @@ -210,7 +209,7 @@ fn encodeFast(contents: &str, forcedCodeSet: i32) -> Result> { match contents .chars() .nth(position) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? { ESCAPE_FNC_1 => patternIndex = CODE_FNC_1 as isize, ESCAPE_FNC_2 => patternIndex = CODE_FNC_2 as isize, @@ -230,7 +229,7 @@ fn encodeFast(contents: &str, forcedCodeSet: i32) -> Result> { patternIndex = contents .chars() .nth(position) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? as isize - ' ' as isize; if patternIndex < 0 { @@ -242,7 +241,7 @@ fn encodeFast(contents: &str, forcedCodeSet: i32) -> Result> { patternIndex = contents .chars() .nth(position) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? as isize - ' ' as isize } @@ -250,9 +249,9 @@ fn encodeFast(contents: &str, forcedCodeSet: i32) -> Result> { // CODE_CODE_C if position + 1 == length { // this is the last character, but the encoding is C, which always encodes two characers - return Err(Exceptions::IllegalArgumentException(Some( - "Bad number of characters for digit only encoding.".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "Bad number of characters for digit only encoding.", + )); } let s: String = contents .char_indices() @@ -261,7 +260,7 @@ fn encodeFast(contents: &str, forcedCodeSet: i32) -> Result> { .map(|(_u, c)| c) .collect(); patternIndex = s.parse::().map_err(|e| { - Exceptions::ParseException(Some(format!("issue parsing {s}: {e}"))) + Exceptions::parseWith(format!("issue parsing {s}: {e}")) })?; position += 1; } // Also incremented below @@ -537,7 +536,7 @@ stuvwxyz{|}~\u{007F}\u{00FF}"; if contents .chars() .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? == ESCAPE_FNC_1 { addPattern( @@ -557,7 +556,7 @@ stuvwxyz{|}~\u{007F}\u{00FF}"; addPattern( &mut patterns, s.parse::().map_err(|e| { - Exceptions::ParseException(Some(format!("unable to parse {s} {e}"))) + Exceptions::parseWith(format!("unable to parse {s} {e}")) })?, &mut checkSum, &mut checkWeight, @@ -573,7 +572,7 @@ stuvwxyz{|}~\u{007F}\u{00FF}"; let mut patternIndex = match contents .chars() .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? { ESCAPE_FNC_1 => CODE_FNC_1 as isize, ESCAPE_FNC_2 => CODE_FNC_2 as isize, @@ -591,8 +590,7 @@ stuvwxyz{|}~\u{007F}\u{00FF}"; contents .chars() .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? - as isize + .ok_or(Exceptions::indexOutOfBounds)? as isize - ' ' as isize } }; @@ -683,7 +681,7 @@ stuvwxyz{|}~\u{007F}\u{00FF}"; minPath: &mut Vec>, ) -> Result { if position >= contents.chars().count() { - return Err(Exceptions::IllegalStateException(None)); + return Err(Exceptions::illegalState); } let mCost = memoizedCost[charset.ordinal()][position]; if mCost > 0 { @@ -764,10 +762,10 @@ stuvwxyz{|}~\u{007F}\u{00FF}"; } } if minCost == u32::MAX { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Bad character in input: ASCII value={}", contents.chars().nth(position).unwrap_or('x') - )))); + ))); // throw new IllegalArgumentException("Bad character in input: ASCII value=" + (int) contents.charAt(position)); } memoizedCost[charset.ordinal()][position] = minCost; diff --git a/src/oned/code_39_reader.rs b/src/oned/code_39_reader.rs index 4e30bd8..92ec57b 100644 --- a/src/oned/code_39_reader.rs +++ b/src/oned/code_39_reader.rs @@ -60,7 +60,7 @@ impl OneDReader for Code39Reader { one_d_reader::recordPattern(row, nextStart, &mut counters)?; let pattern = Self::toNarrowWidePattern(&counters); if pattern < 0 { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } decodedChar = Self::patternToChar(pattern as u32)?; self.decodeRowRXingResult.push(decodedChar); @@ -85,7 +85,7 @@ impl OneDReader for Code39Reader { // If 50% of last pattern size, following last pattern, is not whitespace, fail // (but if it's whitespace to the very end of the image, that's OK) if nextStart != end && (whiteSpaceAfterEnd * 2) < lastPatternSize as usize { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } if self.usingCheckDigit { @@ -96,7 +96,7 @@ impl OneDReader for Code39Reader { self.decodeRowRXingResult .chars() .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?, + .ok_or(Exceptions::indexOutOfBounds)?, ) { total += pos; } @@ -105,20 +105,20 @@ impl OneDReader for Code39Reader { .decodeRowRXingResult .chars() .nth(max) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? != Self::ALPHABET_STRING .chars() .nth(total % 43) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } self.decodeRowRXingResult.truncate(max); } if self.decodeRowRXingResult.chars().count() == 0 { // false positive - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let resultString = if self.extendedMode { @@ -246,7 +246,7 @@ impl Code39Reader { isWhite = !isWhite; } } - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } // For efficiency, returns -1 on failure. Not throwing here saved as many as 700 exceptions @@ -306,13 +306,13 @@ impl Code39Reader { return Self::ALPHABET_STRING .chars() .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None)); + .ok_or(Exceptions::indexOutOfBounds); } } if pattern == Self::ASTERISK_ENCODING { return Ok('*'); } - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } fn decodeExtended(encoded: &str) -> Result { @@ -322,49 +322,46 @@ impl Code39Reader { while i < length { // for i in 0..length { // for (int i = 0; i < length; i++) { - let c = encoded - .chars() - .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?; + let c = encoded.chars().nth(i).ok_or(Exceptions::indexOutOfBounds)?; if c == '+' || c == '$' || c == '%' || c == '/' { let next = encoded .chars() .nth(i + 1) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?; + .ok_or(Exceptions::indexOutOfBounds)?; let mut decodedChar = '\0'; match c { '+' => { // +A to +Z map to a to z if ('A'..='Z').contains(&next) { decodedChar = char::from_u32(next as u32 + 32) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?; + .ok_or(Exceptions::indexOutOfBounds)?; } else { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } } '$' => { // $A to $Z map to control codes SH to SB if ('A'..='Z').contains(&next) { decodedChar = char::from_u32(next as u32 - 64) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?; + .ok_or(Exceptions::indexOutOfBounds)?; } else { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } } '%' => { // %A to %E map to control codes ESC to US if ('A'..='E').contains(&next) { decodedChar = char::from_u32(next as u32 - 38) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?; + .ok_or(Exceptions::indexOutOfBounds)?; } else if ('F'..='J').contains(&next) { decodedChar = char::from_u32(next as u32 - 11) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?; + .ok_or(Exceptions::indexOutOfBounds)?; } else if ('K'..='O').contains(&next) { decodedChar = char::from_u32(next as u32 + 16) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?; + .ok_or(Exceptions::indexOutOfBounds)?; } else if ('P'..='T').contains(&next) { decodedChar = char::from_u32(next as u32 + 43) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?; + .ok_or(Exceptions::indexOutOfBounds)?; } else if next == 'U' { decodedChar = 0 as char; } else if next == 'V' { @@ -374,18 +371,18 @@ impl Code39Reader { } else if next == 'X' || next == 'Y' || next == 'Z' { decodedChar = 127 as char; } else { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } } '/' => { // /A to /O map to ! to , and /Z maps to : if ('A'..='O').contains(&next) { decodedChar = char::from_u32(next as u32 - 32) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?; + .ok_or(Exceptions::indexOutOfBounds)?; } else if next == 'Z' { decodedChar = ':'; } else { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } } _ => {} diff --git a/src/oned/code_39_writer.rs b/src/oned/code_39_writer.rs index f88a05a..9e98ff5 100644 --- a/src/oned/code_39_writer.rs +++ b/src/oned/code_39_writer.rs @@ -34,9 +34,9 @@ impl OneDimensionalCodeWriter for Code39Writer { let mut contents = contents.to_owned(); let mut length = contents.chars().count(); if length > 80 { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Requested contents should be less than 80 digits long, but got {length}" - )))); + ))); } let mut i = 0; @@ -48,14 +48,14 @@ impl OneDimensionalCodeWriter for Code39Writer { contents .chars() .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?, + .ok_or(Exceptions::indexOutOfBounds)?, ) .is_none() { contents = Self::tryToConvertToExtendedMode(&contents)?; length = contents.chars().count(); if length > 80 { - return Err(Exceptions::IllegalArgumentException(Some(format!("Requested contents should be less than 80 digits long, but got {length} (extended full ASCII mode)")))); + return Err(Exceptions::illegalArgumentWith(format!("Requested contents should be less than 80 digits long, but got {length} (extended full ASCII mode)"))); } break; } @@ -71,7 +71,7 @@ impl OneDimensionalCodeWriter for Code39Writer { pos += Self::appendPattern(&mut result, pos as usize, &narrowWhite, false); //append next character to byte matrix for i in 0..length { - let Some(indexInString) = Code39Reader::ALPHABET_STRING.find(contents.chars().nth(i).ok_or(Exceptions::IndexOutOfBoundsException(None))?) else { + let Some(indexInString) = Code39Reader::ALPHABET_STRING.find(contents.chars().nth(i).ok_or(Exceptions::indexOutOfBounds)?) else { continue; }; Self::toIntArray( @@ -118,58 +118,58 @@ impl Code39Writer { extendedContent.push('$'); extendedContent.push( char::from_u32('A' as u32 + (character as u32 - 1)) - .ok_or(Exceptions::ParseException(None))?, + .ok_or(Exceptions::parse)?, ); } else if character < ' ' { extendedContent.push('%'); extendedContent.push( char::from_u32('A' as u32 + (character as u32 - 27)) - .ok_or(Exceptions::ParseException(None))?, + .ok_or(Exceptions::parse)?, ); } else if character <= ',' || character == '/' || character == ':' { extendedContent.push('/'); extendedContent.push( char::from_u32('A' as u32 + (character as u32 - 33)) - .ok_or(Exceptions::ParseException(None))?, + .ok_or(Exceptions::parse)?, ); } else if character <= '9' { extendedContent.push( char::from_u32('0' as u32 + (character as u32 - 48)) - .ok_or(Exceptions::ParseException(None))?, + .ok_or(Exceptions::parse)?, ); } else if character <= '?' { extendedContent.push('%'); extendedContent.push( char::from_u32('F' as u32 + (character as u32 - 59)) - .ok_or(Exceptions::ParseException(None))?, + .ok_or(Exceptions::parse)?, ); } else if character <= 'Z' { extendedContent.push( char::from_u32('A' as u32 + (character as u32 - 65)) - .ok_or(Exceptions::ParseException(None))?, + .ok_or(Exceptions::parse)?, ); } else if character <= '_' { extendedContent.push('%'); extendedContent.push( char::from_u32('K' as u32 + (character as u32 - 91)) - .ok_or(Exceptions::ParseException(None))?, + .ok_or(Exceptions::parse)?, ); } else if character <= 'z' { extendedContent.push('+'); extendedContent.push( char::from_u32('A' as u32 + (character as u32 - 97)) - .ok_or(Exceptions::ParseException(None))?, + .ok_or(Exceptions::parse)?, ); } else if character as u32 <= 127 { extendedContent.push('%'); extendedContent.push( char::from_u32('P' as u32 + (character as u32 - 123)) - .ok_or(Exceptions::ParseException(None))?, + .ok_or(Exceptions::parse)?, ); } else { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Requested content contains a non-encodable character: '{character}'" - )))); + ))); } } } diff --git a/src/oned/code_93_reader.rs b/src/oned/code_93_reader.rs index 4b275f8..4961a4d 100644 --- a/src/oned/code_93_reader.rs +++ b/src/oned/code_93_reader.rs @@ -66,7 +66,7 @@ impl OneDReader for Code93Reader { one_d_reader::recordPattern(row, nextStart, &mut theCounters)?; let pattern = Self::toPattern(&theCounters); if pattern < 0 { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } decodedChar = Self::patternToChar(pattern as u32)?; self.decodeRowRXingResult.push(decodedChar); @@ -95,12 +95,12 @@ impl OneDReader for Code93Reader { // Should be at least one more black module if nextStart == end || !row.get(nextStart) { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } if self.decodeRowRXingResult.chars().count() < 2 { // false positive -- need at least 2 checksum digits - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } Self::checkChecksums(&self.decodeRowRXingResult)?; @@ -194,7 +194,7 @@ impl Code93Reader { isWhite = !isWhite; } } - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } fn toPattern(counters: &[u32; 6]) -> i32 { @@ -224,7 +224,7 @@ impl Code93Reader { return Ok(Self::ALPHABET[i]); } } - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } fn decodeExtended(encoded: &str) -> Result { @@ -234,55 +234,52 @@ impl Code93Reader { while i < length { // for i in 0..length { // for (int i = 0; i < length; i++) { - let c = encoded - .chars() - .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?; + let c = encoded.chars().nth(i).ok_or(Exceptions::indexOutOfBounds)?; if ('a'..='d').contains(&c) { if i >= length - 1 { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } let next = encoded .chars() .nth(i + 1) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?; + .ok_or(Exceptions::indexOutOfBounds)?; let mut decodedChar = '\0'; match c { 'd' => { // +A to +Z map to a to z if ('A'..='Z').contains(&next) { - decodedChar = char::from_u32(next as u32 + 32) - .ok_or(Exceptions::ParseException(None))?; + decodedChar = + char::from_u32(next as u32 + 32).ok_or(Exceptions::parse)?; } else { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } } 'a' => { // $A to $Z map to control codes SH to SB if ('A'..='Z').contains(&next) { - decodedChar = char::from_u32(next as u32 - 64) - .ok_or(Exceptions::ParseException(None))?; + decodedChar = + char::from_u32(next as u32 - 64).ok_or(Exceptions::parse)?; } else { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } } 'b' => { if ('A'..='E').contains(&next) { // %A to %E map to control codes ESC to USep - decodedChar = char::from_u32(next as u32 - 38) - .ok_or(Exceptions::ParseException(None))?; + decodedChar = + char::from_u32(next as u32 - 38).ok_or(Exceptions::parse)?; } else if ('F'..='J').contains(&next) { // %F to %J map to ; < = > ? - decodedChar = char::from_u32(next as u32 - 11) - .ok_or(Exceptions::ParseException(None))?; + decodedChar = + char::from_u32(next as u32 - 11).ok_or(Exceptions::parse)?; } else if ('K'..='O').contains(&next) { // %K to %O map to [ \ ] ^ _ - decodedChar = char::from_u32(next as u32 + 16) - .ok_or(Exceptions::ParseException(None))?; + decodedChar = + char::from_u32(next as u32 + 16).ok_or(Exceptions::parse)?; } else if ('P'..='T').contains(&next) { // %P to %T map to { | } ~ DEL - decodedChar = char::from_u32(next as u32 + 43) - .ok_or(Exceptions::ParseException(None))?; + decodedChar = + char::from_u32(next as u32 + 43).ok_or(Exceptions::parse)?; } else if next == 'U' { // %U map to NUL decodedChar = '\0'; @@ -296,18 +293,18 @@ impl Code93Reader { // %X to %Z all map to DEL (127) decodedChar = 127 as char; } else { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } } 'c' => { // /A to /O map to ! to , and /Z maps to : if ('A'..='O').contains(&next) { - decodedChar = char::from_u32(next as u32 - 32) - .ok_or(Exceptions::ParseException(None))?; + decodedChar = + char::from_u32(next as u32 - 32).ok_or(Exceptions::parse)?; } else if next == 'Z' { decodedChar = ':'; } else { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } } _ => {} @@ -337,12 +334,7 @@ impl Code93Reader { for i in (0..checkPosition).rev() { total += weight * Self::ALPHABET_STRING - .find( - result - .chars() - .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?, - ) + .find(result.chars().nth(i).ok_or(Exceptions::indexOutOfBounds)?) .map_or_else(|| -1_i32, |v| v as i32); weight += 1; if weight > weightMax as i32 { @@ -352,10 +344,10 @@ impl Code93Reader { if result .chars() .nth(checkPosition) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? != Self::ALPHABET[(total as usize) % 47] { - Err(Exceptions::ChecksumException(None)) + Err(Exceptions::checksum) } else { Ok(()) } diff --git a/src/oned/code_93_writer.rs b/src/oned/code_93_writer.rs index 232f12a..740469b 100644 --- a/src/oned/code_93_writer.rs +++ b/src/oned/code_93_writer.rs @@ -36,7 +36,7 @@ impl OneDimensionalCodeWriter for Code93Writer { let mut contents = Self::convertToExtended(contents)?; let length = contents.chars().count(); if length > 80 { - return Err(Exceptions::IllegalArgumentException(Some(format!("Requested contents should be less than 80 digits long after converting to extended encoding, but got {length}" )))); + return Err(Exceptions::illegalArgumentWith(format!("Requested contents should be less than 80 digits long after converting to extended encoding, but got {length}" ))); } //length of code + 2 start/stop characters + 2 checksums, each of 9 bits, plus a termination bar @@ -49,7 +49,7 @@ impl OneDimensionalCodeWriter for Code93Writer { for i in 0..length { // for (int i = 0; i < length; i++) { - let Some(indexInString) = Code93Reader::ALPHABET_STRING.find(contents.chars().nth(i).ok_or(Exceptions::IndexOutOfBoundsException(None))?) else {panic!("alphabet")}; + let Some(indexInString) = Code93Reader::ALPHABET_STRING.find(contents.chars().nth(i).ok_or(Exceptions::indexOutOfBounds)?) else {panic!("alphabet")}; pos += Self::appendPattern( &mut result, pos, @@ -66,7 +66,7 @@ impl OneDimensionalCodeWriter for Code93Writer { Code93Reader::ALPHABET_STRING .chars() .nth(check1) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?, + .ok_or(Exceptions::indexOutOfBounds)?, ); let check2 = Self::computeChecksumIndex(&contents, 15); @@ -157,15 +157,13 @@ impl Code93Writer { // SOH - SUB: ($)A - ($)Z extendedContent.push('a'); extendedContent.push( - char::from_u32('A' as u32 + character as u32 - 1) - .ok_or(Exceptions::ParseException(None))?, + char::from_u32('A' as u32 + character as u32 - 1).ok_or(Exceptions::parse)?, ); } else if character as u32 <= 31 { // ESC - US: (%)A - (%)E extendedContent.push('b'); extendedContent.push( - char::from_u32('A' as u32 + character as u32 - 27) - .ok_or(Exceptions::ParseException(None))?, + char::from_u32('A' as u32 + character as u32 - 27).ok_or(Exceptions::parse)?, ); } else if character == ' ' || character == '$' || character == '%' || character == '+' { // space $ % + @@ -175,7 +173,7 @@ impl Code93Writer { extendedContent.push('c'); extendedContent.push( char::from_u32('A' as u32 + character as u32 - '!' as u32) - .ok_or(Exceptions::ParseException(None))?, + .ok_or(Exceptions::parse)?, ); } else if character <= '9' { extendedContent.push(character); @@ -187,7 +185,7 @@ impl Code93Writer { extendedContent.push('b'); extendedContent.push( char::from_u32('F' as u32 + character as u32 - ';' as u32) - .ok_or(Exceptions::ParseException(None))?, + .ok_or(Exceptions::parse)?, ); } else if character == '@' { // @: (%)V @@ -200,7 +198,7 @@ impl Code93Writer { extendedContent.push('b'); extendedContent.push( char::from_u32('K' as u32 + character as u32 - '[' as u32) - .ok_or(Exceptions::ParseException(None))?, + .ok_or(Exceptions::parse)?, ); } else if character == '`' { // `: (%)W @@ -210,19 +208,19 @@ impl Code93Writer { extendedContent.push('d'); extendedContent.push( char::from_u32('A' as u32 + character as u32 - 'a' as u32) - .ok_or(Exceptions::ParseException(None))?, + .ok_or(Exceptions::parse)?, ); } else if character as u32 <= 127 { // { - DEL: (%)P - (%)T extendedContent.push('b'); extendedContent.push( char::from_u32('P' as u32 + character as u32 - '{' as u32) - .ok_or(Exceptions::ParseException(None))?, + .ok_or(Exceptions::parse)?, ); } else { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Requested content contains a non-encodable character: '{character}'" - )))); + ))); } } diff --git a/src/oned/ean_13_reader.rs b/src/oned/ean_13_reader.rs index 551339f..1af520c 100644 --- a/src/oned/ean_13_reader.rs +++ b/src/oned/ean_13_reader.rs @@ -65,10 +65,8 @@ impl UPCEANReader for EAN13Reader { rowOffset, &upc_ean_reader::L_AND_G_PATTERNS, )?; - resultString.push( - char::from_u32('0' as u32 + bestMatch as u32 % 10) - .ok_or(Exceptions::ParseException(None))?, - ); + resultString + .push(char::from_u32('0' as u32 + bestMatch as u32 % 10).ok_or(Exceptions::parse)?); rowOffset += counters.iter().sum::() as usize; @@ -90,10 +88,8 @@ impl UPCEANReader for EAN13Reader { while x < 6 && rowOffset < end { let bestMatch = self.decodeDigit(row, &mut counters, rowOffset, &upc_ean_reader::L_PATTERNS)?; - resultString.push( - char::from_u32('0' as u32 + bestMatch as u32) - .ok_or(Exceptions::ParseException(None))?, - ); + resultString + .push(char::from_u32('0' as u32 + bestMatch as u32).ok_or(Exceptions::parse)?); rowOffset += counters.iter().sum::() as usize; @@ -152,12 +148,11 @@ impl EAN13Reader { if lgPatternFound == Self::FIRST_DIGIT_ENCODINGS[d] { resultString.insert( 0, - char::from_u32('0' as u32 + d as u32) - .ok_or(Exceptions::ParseException(None))?, + char::from_u32('0' as u32 + d as u32).ok_or(Exceptions::parse)?, ); return Ok(()); } } - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } } diff --git a/src/oned/ean_13_writer.rs b/src/oned/ean_13_writer.rs index b180c40..23e5d5a 100644 --- a/src/oned/ean_13_writer.rs +++ b/src/oned/ean_13_writer.rs @@ -46,15 +46,15 @@ impl OneDimensionalCodeWriter for EAN13Writer { } 13 => { if !reader.checkStandardUPCEANChecksum(&contents)? { - return Err(Exceptions::IllegalArgumentException(Some( - "Contents do not pass checksum".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "Contents do not pass checksum", + )); } } _ => { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Requested contents should be 12 or 13 digits long, but got {length}" - )))) + ))) } } @@ -63,9 +63,9 @@ impl OneDimensionalCodeWriter for EAN13Writer { let firstDigit = contents .chars() .next() - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? .to_digit(10) - .ok_or(Exceptions::ParseException(None))? as usize; + .ok_or(Exceptions::parse)? as usize; let parities = EAN13Reader::FIRST_DIGIT_ENCODINGS[firstDigit]; let mut result = [false; CODE_WIDTH]; let mut pos = 0; @@ -80,9 +80,9 @@ impl OneDimensionalCodeWriter for EAN13Writer { let mut digit = contents .chars() .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? .to_digit(10) - .ok_or(Exceptions::ParseException(None))? as usize; + .ok_or(Exceptions::parse)? as usize; if (parities >> (6 - i) & 1) == 1 { digit += 10; } @@ -101,9 +101,9 @@ impl OneDimensionalCodeWriter for EAN13Writer { let digit = contents .chars() .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? .to_digit(10) - .ok_or(Exceptions::ParseException(None))? as usize; + .ok_or(Exceptions::parse)? as usize; pos += EAN13Writer::appendPattern( &mut result, diff --git a/src/oned/ean_8_reader.rs b/src/oned/ean_8_reader.rs index c32528d..890cbcb 100644 --- a/src/oned/ean_8_reader.rs +++ b/src/oned/ean_8_reader.rs @@ -53,10 +53,8 @@ impl UPCEANReader for EAN8Reader { while x < 4 && rowOffset < end { let bestMatch = self.decodeDigit(row, &mut counters, rowOffset, &upc_ean_reader::L_PATTERNS)?; - resultString.push( - char::from_u32('0' as u32 + bestMatch as u32) - .ok_or(Exceptions::ParseException(None))?, - ); + resultString + .push(char::from_u32('0' as u32 + bestMatch as u32).ok_or(Exceptions::parse)?); rowOffset += counters.iter().sum::() as usize; @@ -71,10 +69,8 @@ impl UPCEANReader for EAN8Reader { while x < 4 && rowOffset < end { let bestMatch = self.decodeDigit(row, &mut counters, rowOffset, &upc_ean_reader::L_PATTERNS)?; - resultString.push( - char::from_u32('0' as u32 + bestMatch as u32) - .ok_or(Exceptions::ParseException(None))?, - ); + resultString + .push(char::from_u32('0' as u32 + bestMatch as u32).ok_or(Exceptions::parse)?); rowOffset += counters.iter().sum::() as usize; x += 1; diff --git a/src/oned/ean_8_writer.rs b/src/oned/ean_8_writer.rs index 6871a1f..50d9d96 100644 --- a/src/oned/ean_8_writer.rs +++ b/src/oned/ean_8_writer.rs @@ -56,15 +56,15 @@ impl OneDimensionalCodeWriter for EAN8Writer { } 8 => { if !EAN8Reader.checkStandardUPCEANChecksum(&contents)? { - return Err(Exceptions::IllegalArgumentException(Some( - "Contents do not pass checksum".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "Contents do not pass checksum", + )); } } _ => { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Requested contents should be 7 or 8 digits long, but got {length}" - )))) + ))) } } @@ -81,10 +81,9 @@ impl OneDimensionalCodeWriter for EAN8Writer { let digit = contents .chars() .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? .to_digit(10) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? - as usize; + .ok_or(Exceptions::indexOutOfBounds)? as usize; pos += Self::appendPattern(&mut result, pos, &upc_ean_reader::L_PATTERNS[digit], false) as usize; } @@ -97,10 +96,9 @@ impl OneDimensionalCodeWriter for EAN8Writer { let digit = contents .chars() .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? .to_digit(10) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? - as usize; + .ok_or(Exceptions::indexOutOfBounds)? as usize; pos += Self::appendPattern(&mut result, pos, &upc_ean_reader::L_PATTERNS[digit], true) as usize; } diff --git a/src/oned/itf_reader.rs b/src/oned/itf_reader.rs index 2db7bbd..8b36565 100644 --- a/src/oned/itf_reader.rs +++ b/src/oned/itf_reader.rs @@ -143,7 +143,7 @@ impl OneDReader for ITFReader { lengthOK = true; } if !lengthOK { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } let mut resultObject = RXingResult::new( @@ -198,13 +198,9 @@ impl ITFReader { } let mut bestMatch = self.decodeDigit(&counterBlack)?; - resultString.push( - char::from_u32('0' as u32 + bestMatch).ok_or(Exceptions::ParseException(None))?, - ); + resultString.push(char::from_u32('0' as u32 + bestMatch).ok_or(Exceptions::parse)?); bestMatch = self.decodeDigit(&counterWhite)?; - resultString.push( - char::from_u32('0' as u32 + bestMatch).ok_or(Exceptions::ParseException(None))?, - ); + resultString.push(char::from_u32('0' as u32 + bestMatch).ok_or(Exceptions::parse)?); payloadStart += counterDigitPair.iter().sum::() as usize; } @@ -265,7 +261,7 @@ impl ITFReader { if quietCount != 0 { // Unable to find the necessary number of quiet zone pixels. - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } else { Ok(()) } @@ -282,7 +278,7 @@ impl ITFReader { let width = row.getSize(); let endStart = row.getNextSet(0); if endStart == width { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } Ok(endStart) @@ -377,7 +373,7 @@ impl ITFReader { isWhite = !isWhite; } } - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } /** @@ -406,7 +402,7 @@ impl ITFReader { if bestMatch >= 0 { Ok(bestMatch as u32 % 10) } else { - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } } } diff --git a/src/oned/itf_writer.rs b/src/oned/itf_writer.rs index 9104aff..a50bf25 100644 --- a/src/oned/itf_writer.rs +++ b/src/oned/itf_writer.rs @@ -33,14 +33,14 @@ impl OneDimensionalCodeWriter for ITFWriter { fn encode_oned(&self, contents: &str) -> Result> { let length = contents.chars().count(); if length % 2 != 0 { - return Err(Exceptions::IllegalArgumentException(Some( - "The length of the input should be even".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "The length of the input should be even", + )); } if length > 80 { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Requested contents should be less than 80 digits long, but got {length}" - )))); + ))); } Self::checkNumeric(contents)?; @@ -52,15 +52,15 @@ impl OneDimensionalCodeWriter for ITFWriter { let one = contents .chars() .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? .to_digit(10) - .ok_or(Exceptions::ParseException(None))? as usize; + .ok_or(Exceptions::parse)? as usize; let two = contents .chars() .nth(i + 1) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? .to_digit(10) - .ok_or(Exceptions::ParseException(None))? as usize; + .ok_or(Exceptions::parse)? as usize; let mut encoding = [0; 10]; for j in 0..5 { encoding[2 * j] = PATTERNS[one][j]; diff --git a/src/oned/multi_format_one_d_reader.rs b/src/oned/multi_format_one_d_reader.rs index d621c8b..2400e6b 100644 --- a/src/oned/multi_format_one_d_reader.rs +++ b/src/oned/multi_format_one_d_reader.rs @@ -47,7 +47,7 @@ impl OneDReader for MultiFormatOneDReader { } } - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } } impl MultiFormatOneDReader { @@ -166,7 +166,7 @@ impl Reader for MultiFormatOneDReader { Ok(result) } else { - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } } diff --git a/src/oned/multi_format_upc_ean_reader.rs b/src/oned/multi_format_upc_ean_reader.rs index 31ef40a..2284695 100644 --- a/src/oned/multi_format_upc_ean_reader.rs +++ b/src/oned/multi_format_upc_ean_reader.rs @@ -135,7 +135,7 @@ impl OneDReader for MultiFormatUPCEANReader { } } - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } } @@ -198,7 +198,7 @@ impl Reader for MultiFormatUPCEANReader { Ok(result) } else { - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } } diff --git a/src/oned/one_d_code_writer.rs b/src/oned/one_d_code_writer.rs index 5fb9655..463a9fc 100644 --- a/src/oned/one_d_code_writer.rs +++ b/src/oned/one_d_code_writer.rs @@ -101,9 +101,9 @@ pub trait OneDimensionalCodeWriter: Writer { */ fn checkNumeric(contents: &str) -> Result<()> { if !NUMERIC.is_match(contents) { - Err(Exceptions::IllegalArgumentException(Some( - "Input should only contain digits 0-9".to_owned(), - ))) + Err(Exceptions::illegalArgumentWith( + "Input should only contain digits 0-9", + )) } else { Ok(()) } @@ -164,28 +164,26 @@ impl Writer for L { hints: &crate::EncodingHintDictionary, ) -> Result { if contents.is_empty() { - return Err(Exceptions::IllegalArgumentException(Some( - "Found empty contents".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith("Found empty contents")); } if width < 0 || height < 0 { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Negative size is not allowed. Input: {width}x{height}" - )))); + ))); } if let Some(supportedFormats) = self.getSupportedWriteFormats() { if !supportedFormats.contains(format) { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Can only encode {supportedFormats:?}, but got {format:?}" - )))); + ))); } } let mut sidesMargin = self.getDefaultMargin(); if let Some(EncodeHintValue::Margin(margin)) = hints.get(&EncodeHintType::MARGIN) { sidesMargin = margin.parse::().map_err(|e| { - Exceptions::IllegalArgumentException(Some(format!("couldnt parse {margin}: {e}"))) + Exceptions::illegalArgumentWith(format!("couldnt parse {margin}: {e}")) })?; } diff --git a/src/oned/one_d_reader.rs b/src/oned/one_d_reader.rs index bd49c69..53880e0 100644 --- a/src/oned/one_d_reader.rs +++ b/src/oned/one_d_reader.rs @@ -125,7 +125,7 @@ pub trait OneDReader: Reader { } } - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } /** @@ -212,7 +212,7 @@ pub fn recordPattern(row: &BitArray, start: usize, counters: &mut [u32]) -> Resu let end = row.getSize(); if start >= end { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let mut isWhite = !row.get(start); @@ -235,7 +235,7 @@ pub fn recordPattern(row: &BitArray, start: usize, counters: &mut [u32]) -> Resu // If we read fully the last section of pixels and filled up our counters -- or filled // the last counter but ran off the side of the image, OK. Otherwise, a problem. if !(counterPosition == numCounters || (counterPosition == numCounters - 1 && i == end)) { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } Ok(()) } @@ -253,7 +253,7 @@ pub fn recordPatternInReverse(row: &BitArray, start: usize, counters: &mut [u32] } } if numTransitionsLeft >= 0 { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } recordPattern(row, start + 1, counters)?; diff --git a/src/oned/rss/abstract_rss_reader.rs b/src/oned/rss/abstract_rss_reader.rs index 20b8a25..c172620 100644 --- a/src/oned/rss/abstract_rss_reader.rs +++ b/src/oned/rss/abstract_rss_reader.rs @@ -39,7 +39,7 @@ pub trait AbstractRSSReaderTrait: OneDReader { return Ok(value as u32); } } - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } /** diff --git a/src/oned/rss/expanded/binary_util.rs b/src/oned/rss/expanded/binary_util.rs index 799fec2..e981790 100644 --- a/src/oned/rss/expanded/binary_util.rs +++ b/src/oned/rss/expanded/binary_util.rs @@ -53,23 +53,13 @@ pub fn buildBitArrayFromString(data: &str) -> Result { // for (int i = 0; i < dotsAndXs.length(); ++i) { if i % 9 == 0 { // spaces - if dotsAndXs - .chars() - .nth(i) - .ok_or(Exceptions::ParseException(None))? - != ' ' - { - return Err(Exceptions::IllegalStateException(Some( - "space expected".to_owned(), - ))); + if dotsAndXs.chars().nth(i).ok_or(Exceptions::parse)? != ' ' { + return Err(Exceptions::illegalStateWith("space expected")); } continue; } - let currentChar = dotsAndXs - .chars() - .nth(i) - .ok_or(Exceptions::ParseException(None))?; + let currentChar = dotsAndXs.chars().nth(i).ok_or(Exceptions::parse)?; if currentChar == 'X' || currentChar == 'x' { binary.set(counter); } @@ -91,12 +81,7 @@ pub fn buildBitArrayFromStringWithoutSpaces(data: &str) -> Result { sb.push(' '); let mut i = 0; while i < 8 && current < dotsAndXs_length { - sb.push( - dotsAndXs - .chars() - .nth(current) - .ok_or(Exceptions::ParseException(None))?, - ); + sb.push(dotsAndXs.chars().nth(current).ok_or(Exceptions::parse)?); current += 1; i += 1; diff --git a/src/oned/rss/expanded/decoders/abstract_expanded_decoder.rs b/src/oned/rss/expanded/decoders/abstract_expanded_decoder.rs index 3633463..dab10ac 100644 --- a/src/oned/rss/expanded/decoders/abstract_expanded_decoder.rs +++ b/src/oned/rss/expanded/decoders/abstract_expanded_decoder.rs @@ -152,7 +152,7 @@ pub fn createDecoder<'a>( _ => {} } - Err(Exceptions::IllegalStateException(Some(format!( + Err(Exceptions::illegalStateWith(format!( "unknown decoder: {information}" - )))) + ))) } diff --git a/src/oned/rss/expanded/decoders/ai_01392x_decoder.rs b/src/oned/rss/expanded/decoders/ai_01392x_decoder.rs index f202c02..2b01ddd 100644 --- a/src/oned/rss/expanded/decoders/ai_01392x_decoder.rs +++ b/src/oned/rss/expanded/decoders/ai_01392x_decoder.rs @@ -39,7 +39,7 @@ impl AI01decoder for AI01392xDecoder<'_> {} impl AbstractExpandedDecoder for AI01392xDecoder<'_> { fn parseInformation(&mut self) -> Result { if self.information.getSize() < Self::HEADER_SIZE + Self::GTIN_SIZE as usize { - return Err(crate::Exceptions::NotFoundException(None)); + return Err(crate::Exceptions::notFound); } let mut buf = String::new(); diff --git a/src/oned/rss/expanded/decoders/ai_01393x_decoder.rs b/src/oned/rss/expanded/decoders/ai_01393x_decoder.rs index 898005b..12d60a7 100644 --- a/src/oned/rss/expanded/decoders/ai_01393x_decoder.rs +++ b/src/oned/rss/expanded/decoders/ai_01393x_decoder.rs @@ -39,7 +39,7 @@ impl AI01decoder for AI01393xDecoder<'_> {} impl AbstractExpandedDecoder for AI01393xDecoder<'_> { fn parseInformation(&mut self) -> Result { if self.information.getSize() < Self::HEADER_SIZE + Self::GTIN_SIZE as usize { - return Err(crate::Exceptions::NotFoundException(None)); + return Err(crate::Exceptions::notFound); } let mut buf = String::new(); diff --git a/src/oned/rss/expanded/decoders/ai_013x0x1x_decoder.rs b/src/oned/rss/expanded/decoders/ai_013x0x1x_decoder.rs index 35a3e61..5a5f95f 100644 --- a/src/oned/rss/expanded/decoders/ai_013x0x1x_decoder.rs +++ b/src/oned/rss/expanded/decoders/ai_013x0x1x_decoder.rs @@ -57,7 +57,7 @@ impl AbstractExpandedDecoder for AI013x0x1xDecoder<'_> { if self.information.getSize() != Self::HEADER_SIZE + Self::GTIN_SIZE as usize + Self::WEIGHT_SIZE + Self::DATE_SIZE { - return Err(crate::Exceptions::NotFoundException(None)); + return Err(crate::Exceptions::notFound); } let mut buf = String::new(); diff --git a/src/oned/rss/expanded/decoders/ai_013x0x_decoder.rs b/src/oned/rss/expanded/decoders/ai_013x0x_decoder.rs index 33476d1..b4cd49a 100644 --- a/src/oned/rss/expanded/decoders/ai_013x0x_decoder.rs +++ b/src/oned/rss/expanded/decoders/ai_013x0x_decoder.rs @@ -53,7 +53,7 @@ impl AbstractExpandedDecoder for AI013x0xDecoder<'_> { if self.information.getSize() != Self::HEADER_SIZE + Self::GTIN_SIZE as usize + Self::WEIGHT_SIZE { - return Err(crate::Exceptions::NotFoundException(None)); + return Err(crate::Exceptions::notFound); } let mut buf = String::new(); diff --git a/src/oned/rss/expanded/decoders/decoded_numeric.rs b/src/oned/rss/expanded/decoders/decoded_numeric.rs index 5201af8..2ac51ba 100644 --- a/src/oned/rss/expanded/decoders/decoded_numeric.rs +++ b/src/oned/rss/expanded/decoders/decoded_numeric.rs @@ -52,7 +52,7 @@ impl DecodedNumeric { if /*firstDigit < 0 ||*/ firstDigit > 10 || /*secondDigit < 0 ||*/ secondDigit > 10 { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } Ok(Self { diff --git a/src/oned/rss/expanded/decoders/field_parser.rs b/src/oned/rss/expanded/decoders/field_parser.rs index 8e2f42a..5dddc14 100644 --- a/src/oned/rss/expanded/decoders/field_parser.rs +++ b/src/oned/rss/expanded/decoders/field_parser.rs @@ -146,7 +146,7 @@ pub fn parseFieldsInGeneralPurpose(rawInformation: &str) -> Result { // Processing 2-digit AIs if rawInformation.chars().count() < 2 { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let lookup: String = rawInformation.chars().take(2).collect(); @@ -159,7 +159,7 @@ pub fn parseFieldsInGeneralPurpose(rawInformation: &str) -> Result { } if rawInformation.chars().count() < 3 { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let firstThreeDigits: String = rawInformation.chars().take(3).collect(); @@ -172,7 +172,7 @@ pub fn parseFieldsInGeneralPurpose(rawInformation: &str) -> Result { } if rawInformation.chars().count() < 4 { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let threeDigitPlusDigitDataLength = THREE_DIGIT_PLUS_DIGIT_DATA_LENGTH.get(&firstThreeDigits); @@ -192,18 +192,18 @@ pub fn parseFieldsInGeneralPurpose(rawInformation: &str) -> Result { return processFixedAI(4, ffdl.length, rawInformation); } - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } fn processFixedAI(aiSize: usize, fieldSize: usize, rawInformation: &str) -> Result { if rawInformation.chars().count() < aiSize { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let ai: String = rawInformation.chars().take(aiSize).collect(); if rawInformation.chars().count() < aiSize + fieldSize { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let field: String = rawInformation diff --git a/src/oned/rss/expanded/decoders/general_app_id_decoder.rs b/src/oned/rss/expanded/decoders/general_app_id_decoder.rs index 257d8e2..2db7aa5 100644 --- a/src/oned/rss/expanded/decoders/general_app_id_decoder.rs +++ b/src/oned/rss/expanded/decoders/general_app_id_decoder.rs @@ -198,7 +198,7 @@ impl<'a> GeneralAppIdDecoder<'_> { if let Some(r) = result.getDecodedInformation() { Ok(r.clone()) } else { - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } } @@ -344,8 +344,7 @@ impl<'a> GeneralAppIdDecoder<'_> { if (5..15).contains(&fiveBitValue) { return Ok(DecodedChar::new( pos + 5, - char::from_u32('0' as u32 + fiveBitValue - 5) - .ok_or(Exceptions::ParseException(None))?, + char::from_u32('0' as u32 + fiveBitValue - 5).ok_or(Exceptions::parse)?, )); } @@ -354,14 +353,14 @@ impl<'a> GeneralAppIdDecoder<'_> { if (64..90).contains(&sevenBitValue) { return Ok(DecodedChar::new( pos + 7, - char::from_u32(sevenBitValue + 1).ok_or(Exceptions::ParseException(None))?, + char::from_u32(sevenBitValue + 1).ok_or(Exceptions::parse)?, )); } if (90..116).contains(&sevenBitValue) { return Ok(DecodedChar::new( pos + 7, - char::from_u32(sevenBitValue + 7).ok_or(Exceptions::ParseException(None))?, + char::from_u32(sevenBitValue + 7).ok_or(Exceptions::parse)?, )); } @@ -388,7 +387,7 @@ impl<'a> GeneralAppIdDecoder<'_> { 250 => '?', 251 => '_', 252 => ' ', - _ => return Err(Exceptions::FormatException(None)), + _ => return Err(Exceptions::format), }; Ok(DecodedChar::new(pos + 8, c)) @@ -423,8 +422,7 @@ impl<'a> GeneralAppIdDecoder<'_> { if (5..15).contains(&fiveBitValue) { return Ok(DecodedChar::new( pos + 5, - char::from_u32('0' as u32 + fiveBitValue - 5) - .ok_or(Exceptions::ParseException(None))?, + char::from_u32('0' as u32 + fiveBitValue - 5).ok_or(Exceptions::parse)?, )); } @@ -433,7 +431,7 @@ impl<'a> GeneralAppIdDecoder<'_> { if (32..58).contains(&sixBitValue) { return Ok(DecodedChar::new( pos + 6, - char::from_u32(sixBitValue + 33).ok_or(Exceptions::ParseException(None))?, + char::from_u32(sixBitValue + 33).ok_or(Exceptions::parse)?, )); } @@ -444,9 +442,9 @@ impl<'a> GeneralAppIdDecoder<'_> { 61 => '.', 62 => '/', _ => { - return Err(Exceptions::IllegalStateException(Some(format!( + return Err(Exceptions::illegalStateWith(format!( "Decoding invalid alphanumeric value: {sixBitValue}" - )))) + ))) } }; diff --git a/src/oned/rss/expanded/rss_expanded_reader.rs b/src/oned/rss/expanded/rss_expanded_reader.rs index 2307343..e31c1f2 100644 --- a/src/oned/rss/expanded/rss_expanded_reader.rs +++ b/src/oned/rss/expanded/rss_expanded_reader.rs @@ -224,7 +224,7 @@ impl Reader for RSSExpandedReader { Ok(result) } else { - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } } } @@ -294,9 +294,7 @@ impl RSSExpandedReader { if let Ok(to_add) = to_add_res { self.pairs.push(to_add); } else if self.pairs.is_empty() { - return Err(to_add_res - .err() - .unwrap_or(Exceptions::IllegalStateException(None))); + return Err(to_add_res.err().unwrap_or(Exceptions::illegalState)); } else { // exit this loop when retrieveNextPair() fails and throws done = true; @@ -328,7 +326,7 @@ impl RSSExpandedReader { // } } - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } fn checkRows(&mut self, reverse: bool) -> Option> { @@ -372,10 +370,7 @@ impl RSSExpandedReader { ) -> Result> { for i in currentRow..self.rows.len() { // for (int i = currentRow; i < rows.size(); i++) { - let row = self - .rows - .get(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?; + let row = self.rows.get(i).ok_or(Exceptions::indexOutOfBounds)?; self.pairs.clear(); for collectedRow in &collectedRows.clone() { // for (ExpandedRow collectedRow : collectedRows) { @@ -403,7 +398,7 @@ impl RSSExpandedReader { } } - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } /// Whether the pairs form a valid find pattern sequence, @@ -541,17 +536,17 @@ impl RSSExpandedReader { let firstPoints = pairs .get(0) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? .getFinderPattern() .as_ref() - .ok_or(Exceptions::IllegalStateException(None))? + .ok_or(Exceptions::illegalState)? .getPoints(); let lastPoints = pairs .last() - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? .getFinderPattern() .as_ref() - .ok_or(Exceptions::IllegalStateException(None))? + .ok_or(Exceptions::illegalState)? .getPoints(); let mut result = RXingResult::new( @@ -650,9 +645,7 @@ impl RSSExpandedReader { let leftChar = self.decodeDataCharacter( row, - pattern - .as_ref() - .ok_or(Exceptions::NotFoundException(None))?, + pattern.as_ref().ok_or(Exceptions::notFound)?, isOddPattern, true, )?; @@ -660,18 +653,16 @@ impl RSSExpandedReader { if !previousPairs.is_empty() && previousPairs .last() - .ok_or(Exceptions::NotFoundException(None))? + .ok_or(Exceptions::notFound)? .mustBeLast() { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let rightChar = self .decodeDataCharacter( row, - pattern - .as_ref() - .ok_or(Exceptions::NotFoundException(None))?, + pattern.as_ref().ok_or(Exceptions::notFound)?, isOddPattern, false, ) @@ -701,13 +692,11 @@ impl RSSExpandedReader { } else if previousPairs.is_empty() { rowOffset = 0; } else { - let lastPair = previousPairs - .last() - .ok_or(Exceptions::IndexOutOfBoundsException(None))?; + let lastPair = previousPairs.last().ok_or(Exceptions::indexOutOfBounds)?; rowOffset = lastPair .getFinderPattern() .as_ref() - .ok_or(Exceptions::IllegalStateException(None))? + .ok_or(Exceptions::illegalState)? .getStartEnd()[1] as i32; } let mut searchingEvenPair = previousPairs.len() % 2 != 0; @@ -759,7 +748,7 @@ impl RSSExpandedReader { isWhite = !isWhite; } } - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } fn reverseCounters(counters: &mut [u32]) { @@ -856,7 +845,7 @@ impl RSSExpandedReader { let expectedElementWidth: f32 = (pattern.getStartEnd()[1] - pattern.getStartEnd()[0]) as f32 / 15.0; if (elementWidth - expectedElementWidth).abs() / expectedElementWidth > 0.3 { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } for (i, counter) in counters.iter().enumerate() { @@ -865,12 +854,12 @@ impl RSSExpandedReader { let mut count = (value + 0.5) as i32; // Round if count < 1 { if value < 0.3 { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } count = 1; } else if count > 8 { if value > 8.7 { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } count = 8; } @@ -910,7 +899,7 @@ impl RSSExpandedReader { let checksumPortion = oddChecksumPortion + evenChecksumPortion; if (oddSum & 0x01) != 0 || !(4..=13).contains(&oddSum) { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let group = ((13 - oddSum) / 2) as usize; @@ -958,12 +947,12 @@ impl RSSExpandedReader { 1 => { if oddParityBad { if evenParityBad { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } decrementOdd = true; } else { if !evenParityBad { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } decrementEven = true; } @@ -971,12 +960,12 @@ impl RSSExpandedReader { -1 => { if oddParityBad { if evenParityBad { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } incrementOdd = true; } else { if !evenParityBad { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } incrementEven = true; } @@ -984,7 +973,7 @@ impl RSSExpandedReader { 0 => { if oddParityBad { if !evenParityBad { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } // Both bad if oddSum < evenSum { @@ -995,16 +984,16 @@ impl RSSExpandedReader { incrementEven = true; } } else if evenParityBad { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } } - _ => return Err(Exceptions::NotFoundException(None)), + _ => return Err(Exceptions::notFound), } if incrementOdd { if decrementOdd { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } Self::increment(&mut self.oddCounts, &self.oddRoundingErrors); } @@ -1013,7 +1002,7 @@ impl RSSExpandedReader { } if incrementEven { if decrementEven { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } Self::increment(&mut self.evenCounts, &self.oddRoundingErrors); } diff --git a/src/oned/rss/rss_14_reader.rs b/src/oned/rss/rss_14_reader.rs index 3dd0b03..289023e 100644 --- a/src/oned/rss/rss_14_reader.rs +++ b/src/oned/rss/rss_14_reader.rs @@ -64,12 +64,12 @@ impl OneDReader for RSS14Reader { if right.getCount() > 1 && self.checkChecksum(left, right) { return self .constructRXingResult(left, right) - .ok_or(Exceptions::IllegalStateException(None)); + .ok_or(Exceptions::illegalState); } } } } - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } } impl Reader for RSS14Reader { @@ -123,7 +123,7 @@ impl Reader for RSS14Reader { Ok(result) } else { - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } } } @@ -340,7 +340,7 @@ impl RSS14Reader { if outsideChar { if (oddSum & 0x01) != 0 || !(4..=12).contains(&oddSum) { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let group = ((12 - oddSum) / 2) as usize; let oddWidest = Self::OUTSIDE_ODD_WIDEST[group]; @@ -355,7 +355,7 @@ impl RSS14Reader { )) } else { if (evenSum & 0x01) != 0 || !(4..=10).contains(&evenSum) { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let group = ((10 - evenSum) / 2) as usize; let oddWidest = Self::INSIDE_ODD_WIDEST[group]; @@ -414,7 +414,7 @@ impl RSS14Reader { isWhite = !isWhite; } } - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } fn parseFoundFinderPattern( @@ -511,12 +511,12 @@ impl RSS14Reader { 1 => { if oddParityBad { if evenParityBad { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } decrementOdd = true; } else { if !evenParityBad { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } decrementEven = true; } @@ -524,12 +524,12 @@ impl RSS14Reader { -1 => { if oddParityBad { if evenParityBad { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } incrementOdd = true; } else { if !evenParityBad { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } incrementEven = true; } @@ -537,7 +537,7 @@ impl RSS14Reader { 0 => { if oddParityBad { if !evenParityBad { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } // Both bad if oddSum < evenSum { @@ -548,15 +548,15 @@ impl RSS14Reader { incrementEven = true; } } else if evenParityBad { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } } - _ => return Err(Exceptions::NotFoundException(None)), + _ => return Err(Exceptions::notFound), } if incrementOdd { if decrementOdd { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } Self::increment(&mut self.oddCounts, &self.oddRoundingErrors); } @@ -565,7 +565,7 @@ impl RSS14Reader { } if incrementEven { if decrementEven { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } Self::increment(&mut self.evenCounts, &self.evenRoundingErrors); } diff --git a/src/oned/upc_a_reader.rs b/src/oned/upc_a_reader.rs index 4f5eefa..2222438 100644 --- a/src/oned/upc_a_reader.rs +++ b/src/oned/upc_a_reader.rs @@ -101,7 +101,7 @@ impl UPCAReader { Ok(upcaRXingResult) } else { - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } } } diff --git a/src/oned/upc_a_writer.rs b/src/oned/upc_a_writer.rs index 19d5954..f414d69 100644 --- a/src/oned/upc_a_writer.rs +++ b/src/oned/upc_a_writer.rs @@ -48,9 +48,9 @@ impl Writer for UPCAWriter { hints: &crate::EncodingHintDictionary, ) -> Result { if format != &BarcodeFormat::UPC_A { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Can only encode UPC-A, but got {format:?}" - )))); + ))); } // Transform a UPC-A code into the equivalent EAN-13 code and write it that way self.0.encode_with_hints( diff --git a/src/oned/upc_e_reader.rs b/src/oned/upc_e_reader.rs index f74f410..13b8c87 100644 --- a/src/oned/upc_e_reader.rs +++ b/src/oned/upc_e_reader.rs @@ -49,10 +49,8 @@ impl UPCEANReader for UPCEReader { let mut x = 0; while x < 6 && rowOffset < end { let bestMatch = self.decodeDigit(row, &mut counters, rowOffset, &L_AND_G_PATTERNS)?; - resultString.push( - char::from_u32('0' as u32 + bestMatch as u32 % 10) - .ok_or(Exceptions::ParseException(None))?, - ); + resultString + .push(char::from_u32('0' as u32 + bestMatch as u32 % 10).ok_or(Exceptions::parse)?); rowOffset += counters.iter().sum::() as usize; if bestMatch >= 10 { @@ -128,18 +126,15 @@ impl UPCEReader { if lgPatternFound == Self::NUMSYS_AND_CHECK_DIGIT_PATTERNS[numSys][d] { resultString.insert( 0, - char::from_u32('0' as u32 + numSys as u32) - .ok_or(Exceptions::ParseException(None))?, - ); - resultString.push( - char::from_u32('0' as u32 + d as u32) - .ok_or(Exceptions::ParseException(None))?, + char::from_u32('0' as u32 + numSys as u32).ok_or(Exceptions::parse)?, ); + resultString + .push(char::from_u32('0' as u32 + d as u32).ok_or(Exceptions::parse)?); return Ok(()); } } } - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } } diff --git a/src/oned/upc_e_writer.rs b/src/oned/upc_e_writer.rs index 1b21de2..cfad829 100644 --- a/src/oned/upc_e_writer.rs +++ b/src/oned/upc_e_writer.rs @@ -47,24 +47,24 @@ impl OneDimensionalCodeWriter for UPCEWriter { // No check digit present, calculate it and add it let check = reader.getStandardUPCEANChecksum( &upc_e_reader::convertUPCEtoUPCA(&contents) - .ok_or(Exceptions::IllegalArgumentException(None))?, + .ok_or(Exceptions::illegalArgument)?, )?; contents.push_str(&check.to_string()); } 8 => { if !reader.checkStandardUPCEANChecksum( &upc_e_reader::convertUPCEtoUPCA(&contents) - .ok_or(Exceptions::IllegalArgumentException(None))?, + .ok_or(Exceptions::illegalArgument)?, )? { - return Err(Exceptions::IllegalArgumentException(Some( - "Contents do not pass checksum".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "Contents do not pass checksum", + )); } } _ => { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Requested contents should be 7 or 8 digits long, but got {length}" - )))) + ))) } } @@ -73,21 +73,21 @@ impl OneDimensionalCodeWriter for UPCEWriter { let firstDigit = contents .chars() .next() - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? .to_digit(10) - .ok_or(Exceptions::ParseException(None))? as usize; //Character.digit(contents.charAt(0), 10); + .ok_or(Exceptions::parse)? as usize; //Character.digit(contents.charAt(0), 10); if firstDigit != 0 && firstDigit != 1 { - return Err(Exceptions::IllegalArgumentException(Some( - "Number system must be 0 or 1".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "Number system must be 0 or 1", + )); } let checkDigit = contents .chars() .nth(7) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? .to_digit(10) - .ok_or(Exceptions::ParseException(None))? as usize; //Character.digit(contents.charAt(7), 10); + .ok_or(Exceptions::parse)? as usize; //Character.digit(contents.charAt(7), 10); let parities = UPCEReader::NUMSYS_AND_CHECK_DIGIT_PATTERNS[firstDigit][checkDigit]; let mut result = [false; CODE_WIDTH]; @@ -99,9 +99,9 @@ impl OneDimensionalCodeWriter for UPCEWriter { let mut digit = contents .chars() .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? .to_digit(10) - .ok_or(Exceptions::ParseException(None))? as usize; //Character.digit(contents.charAt(i), 10); + .ok_or(Exceptions::parse)? as usize; //Character.digit(contents.charAt(i), 10); if (parities >> (6 - i) & 1) == 1 { digit += 10; } diff --git a/src/oned/upc_ean_extension_2_support.rs b/src/oned/upc_ean_extension_2_support.rs index 4e79d82..13f7ce6 100644 --- a/src/oned/upc_ean_extension_2_support.rs +++ b/src/oned/upc_ean_extension_2_support.rs @@ -87,10 +87,8 @@ impl UPCEANExtension2Support { rowOffset, &upc_ean_reader::L_AND_G_PATTERNS, )?; - resultString.push( - char::from_u32('0' as u32 + bestMatch as u32 % 10) - .ok_or(Exceptions::ParseException(None))?, - ); + resultString + .push(char::from_u32('0' as u32 + bestMatch as u32 % 10).ok_or(Exceptions::parse)?); rowOffset += counters.iter().sum::() as usize; @@ -106,15 +104,16 @@ impl UPCEANExtension2Support { } if resultString.chars().count() != 2 { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } - if resultString.parse::().map_err(|e| { - Exceptions::ParseException(Some(format!("could not parse {resultString}: {e}"))) - })? % 4 + if resultString + .parse::() + .map_err(|e| Exceptions::parseWith(format!("could not parse {resultString}: {e}")))? + % 4 != checkParity { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } Ok(rowOffset as u32) diff --git a/src/oned/upc_ean_extension_5_support.rs b/src/oned/upc_ean_extension_5_support.rs index 30518f7..7748af1 100644 --- a/src/oned/upc_ean_extension_5_support.rs +++ b/src/oned/upc_ean_extension_5_support.rs @@ -86,10 +86,8 @@ impl UPCEANExtension5Support { rowOffset, &upc_ean_reader::L_AND_G_PATTERNS, )?; - resultString.push( - char::from_u32('0' as u32 + bestMatch as u32 % 10) - .ok_or(Exceptions::ParseException(None))?, - ); + resultString + .push(char::from_u32('0' as u32 + bestMatch as u32 % 10).ok_or(Exceptions::parse)?); rowOffset += counters.iter().sum::() as usize; @@ -106,15 +104,14 @@ impl UPCEANExtension5Support { } if resultString.chars().count() != 5 { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let checkDigit = Self::determineCheckDigit(lgPatternFound)?; - if Self::extensionChecksum(resultString) - .ok_or(Exceptions::IllegalArgumentException(None))? + if Self::extensionChecksum(resultString).ok_or(Exceptions::illegalArgument)? != checkDigit as u32 { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } Ok(rowOffset as u32) @@ -149,7 +146,7 @@ impl UPCEANExtension5Support { return Ok(d); } } - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } /** diff --git a/src/oned/upc_ean_reader.rs b/src/oned/upc_ean_reader.rs index 0adb5e8..021f61e 100644 --- a/src/oned/upc_ean_reader.rs +++ b/src/oned/upc_ean_reader.rs @@ -183,18 +183,18 @@ pub trait UPCEANReader: OneDReader { let end = endRange[1]; let quietEnd = end + (end - endRange[0]); if quietEnd >= row.getSize() || !row.isRange(end, quietEnd, false)? { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let resultString = result; // UPC/EAN should never be less than 8 chars anyway if resultString.chars().count() < 8 { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } if !self.checkChecksum(&resultString)? { - return Err(Exceptions::ChecksumException(None)); + return Err(Exceptions::checksum); } let left = (startGuardRange[1] + startGuardRange[0]) as f32 / 2.0; @@ -241,7 +241,7 @@ pub trait UPCEANReader: OneDReader { } } if !valid { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } } @@ -292,7 +292,7 @@ pub trait UPCEANReader: OneDReader { let char_in_question = s .chars() .nth(length - 1) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?; + .ok_or(Exceptions::indexOutOfBounds)?; let check = char_in_question.is_ascii_digit(); let check_against = &s[..length - 1]; //s.subSequence(0, length - 1); @@ -300,9 +300,7 @@ pub trait UPCEANReader: OneDReader { Ok(calculated_checksum == if check { - char_in_question - .to_digit(10) - .ok_or(Exceptions::ParseException(None))? + char_in_question.to_digit(10).ok_or(Exceptions::parse)? } else { u32::MAX }) @@ -314,13 +312,13 @@ pub trait UPCEANReader: OneDReader { let mut i = length as isize - 1; while i >= 0 { // for (int i = length - 1; i >= 0; i -= 2) { - let digit = - (s.chars() - .nth(i as usize) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? as i32) - - ('0' as i32); + let digit = (s + .chars() + .nth(i as usize) + .ok_or(Exceptions::indexOutOfBounds)? as i32) + - ('0' as i32); if !(0..=9).contains(&digit) { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } sum += digit; @@ -330,13 +328,13 @@ pub trait UPCEANReader: OneDReader { let mut i = length as isize - 2; while i >= 0 { // for (int i = length - 2; i >= 0; i -= 2) { - let digit = - (s.chars() - .nth(i as usize) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? as i32) - - ('0' as i32); + let digit = (s + .chars() + .nth(i as usize) + .ok_or(Exceptions::indexOutOfBounds)? as i32) + - ('0' as i32); if !(0..=9).contains(&digit) { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } sum += digit; @@ -423,7 +421,7 @@ pub trait UPCEANReader: OneDReader { } } - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } /** @@ -460,7 +458,7 @@ pub trait UPCEANReader: OneDReader { if bestMatch >= 0 { Ok(bestMatch as usize) } else { - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } } diff --git a/src/pdf417/decoder/bounding_box.rs b/src/pdf417/decoder/bounding_box.rs index e9eae48..c42f713 100644 --- a/src/pdf417/decoder/bounding_box.rs +++ b/src/pdf417/decoder/bounding_box.rs @@ -47,7 +47,7 @@ impl BoundingBox { let leftUnspecified = topLeft.is_none() || bottomLeft.is_none(); let rightUnspecified = topRight.is_none() || bottomRight.is_none(); if leftUnspecified && rightUnspecified { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let newTopLeft; @@ -56,20 +56,20 @@ impl BoundingBox { let newBottomRight; if leftUnspecified { - newTopRight = topRight.ok_or(Exceptions::IllegalStateException(None))?; - newBottomRight = bottomRight.ok_or(Exceptions::IllegalStateException(None))?; + newTopRight = topRight.ok_or(Exceptions::illegalState)?; + newBottomRight = bottomRight.ok_or(Exceptions::illegalState)?; newTopLeft = point(0.0, newTopRight.y); newBottomLeft = point(0.0, newBottomRight.y); } else if rightUnspecified { - newTopLeft = topLeft.ok_or(Exceptions::IllegalStateException(None))?; - newBottomLeft = bottomLeft.ok_or(Exceptions::IllegalStateException(None))?; + newTopLeft = topLeft.ok_or(Exceptions::illegalState)?; + newBottomLeft = bottomLeft.ok_or(Exceptions::illegalState)?; newTopRight = point(image.getWidth() as f32 - 1.0, newTopLeft.y); newBottomRight = point(image.getWidth() as f32 - 1.0, newBottomLeft.y); } else { - newTopLeft = topLeft.ok_or(Exceptions::IllegalStateException(None))?; - newTopRight = topRight.ok_or(Exceptions::IllegalStateException(None))?; - newBottomLeft = bottomLeft.ok_or(Exceptions::IllegalStateException(None))?; - newBottomRight = bottomRight.ok_or(Exceptions::IllegalStateException(None))?; + newTopLeft = topLeft.ok_or(Exceptions::illegalState)?; + newTopRight = topRight.ok_or(Exceptions::illegalState)?; + newBottomLeft = bottomLeft.ok_or(Exceptions::illegalState)?; + newBottomRight = bottomRight.ok_or(Exceptions::illegalState)?; } Ok(BoundingBox { @@ -104,19 +104,13 @@ impl BoundingBox { rightBox: Option, ) -> Result { if leftBox.is_none() { - return Ok(rightBox - .as_ref() - .ok_or(Exceptions::IllegalStateException(None))? - .clone()); + return Ok(rightBox.as_ref().ok_or(Exceptions::illegalState)?.clone()); } if rightBox.is_none() { - return Ok(leftBox - .as_ref() - .ok_or(Exceptions::IllegalStateException(None))? - .clone()); + return Ok(leftBox.as_ref().ok_or(Exceptions::illegalState)?.clone()); } - let leftBox = leftBox.ok_or(Exceptions::IllegalStateException(None))?; - let rightBox = rightBox.ok_or(Exceptions::IllegalStateException(None))?; + let leftBox = leftBox.ok_or(Exceptions::illegalState)?; + let rightBox = rightBox.ok_or(Exceptions::illegalState)?; BoundingBox::new( leftBox.image, diff --git a/src/pdf417/decoder/decoded_bit_stream_parser.rs b/src/pdf417/decoder/decoded_bit_stream_parser.rs index 9d2651e..956bd83 100644 --- a/src/pdf417/decoder/decoded_bit_stream_parser.rs +++ b/src/pdf417/decoder/decoded_bit_stream_parser.rs @@ -121,9 +121,7 @@ pub fn decode(codewords: &[u32], ecLevel: &str) -> Result { codeIndex = byteCompaction(code, codewords, codeIndex, &mut result)? } MODE_SHIFT_TO_BYTE_COMPACTION_MODE => { - result.append_char( - char::from_u32(codewords[codeIndex]).ok_or(Exceptions::ParseException(None))?, - ); + result.append_char(char::from_u32(codewords[codeIndex]).ok_or(Exceptions::parse)?); codeIndex += 1; } NUMERIC_COMPACTION_MODE_LATCH => { @@ -149,7 +147,7 @@ pub fn decode(codewords: &[u32], ecLevel: &str) -> Result { BEGIN_MACRO_PDF417_OPTIONAL_FIELD | MACRO_PDF417_TERMINATOR => // Should not see these outside a macro block { - return Err(Exceptions::FormatException(None)) + return Err(Exceptions::format) } _ => { // Default to text compaction. During testing numerous barcodes @@ -164,7 +162,7 @@ pub fn decode(codewords: &[u32], ecLevel: &str) -> Result { result = result.build_result(); if result.is_empty() && resultMetadata.getFileId().is_empty() { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } let mut decoderRXingResult = DecoderRXingResult::new( @@ -186,7 +184,7 @@ pub fn decodeMacroBlock( let mut codeIndex = codeIndex; if codeIndex + NUMBER_OF_SEQUENCE_CODEWORDS > codewords[0] as usize { // we must have at least two bytes left for the segment index - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } let mut segmentIndexArray = [0; NUMBER_OF_SEQUENCE_CODEWORDS]; for seq in segmentIndexArray @@ -204,7 +202,7 @@ pub fn decodeMacroBlock( resultMetadata.setSegmentIndex(parsed_int); } else { // too large; bad input? - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } // Decoding the fileId codewords as 0-899 numbers, each 0-filled to width 3. This follows the spec @@ -221,7 +219,7 @@ pub fn decodeMacroBlock( } if fileId.chars().count() == 0 { // at least one fileId codeword is required (Annex H.2) - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } resultMetadata.setFileId(fileId); @@ -258,7 +256,7 @@ pub fn decodeMacroBlock( codeIndex = numericCompaction(codewords, codeIndex + 1, &mut segmentCount)?; segmentCount = segmentCount.build_result(); let Ok(parsed_segment_count) = segmentCount.to_string().parse() else { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); }; resultMetadata.setSegmentCount(parsed_segment_count); } @@ -267,7 +265,7 @@ pub fn decodeMacroBlock( codeIndex = numericCompaction(codewords, codeIndex + 1, &mut timestamp)?; timestamp = timestamp.build_result(); let Ok(parsed_timestamp) = timestamp.to_string().parse() else { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); }; resultMetadata.setTimestamp(parsed_timestamp); } @@ -276,7 +274,7 @@ pub fn decodeMacroBlock( codeIndex = numericCompaction(codewords, codeIndex + 1, &mut checksum)?; checksum = checksum.build_result(); let Ok(parsed_checksum ) = checksum.to_string().parse() else { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); }; resultMetadata.setChecksum(parsed_checksum); } @@ -285,18 +283,18 @@ pub fn decodeMacroBlock( codeIndex = numericCompaction(codewords, codeIndex + 1, &mut fileSize)?; fileSize = fileSize.build_result(); let Ok(parsed_file_size)= fileSize.to_string().parse() else { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); }; resultMetadata.setFileSize(parsed_file_size); } - _ => return Err(Exceptions::FormatException(None)), + _ => return Err(Exceptions::format), } } MACRO_PDF417_TERMINATOR => { codeIndex += 1; resultMetadata.setLastSegment(true); } - _ => return Err(Exceptions::FormatException(None)), + _ => return Err(Exceptions::format), } } @@ -388,7 +386,7 @@ fn textCompaction( result, subMode, ) - .ok_or(Exceptions::IllegalStateException(None))?; + .ok_or(Exceptions::illegalState)?; result.appendECI(codewords[codeIndex])?; codeIndex += 1; textCompactionData = vec![0; (codewords[0] as usize - codeIndex) * 2]; @@ -774,14 +772,12 @@ fn decodeBase900toBase10(codewords: &[u32], count: usize) -> Result { .to_biguint() .ok_or(Exceptions::ArithmeticException(None))?; for i in 0..count { - result += &EXP900[count - i - 1] - * (codewords[i] - .to_biguint() - .ok_or(Exceptions::ArithmeticException(None))?); + result += + &EXP900[count - i - 1] * (codewords[i].to_biguint().ok_or(Exceptions::arithmetic)?); } let resultString = result.to_string(); if !resultString.starts_with('1') { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } Ok(resultString[1..].to_owned()) } diff --git a/src/pdf417/decoder/ec/error_correction.rs b/src/pdf417/decoder/ec/error_correction.rs index 65a9f6d..47759ac 100644 --- a/src/pdf417/decoder/ec/error_correction.rs +++ b/src/pdf417/decoder/ec/error_correction.rs @@ -100,7 +100,7 @@ pub fn decode(received: &mut [u32], numECCodewords: u32, erasures: &mut [u32]) - // for (int i = 0; i < errorLocations.length; i++) { let position = received.len() as isize - 1 - field.log(errorLocations[i])? as isize; if position < 0 { - return Err(Exceptions::ChecksumException(Some(file!().to_string()))); + return Err(Exceptions::checksumWith(file!())); } received[position as usize] = field.subtract(received[position as usize], errorMagnitudes[i]); @@ -137,7 +137,7 @@ fn runEuclideanAlgorithm( // Divide rLastLast by rLast, with quotient in q and remainder in r if rLast.isZero() { // Oops, Euclidean algorithm already terminated? - return Err(Exceptions::ChecksumException(Some(file!().to_string()))); + return Err(Exceptions::checksumWith(file!())); } r = rLastLast; let mut q = ModulusPoly::getZero(field); //field.getZero(); @@ -159,7 +159,7 @@ fn runEuclideanAlgorithm( let sigmaTildeAtZero = t.getCoefficient(0); if sigmaTildeAtZero == 0 { - return Err(Exceptions::ChecksumException(Some(file!().to_string()))); + return Err(Exceptions::checksumWith(file!())); } let inverse = field.inverse(sigmaTildeAtZero)?; @@ -184,7 +184,7 @@ fn findErrorLocations(errorLocator: Rc, field: &ModulusGF) -> Resul i += 1; } if e != numErrors { - return Err(Exceptions::ChecksumException(Some(file!().to_string()))); + return Err(Exceptions::checksumWith(file!())); } Ok(result) } diff --git a/src/pdf417/decoder/ec/modulus_gf.rs b/src/pdf417/decoder/ec/modulus_gf.rs index d67d375..ae97f3f 100644 --- a/src/pdf417/decoder/ec/modulus_gf.rs +++ b/src/pdf417/decoder/ec/modulus_gf.rs @@ -78,7 +78,7 @@ impl ModulusGF { pub fn log(&self, a: u32) -> Result { if a == 0 { - Err(Exceptions::ArithmeticException(None)) + Err(Exceptions::arithmetic) } else { Ok(self.logTable[a as usize]) } @@ -86,7 +86,7 @@ impl ModulusGF { pub fn inverse(&self, a: u32) -> Result { if a == 0 { - Err(Exceptions::ArithmeticException(None)) + Err(Exceptions::arithmetic) } else { Ok(self.expTable[self.modulus as usize - self.logTable[a as usize] as usize - 1]) } diff --git a/src/pdf417/decoder/ec/modulus_poly.rs b/src/pdf417/decoder/ec/modulus_poly.rs index 35c40a9..34957c0 100644 --- a/src/pdf417/decoder/ec/modulus_poly.rs +++ b/src/pdf417/decoder/ec/modulus_poly.rs @@ -34,7 +34,7 @@ pub struct ModulusPoly { impl ModulusPoly { pub fn new(field: &'static ModulusGF, coefficients: Vec) -> Result { if coefficients.is_empty() { - return Err(Exceptions::IllegalArgumentException(None)); + return Err(Exceptions::illegalArgument); } let orig_coefs = coefficients.clone(); let mut coefficients = coefficients; @@ -124,9 +124,9 @@ impl ModulusPoly { pub fn add(&self, other: Rc) -> Result> { if self.field != other.field { - return Err(Exceptions::IllegalArgumentException(Some( - "ModulusPolys do not have same ModulusGF field".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "ModulusPolys do not have same ModulusGF field", + )); } if self.isZero() { return Ok(other); @@ -158,9 +158,9 @@ impl ModulusPoly { pub fn subtract(&self, other: Rc) -> Result> { if self.field != other.field { - return Err(Exceptions::IllegalArgumentException(Some( - "ModulusPolys do not have same ModulusGF field".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "ModulusPolys do not have same ModulusGF field", + )); } if other.isZero() { return Ok(Rc::new(self.clone())); @@ -170,9 +170,9 @@ impl ModulusPoly { pub fn multiply(&self, other: Rc) -> Result> { if !(self.field == other.field) { - return Err(Exceptions::IllegalArgumentException(Some( - "ModulusPolys do not have same ModulusGF field".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "ModulusPolys do not have same ModulusGF field", + )); } if self.isZero() || other.isZero() { return Ok(Self::getZero(self.field)); diff --git a/src/pdf417/decoder/pdf_417_scanning_decoder.rs b/src/pdf417/decoder/pdf_417_scanning_decoder.rs index 213cacd..6977d8f 100644 --- a/src/pdf417/decoder/pdf_417_scanning_decoder.rs +++ b/src/pdf417/decoder/pdf_417_scanning_decoder.rs @@ -86,7 +86,7 @@ pub fn decode( } detectionRXingResult = merge(&mut leftRowIndicatorColumn, &mut rightRowIndicatorColumn)?; if detectionRXingResult.is_none() { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } // detectionRXingResult = detectionRXingResult; @@ -142,7 +142,7 @@ pub fn decode( // for (int imageRow = boundingBox.getMinY(); imageRow <= boundingBox.getMaxY(); imageRow++) { startColumn = getStartColumn(&detectionRXingResult, barcodeColumn, imageRow, leftToRight) - .ok_or(Exceptions::IllegalStateException(None))? as i32; + .ok_or(Exceptions::illegalState)? as i32; if startColumn < 0 || startColumn > boundingBox.getMaxX() as i32 { if previousStartColumn == -1 { continue; @@ -412,7 +412,7 @@ fn adjustCodewordCount( as u32; if numberOfCodewords.is_empty() { if !(1..=pdf_417_common::MAX_CODEWORDS_IN_BARCODE).contains(&calculatedNumberOfCodewords) { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } barcodeMatrix01.setValue(calculatedNumberOfCodewords); } else if numberOfCodewords[0] != calculatedNumberOfCodewords @@ -508,7 +508,7 @@ fn createDecoderRXingResultFromAmbiguousValues( // // // } if ambiguousIndexCount.is_empty() { - return Err(Exceptions::ChecksumException(None)); + return Err(Exceptions::checksum); } for i in 0..ambiguousIndexCount.len() { // for (int i = 0; i < ambiguousIndexCount.length; i++) { @@ -518,14 +518,14 @@ fn createDecoderRXingResultFromAmbiguousValues( } else { ambiguousIndexCount[i] = 0; if i == ambiguousIndexCount.len() - 1 { - return Err(Exceptions::ChecksumException(None)); + return Err(Exceptions::checksum); } } } tries -= 1; } - Err(Exceptions::ChecksumException(None)) + Err(Exceptions::checksum) } fn createBarcodeMatrix(detectionRXingResult: &mut DetectionRXingResult) -> Vec> { @@ -845,7 +845,7 @@ fn decodeCodewords( erasures: &mut [u32], ) -> Result { if codewords.is_empty() { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } let numECCodewords = 1 << (ecLevel + 1); @@ -880,7 +880,7 @@ fn correctErrors( || numECCodewords > MAX_EC_CODEWORDS { // Too many errors or EC Codewords is corrupted - return Err(Exceptions::ChecksumException(None)); + return Err(Exceptions::checksum); } ec::error_correction::decode(codewords, numECCodewords, erasures) } @@ -892,21 +892,21 @@ fn verifyCodewordCount(codewords: &mut [u32], numECCodewords: u32) -> Result<()> if codewords.len() < 4 { // Codeword array size should be at least 4 allowing for // Count CW, At least one Data CW, Error Correction CW, Error Correction CW - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } // The first codeword, the Symbol Length Descriptor, shall always encode the total number of data // codewords in the symbol, including the Symbol Length Descriptor itself, data codewords and pad // codewords, but excluding the number of error correction codewords. let numberOfCodewords = codewords[0]; if numberOfCodewords > codewords.len() as u32 { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } if numberOfCodewords == 0 { // Reset to the length of the array - 8 (Allow for at least level 3 Error Correction (8 Error Codewords) if numECCodewords < codewords.len() as u32 { codewords[0] = codewords.len() as u32 - numECCodewords; } else { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } } Ok(()) diff --git a/src/pdf417/detector/pdf_417_detector.rs b/src/pdf417/detector/pdf_417_detector.rs index a17ecf5..1bf1935 100644 --- a/src/pdf417/detector/pdf_417_detector.rs +++ b/src/pdf417/detector/pdf_417_detector.rs @@ -78,8 +78,7 @@ pub fn detect_with_hints( for rotation in ROTATIONS { // for (int rotation : ROTATIONS) { let bitMatrix = applyRotation(originalMatrix, rotation)?; - let barcodeCoordinates = - detect(multiple, &bitMatrix).ok_or(Exceptions::NotFoundException(None))?; + let barcodeCoordinates = detect(multiple, &bitMatrix).ok_or(Exceptions::notFound)?; if !barcodeCoordinates.is_empty() { return Ok(PDF417DetectorRXingResult::with_rotation( bitMatrix.into_owned(), diff --git a/src/pdf417/encoder/compaction.rs b/src/pdf417/encoder/compaction.rs index 4f4b24f..8de3364 100644 --- a/src/pdf417/encoder/compaction.rs +++ b/src/pdf417/encoder/compaction.rs @@ -40,8 +40,8 @@ impl TryFrom<&String> for Compaction { _ => {} } } - Err(Exceptions::FormatException(Some(format!( + Err(Exceptions::formatWith(format!( "Compaction must be 0-3 (inclusivie). Found: {value}" - )))) + ))) } } diff --git a/src/pdf417/encoder/pdf_417.rs b/src/pdf417/encoder/pdf_417.rs index 62114f6..2ee5dca 100644 --- a/src/pdf417/encoder/pdf_417.rs +++ b/src/pdf417/encoder/pdf_417.rs @@ -162,7 +162,7 @@ impl PDF417 { pattern = CODEWORD_TABLE[cluster][fullCodewords .chars() .nth(idx) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? as usize]; Self::encodeChar(pattern, 17, logic.getCurrentRowMut()); idx += 1; @@ -223,17 +223,17 @@ impl PDF417 { //2. step: construct data codewords if sourceCodeWords + errorCorrectionCodeWords + 1 > 929 { // +1 for symbol length CW - return Err(Exceptions::WriterException(Some(format!( + return Err(Exceptions::writerWith(format!( "Encoded message contains too many code words, message too big ({} bytes)", msg.chars().count() - )))); + ))); } let n = sourceCodeWords + pad + 1; let mut sb = String::with_capacity(n as usize); - sb.push(char::from_u32(n).ok_or(Exceptions::ParseException(None))?); + sb.push(char::from_u32(n).ok_or(Exceptions::parse)?); sb.push_str(&highLevel); for _i in 0..pad { - sb.push(char::from_u32(900).ok_or(Exceptions::ParseException(None))?); + sb.push(char::from_u32(900).ok_or(Exceptions::parse)?); //PAD characters } let dataCodewords = sb; @@ -312,9 +312,7 @@ impl PDF417 { } } - dimension.ok_or(Exceptions::WriterException(Some( - "Unable to fit message in columns".to_owned(), - ))) + dimension.ok_or(Exceptions::writerWith("Unable to fit message in columns")) } /** diff --git a/src/pdf417/encoder/pdf_417_error_correction.rs b/src/pdf417/encoder/pdf_417_error_correction.rs index ed56ca6..d3328d5 100644 --- a/src/pdf417/encoder/pdf_417_error_correction.rs +++ b/src/pdf417/encoder/pdf_417_error_correction.rs @@ -120,9 +120,9 @@ static EC_COEFFICIENTS: Lazy<[Vec; 9]> = Lazy::new(|| { */ pub fn getErrorCorrectionCodewordCount(errorCorrectionLevel: u32) -> Result { if errorCorrectionLevel > 8 { - return Err(Exceptions::IllegalArgumentException(Some( - "Error correction level must be between 0 and 8!".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "Error correction level must be between 0 and 8!", + )); } Ok(1 << (errorCorrectionLevel + 1)) } @@ -136,9 +136,7 @@ pub fn getErrorCorrectionCodewordCount(errorCorrectionLevel: u32) -> Result */ pub fn getRecommendedMinimumErrorCorrectionLevel(n: u32) -> Result { if n == 0 { - Err(Exceptions::IllegalArgumentException(Some( - "n must be > 0".to_owned(), - ))) + Err(Exceptions::illegalArgumentWith("n must be > 0")) } else if n <= 40 { Ok(2) } else if n <= 160 { @@ -148,9 +146,7 @@ pub fn getRecommendedMinimumErrorCorrectionLevel(n: u32) -> Result { } else if n <= 863 { Ok(5) } else { - Err(Exceptions::WriterException(Some( - "No recommendation possible".to_owned(), - ))) + Err(Exceptions::writerWith("No recommendation possible")) } } @@ -169,7 +165,7 @@ pub fn generateErrorCorrection(dataCodewords: &str, errorCorrectionLevel: u32) - let t1 = (dataCodewords .chars() .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? as u32 + .ok_or(Exceptions::indexOutOfBounds)? as u32 + e[e.len() - 1] as u32) % 929; let mut t2; @@ -178,20 +174,18 @@ pub fn generateErrorCorrection(dataCodewords: &str, errorCorrectionLevel: u32) - while j >= 1 { t2 = (t1 * EC_COEFFICIENTS[errorCorrectionLevel as usize][j]) % 929; t3 = 929 - t2; - e[j] = char::from_u32((e[j - 1] as u32 + t3) % 929) - .ok_or(Exceptions::ParseException(None))?; + e[j] = char::from_u32((e[j - 1] as u32 + t3) % 929).ok_or(Exceptions::parse)?; j -= 1; } t2 = (t1 * EC_COEFFICIENTS[errorCorrectionLevel as usize][0]) % 929; t3 = 929 - t2; - e[0] = char::from_u32(t3 % 929).ok_or(Exceptions::ParseException(None))?; + e[0] = char::from_u32(t3 % 929).ok_or(Exceptions::parse)?; } let mut sb = String::with_capacity(k as usize); let mut j = k as isize - 1; while j >= 0 { if e[j as usize] as u32 != 0 { - e[j as usize] = char::from_u32(929 - e[j as usize] as u32) - .ok_or(Exceptions::ParseException(None))?; + e[j as usize] = char::from_u32(929 - e[j as usize] as u32).ok_or(Exceptions::parse)?; } sb.push(e[j as usize]); diff --git a/src/pdf417/encoder/pdf_417_high_level_encoder.rs b/src/pdf417/encoder/pdf_417_high_level_encoder.rs index e0031af..17f949f 100644 --- a/src/pdf417/encoder/pdf_417_high_level_encoder.rs +++ b/src/pdf417/encoder/pdf_417_high_level_encoder.rs @@ -179,15 +179,13 @@ pub fn encodeHighLevel( ) -> Result { let mut encoding = encoding; if msg.is_empty() { - return Err(Exceptions::WriterException(Some( - "Empty message not allowed".to_owned(), - ))); + return Err(Exceptions::writerWith("Empty message not allowed")); } if encoding.is_none() && !autoECI { for ch in msg.chars() { if ch as u32 > 255 { - return Err(Exceptions::WriterException(Some(format!("Non-encodable character detected: {} (Unicode: {}). Consider specifying EncodeHintType.PDF417_AUTO_ECI and/or EncodeTypeHint.CHARACTER_SET.",ch as u32,ch)))); + return Err(Exceptions::writerWith(format!("Non-encodable character detected: {} (Unicode: {}). Consider specifying EncodeHintType.PDF417_AUTO_ECI and/or EncodeTypeHint.CHARACTER_SET.",ch as u32,ch))); } } } @@ -202,14 +200,11 @@ pub fn encodeHighLevel( if encoding.is_none() { encoding = Some(DEFAULT_ENCODING); } else if DEFAULT_ENCODING.name() - != encoding - .as_ref() - .ok_or(Exceptions::IllegalStateException(None))? - .name() + != encoding.as_ref().ok_or(Exceptions::illegalState)?.name() { - if let Some(eci) = CharacterSetECI::getCharacterSetECI( - encoding.ok_or(Exceptions::IllegalStateException(None))?, - ) { + if let Some(eci) = + CharacterSetECI::getCharacterSetECI(encoding.ok_or(Exceptions::illegalState)?) + { encodingECI(CharacterSetECI::getValue(&eci) as i32, &mut sb)?; } } @@ -230,7 +225,7 @@ pub fn encodeHighLevel( Compaction::BYTE => { let msgBytes = encoding .as_ref() - .ok_or(Exceptions::IllegalStateException(None))? + .ok_or(Exceptions::illegalState)? .encode(&input.to_string(), encoding::EncoderTrap::Strict) .unwrap_or_default(); //input.to_string().getBytes(encoding); encodeBinary( @@ -242,7 +237,7 @@ pub fn encodeHighLevel( )?; } Compaction::NUMERIC => { - sb.push(char::from_u32(LATCH_TO_NUMERIC).ok_or(Exceptions::ParseException(None))?); + sb.push(char::from_u32(LATCH_TO_NUMERIC).ok_or(Exceptions::parse)?); encodeNumeric(&input, p, len as u32, &mut sb)?; } _ => { @@ -257,9 +252,7 @@ pub fn encodeHighLevel( } let n = determineConsecutiveDigitCount(&input, p)?; if n >= 13 { - sb.push( - char::from_u32(LATCH_TO_NUMERIC).ok_or(Exceptions::ParseException(None))?, - ); + sb.push(char::from_u32(LATCH_TO_NUMERIC).ok_or(Exceptions::parse)?); encodingMode = NUMERIC_COMPACTION; textSubMode = SUBMODE_ALPHA; //Reset after latch encodeNumeric(&input, p, n, &mut sb)?; @@ -268,10 +261,7 @@ pub fn encodeHighLevel( let t = determineConsecutiveTextCount(&input, p)?; if t >= 5 || n == len as u32 { if encodingMode != TEXT_COMPACTION { - sb.push( - char::from_u32(LATCH_TO_TEXT) - .ok_or(Exceptions::ParseException(None))?, - ); + sb.push(char::from_u32(LATCH_TO_TEXT).ok_or(Exceptions::parse)?); encodingMode = TEXT_COMPACTION; textSubMode = SUBMODE_ALPHA; //start with submode alpha after latch } @@ -295,7 +285,7 @@ pub fn encodeHighLevel( .collect::(); if let Ok(enc_str) = encoding .as_ref() - .ok_or(Exceptions::IllegalStateException(None))? + .ok_or(Exceptions::illegalState)? .encode(&str, encoding::EncoderTrap::Strict) { Some(enc_str) @@ -311,9 +301,7 @@ pub fn encodeHighLevel( encodeMultiECIBinary(&input, p, 1, TEXT_COMPACTION, &mut sb)?; } else { encodeBinary( - bytes - .as_ref() - .ok_or(Exceptions::IllegalStateException(None))?, + bytes.as_ref().ok_or(Exceptions::illegalState)?, 0, 1, TEXT_COMPACTION, @@ -326,14 +314,9 @@ pub fn encodeHighLevel( encodeMultiECIBinary(&input, p, p + b, encodingMode, &mut sb)?; } else { encodeBinary( - bytes - .as_ref() - .ok_or(Exceptions::IllegalStateException(None))?, + bytes.as_ref().ok_or(Exceptions::illegalState)?, 0, - bytes - .as_ref() - .ok_or(Exceptions::IllegalStateException(None))? - .len() as u32, + bytes.as_ref().ok_or(Exceptions::illegalState)?.len() as u32, encodingMode, &mut sb, )?; @@ -384,10 +367,7 @@ fn encodeText( if ch == ' ' { tmp.push(26 as char); //space } else { - tmp.push( - char::from_u32(ch as u32 - 65) - .ok_or(Exceptions::ParseException(None))?, - ); + tmp.push(char::from_u32(ch as u32 - 65).ok_or(Exceptions::parse)?); } } else if isAlphaLower(ch) { submode = SUBMODE_LOWER; @@ -401,7 +381,7 @@ fn encodeText( tmp.push(29 as char); //ps tmp.push( char::from_u32(PUNCTUATION[ch as usize] as u32) - .ok_or(Exceptions::ParseException(None))?, + .ok_or(Exceptions::parse)?, ); } } @@ -411,17 +391,11 @@ fn encodeText( if ch == ' ' { tmp.push(26 as char); //space } else { - tmp.push( - char::from_u32(ch as u32 - 97) - .ok_or(Exceptions::ParseException(None))?, - ); + tmp.push(char::from_u32(ch as u32 - 97).ok_or(Exceptions::parse)?); } } else if isAlphaUpper(ch) { tmp.push(27 as char); //as - tmp.push( - char::from_u32(ch as u32 - 65) - .ok_or(Exceptions::ParseException(None))?, - ); + tmp.push(char::from_u32(ch as u32 - 65).ok_or(Exceptions::parse)?); //space cannot happen here, it is also in "Lower" } else if isMixed(ch) { submode = SUBMODE_MIXED; @@ -431,7 +405,7 @@ fn encodeText( tmp.push(29 as char); //ps tmp.push( char::from_u32(PUNCTUATION[ch as usize] as u32) - .ok_or(Exceptions::ParseException(None))?, + .ok_or(Exceptions::parse)?, ); } } @@ -439,8 +413,7 @@ fn encodeText( SUBMODE_MIXED => { if isMixed(ch) { tmp.push( - char::from_u32(MIXED[ch as usize] as u32) - .ok_or(Exceptions::ParseException(None))?, + char::from_u32(MIXED[ch as usize] as u32).ok_or(Exceptions::parse)?, ); } else if isAlphaUpper(ch) { submode = SUBMODE_ALPHA; @@ -462,7 +435,7 @@ fn encodeText( tmp.push(29 as char); //ps tmp.push( char::from_u32(PUNCTUATION[ch as usize] as u32) - .ok_or(Exceptions::ParseException(None))?, + .ok_or(Exceptions::parse)?, ); } } @@ -472,7 +445,7 @@ fn encodeText( if isPunctuation(ch) { tmp.push( char::from_u32(PUNCTUATION[ch as usize] as u32) - .ok_or(Exceptions::ParseException(None))?, + .ok_or(Exceptions::parse)?, ); } else { submode = SUBMODE_ALPHA; @@ -493,24 +466,16 @@ fn encodeText( let odd = (i % 2) != 0; if odd { h = char::from_u32( - (h as u32 * 30) - + tmp - .chars() - .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? - as u32, + (h as u32 * 30) + tmp.chars().nth(i).ok_or(Exceptions::indexOutOfBounds)? as u32, ) - .ok_or(Exceptions::ParseException(None))?; + .ok_or(Exceptions::parse)?; sb.push(h); } else { - h = tmp - .chars() - .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?; + h = tmp.chars().nth(i).ok_or(Exceptions::indexOutOfBounds)?; } } if (len % 2) != 0 { - sb.push(char::from_u32((h as u32 * 30) + 29).ok_or(Exceptions::ParseException(None))?); + sb.push(char::from_u32((h as u32 * 30) + 29).ok_or(Exceptions::parse)?); //ps } Ok(submode) @@ -598,11 +563,11 @@ fn encodeBinary( sb: &mut String, ) -> Result<()> { if count == 1 && startmode == TEXT_COMPACTION { - sb.push(char::from_u32(SHIFT_TO_BYTE).ok_or(Exceptions::ParseException(None))?); + sb.push(char::from_u32(SHIFT_TO_BYTE).ok_or(Exceptions::parse)?); } else if (count % 6) == 0 { - sb.push(char::from_u32(LATCH_TO_BYTE).ok_or(Exceptions::ParseException(None))?); + sb.push(char::from_u32(LATCH_TO_BYTE).ok_or(Exceptions::parse)?); } else { - sb.push(char::from_u32(LATCH_TO_BYTE_PADDED).ok_or(Exceptions::ParseException(None))?); + sb.push(char::from_u32(LATCH_TO_BYTE_PADDED).ok_or(Exceptions::parse)?); } let mut idx = startpos; @@ -616,7 +581,7 @@ fn encodeBinary( t += bytes[idx as usize + i as usize] as i64; } for ch in &mut chars { - *ch = char::from_u32((t % 900) as u32).ok_or(Exceptions::ParseException(None))?; + *ch = char::from_u32((t % 900) as u32).ok_or(Exceptions::parse)?; t /= 900; } sb.push_str(&chars.into_iter().rev().collect::()); @@ -640,8 +605,8 @@ fn encodeNumeric( ) -> Result<()> { let mut idx = 0; let mut tmp = String::with_capacity(count as usize / 3 + 1); - let NUM900: num::BigUint = num::BigUint::from(900_u16); //.ok_or(Exceptions::ParseException(None))?; - let NUM0: num::BigUint = num::BigUint::from(0_u8); //.ok_or(Exceptions::ParseException(None))?; + let NUM900: num::BigUint = num::BigUint::from(900_u16); //.ok_or(Exceptions::parseEmpty())?; + let NUM0: num::BigUint = num::BigUint::from(0_u8); //.ok_or(Exceptions::parseEmpty())?; // let num900: u128 = 900; // const NUM0: u128 = 0; @@ -658,17 +623,15 @@ fn encodeNumeric( .iter() .collect::() ); - // let mut bigint: u128 = part.parse().map_err(|_| Exceptions::ParseException(None))?; + // let mut bigint: u128 = part.parse().map_err(|_| Exceptions::parseEmpty())?; let mut bigint = num::BigUint::from_str(&part) - .map_err(|e| Exceptions::ParseException(Some(format!("issue parsing {part}: {e}"))))?; // part.parse().map_err(|_| Exceptions::ParseException(None))?; + .map_err(|e| Exceptions::parseWith(format!("issue parsing {part}: {e}")))?; // part.parse().map_err(|_| Exceptions::parseEmpty())?; loop { tmp.push( char::from_u32((&bigint % &NUM900).try_into().map_err(|e| { - Exceptions::ParseException(Some(format!( - "erorr converting {bigint} to u32: {e}" - ))) + Exceptions::parseWith(format!("erorr converting {bigint} to u32: {e}")) })?) - .ok_or(Exceptions::ParseException(None))?, + .ok_or(Exceptions::parse)?, ); bigint /= &NUM900; @@ -814,15 +777,13 @@ fn determineConsecutiveBinaryCount( if !can_encode { if TypeId::of::() != TypeId::of::() { - return Err(Exceptions::IllegalStateException(Some( - "expected NoECIInput type".to_owned(), - ))); + return Err(Exceptions::illegalStateWith("expected NoECIInput type")); } let ch = input.charAt(idx)?; - return Err(Exceptions::WriterException(Some(format!( + return Err(Exceptions::writerWith(format!( "Non-encodable character detected: {} (Unicode: {})", ch, ch as u32 - )))); + ))); } } idx += 1; @@ -832,19 +793,19 @@ fn determineConsecutiveBinaryCount( fn encodingECI(eci: i32, sb: &mut String) -> Result<()> { if (0..900).contains(&eci) { - sb.push(char::from_u32(ECI_CHARSET).ok_or(Exceptions::ParseException(None))?); - sb.push(char::from_u32(eci as u32).ok_or(Exceptions::ParseException(None))?); + sb.push(char::from_u32(ECI_CHARSET).ok_or(Exceptions::parse)?); + sb.push(char::from_u32(eci as u32).ok_or(Exceptions::parse)?); } else if eci < 810900 { - sb.push(char::from_u32(ECI_GENERAL_PURPOSE).ok_or(Exceptions::ParseException(None))?); - sb.push(char::from_u32((eci / 900 - 1) as u32).ok_or(Exceptions::ParseException(None))?); - sb.push(char::from_u32((eci % 900) as u32).ok_or(Exceptions::ParseException(None))?); + sb.push(char::from_u32(ECI_GENERAL_PURPOSE).ok_or(Exceptions::parse)?); + sb.push(char::from_u32((eci / 900 - 1) as u32).ok_or(Exceptions::parse)?); + sb.push(char::from_u32((eci % 900) as u32).ok_or(Exceptions::parse)?); } else if eci < 811800 { - sb.push(char::from_u32(ECI_USER_DEFINED).ok_or(Exceptions::ParseException(None))?); - sb.push(char::from_u32((810900 - eci) as u32).ok_or(Exceptions::ParseException(None))?); + sb.push(char::from_u32(ECI_USER_DEFINED).ok_or(Exceptions::parse)?); + sb.push(char::from_u32((810900 - eci) as u32).ok_or(Exceptions::parse)?); } else { - return Err(Exceptions::WriterException(Some(format!( + return Err(Exceptions::writerWith(format!( "ECI number not in valid range from 0..811799, but was {eci}" - )))); + ))); } Ok(()) } @@ -859,7 +820,7 @@ impl ECIInput for NoECIInput { self.0 .chars() .nth(index) - .ok_or(Exceptions::IndexOutOfBoundsException(None)) + .ok_or(Exceptions::indexOutOfBounds) } fn subSequence(&self, start: usize, end: usize) -> Result> { diff --git a/src/pdf417/pdf_417_reader.rs b/src/pdf417/pdf_417_reader.rs index d891365..c37d833 100644 --- a/src/pdf417/pdf_417_reader.rs +++ b/src/pdf417/pdf_417_reader.rs @@ -54,7 +54,7 @@ impl Reader for PDF417Reader { ) -> Result { let result = Self::decode(image, hints, false)?; if result.is_empty() { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } Ok(result[0].clone()) } @@ -124,7 +124,7 @@ impl PDF417Reader { pdf417RXingResultMetadata .clone() .downcast::() - .map_err(|_| Exceptions::IllegalStateException(None))?, + .map_err(|_| Exceptions::illegalState)?, ); result.putMetadata(RXingResultMetadataType::PDF417_EXTRA_METADATA, data); } diff --git a/src/pdf417/pdf_417_writer.rs b/src/pdf417/pdf_417_writer.rs index 41941f4..1e13b2e 100644 --- a/src/pdf417/pdf_417_writer.rs +++ b/src/pdf417/pdf_417_writer.rs @@ -60,9 +60,9 @@ impl Writer for PDF417Writer { hints: &crate::EncodingHintDictionary, ) -> Result { if format != &BarcodeFormat::PDF_417 { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Can only encode PDF_417, but got {format}" - )))); + ))); } let mut encoder = PDF417::new(); @@ -150,7 +150,7 @@ impl PDF417Writer { let mut originalScale = encoder .getBarcodeMatrix() .as_ref() - .ok_or(Exceptions::IllegalStateException(None))? + .ok_or(Exceptions::illegalState)? .getScaledMatrix(1, aspectRatio); let mut rotated = false; if (height > width) != (originalScale[0].len() < originalScale.len()) { @@ -166,17 +166,16 @@ impl PDF417Writer { let mut scaledMatrix = encoder .getBarcodeMatrix() .as_ref() - .ok_or(Exceptions::IllegalStateException(None))? + .ok_or(Exceptions::illegalState)? .getScaledMatrix(scale, scale * aspectRatio); if rotated { scaledMatrix = Self::rotateArray(&scaledMatrix); } return Self::bitMatrixFromBitArray(&scaledMatrix, margin) - .ok_or(Exceptions::IllegalStateException(None)); + .ok_or(Exceptions::illegalState); } - Self::bitMatrixFromBitArray(&originalScale, margin) - .ok_or(Exceptions::IllegalStateException(None)) + Self::bitMatrixFromBitArray(&originalScale, margin).ok_or(Exceptions::illegalState) } /** diff --git a/src/planar_yuv_luminance_source.rs b/src/planar_yuv_luminance_source.rs index e628d1d..a3a6d4f 100644 --- a/src/planar_yuv_luminance_source.rs +++ b/src/planar_yuv_luminance_source.rs @@ -167,9 +167,9 @@ impl PlanarYUVLuminanceSource { inverted: bool, ) -> Result { if left + width > data_width || top + height > data_height { - return Err(Exceptions::IllegalArgumentException(Some( - "Crop rectangle does not fit within image data.".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "Crop rectangle does not fit within image data.", + )); } let mut new_s: Self = Self { @@ -329,7 +329,7 @@ impl LuminanceSource for PlanarYUVLuminanceSource { self.invert, ) { Ok(new) => Ok(Box::new(new)), - Err(_err) => Err(Exceptions::UnsupportedOperationException(None)), + Err(_err) => Err(Exceptions::unsupportedOperation), } } diff --git a/src/qrcode/decoder/bit_matrix_parser.rs b/src/qrcode/decoder/bit_matrix_parser.rs index 51b8c71..8ef056c 100644 --- a/src/qrcode/decoder/bit_matrix_parser.rs +++ b/src/qrcode/decoder/bit_matrix_parser.rs @@ -39,9 +39,9 @@ impl BitMatrixParser { pub fn new(bit_matrix: BitMatrix) -> Result { let dimension = bit_matrix.getHeight(); if dimension < 21 || (dimension & 0x03) != 1 { - Err(Exceptions::FormatException(Some(format!( + Err(Exceptions::formatWith(format!( "{dimension} < 21 || ({dimension} % 0x03) != 1" - )))) + ))) } else { Ok(Self { bitMatrix: bit_matrix, @@ -61,10 +61,7 @@ impl BitMatrixParser { */ pub fn readFormatInformation(&mut self) -> Result<&FormatInformation> { if self.parsedFormatInfo.is_some() { - return self - .parsedFormatInfo - .as_ref() - .ok_or(Exceptions::ParseException(None)); + return self.parsedFormatInfo.as_ref().ok_or(Exceptions::parse); } // Read top-left format info bits @@ -95,9 +92,7 @@ impl BitMatrixParser { self.parsedFormatInfo = FormatInformation::decodeFormatInformation(formatInfoBits1, formatInfoBits2); - self.parsedFormatInfo - .as_ref() - .ok_or(Exceptions::FormatException(None)) + self.parsedFormatInfo.as_ref().ok_or(Exceptions::format) } /** @@ -149,7 +144,7 @@ impl BitMatrixParser { return Ok(theParsedVersion); } } - Err(Exceptions::FormatException(None)) + Err(Exceptions::format) } fn copyBit(&self, i: u32, j: u32, versionBits: u32) -> u32 { @@ -230,7 +225,7 @@ impl BitMatrixParser { } if resultOffset != version.getTotalCodewords() as usize { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } Ok(result) } diff --git a/src/qrcode/decoder/data_block.rs b/src/qrcode/decoder/data_block.rs index 1d23900..d3f3026 100755 --- a/src/qrcode/decoder/data_block.rs +++ b/src/qrcode/decoder/data_block.rs @@ -56,7 +56,7 @@ impl DataBlock { ecLevel: ErrorCorrectionLevel, ) -> Result> { if rawCodewords.len() as u32 != version.getTotalCodewords() { - return Err(Exceptions::IllegalArgumentException(None)); + return Err(Exceptions::illegalArgument); } // Figure out the number and size of data blocks used by this version and diff --git a/src/qrcode/decoder/data_mask.rs b/src/qrcode/decoder/data_mask.rs index e4d77e4..6d8a284 100755 --- a/src/qrcode/decoder/data_mask.rs +++ b/src/qrcode/decoder/data_mask.rs @@ -228,9 +228,9 @@ impl TryFrom for DataMask { 5 => Ok(DataMask::DATA_MASK_101), 6 => Ok(DataMask::DATA_MASK_110), 7 => Ok(DataMask::DATA_MASK_111), - _ => Err(Exceptions::IllegalArgumentException(Some(format!( + _ => Err(Exceptions::illegalArgumentWith(format!( "{value} is not between 0 and 7" - )))), + ))), } } } diff --git a/src/qrcode/decoder/decoded_bit_stream_parser.rs b/src/qrcode/decoder/decoded_bit_stream_parser.rs index 6c2ce50..1e5302e 100644 --- a/src/qrcode/decoder/decoded_bit_stream_parser.rs +++ b/src/qrcode/decoder/decoded_bit_stream_parser.rs @@ -78,10 +78,10 @@ pub fn decode( } Mode::STRUCTURED_APPEND => { if bits.available() < 16 { - return Err(Exceptions::FormatException(Some(format!( + return Err(Exceptions::formatWith(format!( "Mode::Structured append expected bits.available() < 16, found bits of {}", bits.available() - )))); + ))); } // sequence number and parity is added later to the result metadata // Read next 8 bits (symbol sequence #) and 8 bits (parity data), then continue @@ -93,9 +93,9 @@ pub fn decode( let value = parseECIValue(&mut bits)?; currentCharacterSetECI = CharacterSetECI::getCharacterSetECIByValue(value).ok(); if currentCharacterSetECI.is_none() { - return Err(Exceptions::FormatException(Some(format!( + return Err(Exceptions::formatWith(format!( "Value of {value} not valid" - )))); + ))); } } Mode::HANZI => { @@ -132,7 +132,7 @@ pub fn decode( currentCharacterSetECI, hints, )?, - _ => return Err(Exceptions::FormatException(None)), + _ => return Err(Exceptions::format), } } } @@ -177,7 +177,7 @@ pub fn decode( fn decodeHanziSegment(bits: &mut BitSource, result: &mut String, count: usize) -> Result<()> { // Don't crash trying to read more bits than we have available. if count * 13 > bits.available() { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } // Each character will require 2 bytes. Read the characters as 2-byte pairs @@ -203,13 +203,11 @@ fn decodeHanziSegment(bits: &mut BitSource, result: &mut String, count: usize) - count -= 1; } - let gb_encoder = encoding::label::encoding_from_whatwg_label("GBK") - .ok_or(Exceptions::IllegalStateException(None))?; + let gb_encoder = + encoding::label::encoding_from_whatwg_label("GBK").ok_or(Exceptions::illegalState)?; let encode_string = gb_encoder .decode(&buffer, encoding::DecoderTrap::Strict) - .map_err(|e| { - Exceptions::ParseException(Some(format!("unable to decode buffer {buffer:?}: {e}"))) - })?; + .map_err(|e| Exceptions::parseWith(format!("unable to decode buffer {buffer:?}: {e}")))?; result.push_str(&encode_string); Ok(()) } @@ -223,7 +221,7 @@ fn decodeKanjiSegment( ) -> Result<()> { // Don't crash trying to read more bits than we have available. if count * 13 > bits.available() { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } // Each character will require 2 bytes. Read the characters as 2-byte pairs @@ -252,8 +250,7 @@ fn decodeKanjiSegment( let encoder = { let _ = currentCharacterSetECI; let _ = hints; - encoding::label::encoding_from_whatwg_label("SJIS") - .ok_or(Exceptions::FormatException(None))? + encoding::label::encoding_from_whatwg_label("SJIS").ok_or(Exceptions::format)? }; #[cfg(feature = "allow_forced_iso_ied_18004_compliance")] @@ -266,15 +263,12 @@ fn decodeKanjiSegment( encoding::all::ISO_8859_1 } } else { - encoding::label::encoding_from_whatwg_label("SJIS") - .ok_or(Exceptions::FormatException(None))? + encoding::label::encoding_from_whatwg_label("SJIS").ok_or(Exceptions::format)? }; let encode_string = encoder .decode(&buffer, encoding::DecoderTrap::Strict) - .map_err(|e| { - Exceptions::ParseException(Some(format!("unable to decode buffer {buffer:?}: {e}"))) - })?; + .map_err(|e| Exceptions::parseWith(format!("unable to decode buffer {buffer:?}: {e}")))?; result.push_str(&encode_string); @@ -291,7 +285,7 @@ fn decodeByteSegment( ) -> Result<()> { // Don't crash trying to read more bits than we have available. if 8 * count > bits.available() { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } let mut readBytes = vec![0u8; count]; @@ -307,8 +301,7 @@ fn decodeByteSegment( // give a hint. { #[cfg(not(feature = "allow_forced_iso_ied_18004_compliance"))] - StringUtils::guessCharset(&readBytes, hints) - .ok_or(Exceptions::IllegalStateException(None))? + StringUtils::guessCharset(&readBytes, hints).ok_or(Exceptions::illegalState)? } #[cfg(feature = "allow_forced_iso_ied_18004_compliance")] @@ -323,14 +316,14 @@ fn decodeByteSegment( CharacterSetECI::getCharset( currentCharacterSetECI .as_ref() - .ok_or(Exceptions::IllegalStateException(None))?, + .ok_or(Exceptions::illegalState)?, ) }; let encode_string = if currentCharacterSetECI.is_some() && currentCharacterSetECI .as_ref() - .ok_or(Exceptions::IllegalStateException(None))? + .ok_or(Exceptions::illegalState)? == &CharacterSetECI::Cp437 { { @@ -343,9 +336,7 @@ fn decodeByteSegment( encoding .decode(&readBytes, encoding::DecoderTrap::Strict) .map_err(|e| { - Exceptions::ParseException(Some(format!( - "unable to decode buffer {readBytes:?}: {e}" - ))) + Exceptions::parseWith(format!("unable to decode buffer {readBytes:?}: {e}")) })? }; @@ -357,13 +348,13 @@ fn decodeByteSegment( fn toAlphaNumericChar(value: u32) -> Result { if value as usize >= ALPHANUMERIC_CHARS.len() { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } ALPHANUMERIC_CHARS .chars() .nth(value as usize) - .ok_or(Exceptions::FormatException(None)) + .ok_or(Exceptions::format) } fn decodeAlphanumericSegment( @@ -377,7 +368,7 @@ fn decodeAlphanumericSegment( let mut count = count; while count > 1 { if bits.available() < 11 { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } let nextTwoCharsBits = bits.readBits(11)?; result.push(toAlphaNumericChar(nextTwoCharsBits / 45)?); @@ -387,7 +378,7 @@ fn decodeAlphanumericSegment( if count == 1 { // special case: one character left if bits.available() < 6 { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } result.push(toAlphaNumericChar(bits.readBits(6)?)?); } @@ -395,17 +386,12 @@ fn decodeAlphanumericSegment( if fc1InEffect { // We need to massage the result a bit if in an FNC1 mode: for i in start..result.len() { - if result - .chars() - .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? - == '%' - { + if result.chars().nth(i).ok_or(Exceptions::indexOutOfBounds)? == '%' { if i < result.len() - 1 && result .chars() .nth(i + 1) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? + .ok_or(Exceptions::indexOutOfBounds)? == '%' { // %% is rendered as % @@ -427,11 +413,11 @@ fn decodeNumericSegment(bits: &mut BitSource, result: &mut String, count: usize) while count >= 3 { // Each 10 bits encodes three digits if bits.available() < 10 { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } let threeDigitsBits = bits.readBits(10)?; if threeDigitsBits >= 1000 { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } result.push(toAlphaNumericChar(threeDigitsBits / 100)?); result.push(toAlphaNumericChar((threeDigitsBits / 10) % 10)?); @@ -441,22 +427,22 @@ fn decodeNumericSegment(bits: &mut BitSource, result: &mut String, count: usize) if count == 2 { // Two digits left over to read, encoded in 7 bits if bits.available() < 7 { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } let twoDigitsBits = bits.readBits(7)?; if twoDigitsBits >= 100 { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } result.push(toAlphaNumericChar(twoDigitsBits / 10)?); result.push(toAlphaNumericChar(twoDigitsBits % 10)?); } else if count == 1 { // One digit left over to read if bits.available() < 4 { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } let digitBits = bits.readBits(4)?; if digitBits >= 10 { - return Err(Exceptions::FormatException(None)); + return Err(Exceptions::format); } result.push(toAlphaNumericChar(digitBits)?); } @@ -481,5 +467,5 @@ fn parseECIValue(bits: &mut BitSource) -> Result { return Ok(((firstByte & 0x1F) << 16) | secondThirdBytes); } - Err(Exceptions::FormatException(None)) + Err(Exceptions::format) } diff --git a/src/qrcode/decoder/error_correction_level.rs b/src/qrcode/decoder/error_correction_level.rs index 1b6d54d..a8f4d56 100644 --- a/src/qrcode/decoder/error_correction_level.rs +++ b/src/qrcode/decoder/error_correction_level.rs @@ -48,9 +48,9 @@ impl ErrorCorrectionLevel { 1 => Ok(Self::L), 2 => Ok(Self::H), 3 => Ok(Self::Q), - _ => Err(Exceptions::IllegalArgumentException(Some(format!( + _ => Err(Exceptions::illegalArgumentWith(format!( "{bits} is not a valid bit selection" - )))), + ))), } } @@ -110,8 +110,8 @@ impl FromStr for ErrorCorrectionLevel { return number_possible.try_into(); } - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "could not parse {s} into an ec level" - )))); + ))); } } diff --git a/src/qrcode/decoder/mode.rs b/src/qrcode/decoder/mode.rs index 1dd1ef1..99b5f8c 100644 --- a/src/qrcode/decoder/mode.rs +++ b/src/qrcode/decoder/mode.rs @@ -69,9 +69,9 @@ impl Mode { { Ok(Self::HANZI) } - _ => Err(Exceptions::IllegalArgumentException(Some(format!( + _ => Err(Exceptions::illegalArgumentWith(format!( "{bits} is not valid" - )))), + ))), } } diff --git a/src/qrcode/decoder/qrcode_decoder.rs b/src/qrcode/decoder/qrcode_decoder.rs index 688caa9..1c6aea1 100644 --- a/src/qrcode/decoder/qrcode_decoder.rs +++ b/src/qrcode/decoder/qrcode_decoder.rs @@ -129,7 +129,7 @@ pub fn decode_bitmatrix_with_hints( if let Some(fe) = fe { Err(fe) } else { - Err(ce.unwrap_or(Exceptions::ChecksumException(None))) + Err(ce.unwrap_or(Exceptions::checksum)) } } _ => Err(er), diff --git a/src/qrcode/decoder/version.rs b/src/qrcode/decoder/version.rs index 7f7f68e..f1954c3 100755 --- a/src/qrcode/decoder/version.rs +++ b/src/qrcode/decoder/version.rs @@ -102,18 +102,14 @@ impl Version { */ pub fn getProvisionalVersionForDimension(dimension: u32) -> Result<&'static Version> { if dimension % 4 != 1 { - return Err(Exceptions::FormatException(Some( - "dimension incorrect".to_owned(), - ))); + return Err(Exceptions::formatWith("dimension incorrect")); } Self::getVersionForNumber((dimension - 17) / 4) } pub fn getVersionForNumber(versionNumber: u32) -> Result<&'static Version> { if !(1..=40).contains(&versionNumber) { - return Err(Exceptions::IllegalArgumentException(Some( - "version out of spec".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith("version out of spec")); } Ok(&VERSIONS[versionNumber as usize - 1]) } @@ -141,7 +137,7 @@ impl Version { return Self::getVersionForNumber(bestVersion); } // If we didn't find a close enough match, fail - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } /** diff --git a/src/qrcode/detector/alignment_pattern_finder.rs b/src/qrcode/detector/alignment_pattern_finder.rs index 6fb2505..1197f8d 100644 --- a/src/qrcode/detector/alignment_pattern_finder.rs +++ b/src/qrcode/detector/alignment_pattern_finder.rs @@ -164,9 +164,9 @@ impl AlignmentPatternFinder { Ok(*(self .possibleCenters .get(0) - .ok_or(Exceptions::IndexOutOfBoundsException(None)))?) + .ok_or(Exceptions::indexOutOfBounds))?) } else { - Err(Exceptions::NotFoundException(None)) + Err(Exceptions::notFound) } } diff --git a/src/qrcode/detector/finder_pattern_finder.rs b/src/qrcode/detector/finder_pattern_finder.rs index dc12d5e..53df7d8 100755 --- a/src/qrcode/detector/finder_pattern_finder.rs +++ b/src/qrcode/detector/finder_pattern_finder.rs @@ -695,7 +695,7 @@ impl<'a> FinderPatternFinder<'_> { let startSize = self.possibleCenters.len(); if startSize < 3 { // Couldn't find enough finder patterns - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } self.possibleCenters @@ -712,19 +712,19 @@ impl<'a> FinderPatternFinder<'_> { for i in 0..self.possibleCenters.len() { let Some(fpi) = self.possibleCenters.get(i) else { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); }; let minModuleSize = fpi.getEstimatedModuleSize(); for j in (i + 1)..(self.possibleCenters.len() - 1) { let Some(fpj) = self.possibleCenters.get(j) else { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); }; let squares0 = Self::squaredDistance(fpi, fpj); for k in (j + 1)..(self.possibleCenters.len()) { let Some(fpk) = self.possibleCenters.get(k) else { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); }; let maxModuleSize = fpk.getEstimatedModuleSize(); if maxModuleSize > minModuleSize * 1.4 { @@ -776,16 +776,16 @@ impl<'a> FinderPatternFinder<'_> { } if distortion == f64::MAX { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } if bestPatterns[0].is_none() { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } - let p1 = bestPatterns[0].ok_or(Exceptions::NotFoundException(None))?; - let p2 = bestPatterns[1].ok_or(Exceptions::NotFoundException(None))?; - let p3 = bestPatterns[2].ok_or(Exceptions::NotFoundException(None))?; + let p1 = bestPatterns[0].ok_or(Exceptions::notFound)?; + let p2 = bestPatterns[1].ok_or(Exceptions::notFound)?; + let p3 = bestPatterns[2].ok_or(Exceptions::notFound)?; Ok([p1, p2, p3]) } diff --git a/src/qrcode/detector/qrcode_detector.rs b/src/qrcode/detector/qrcode_detector.rs index e5cfeb0..af84bfc 100644 --- a/src/qrcode/detector/qrcode_detector.rs +++ b/src/qrcode/detector/qrcode_detector.rs @@ -103,7 +103,7 @@ impl<'a> Detector<'_> { let moduleSize = self.calculateModuleSize(topLeft, topRight, bottomLeft); if moduleSize < 1.0 { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let dimension = Self::computeDimension(topLeft, topRight, bottomLeft, moduleSize)?; let provisionalVersion = Version::getProvisionalVersionForDimension(dimension)?; @@ -145,7 +145,7 @@ impl<'a> Detector<'_> { alignmentPattern.as_ref(), dimension, ) - .ok_or(Exceptions::NotFoundException(None))?; + .ok_or(Exceptions::notFound)?; let bits = Detector::sampleGrid(self.image, &transform, dimension)?; @@ -156,11 +156,7 @@ impl<'a> Detector<'_> { ]; if alignmentPattern.is_some() { - points.push( - alignmentPattern - .ok_or(Exceptions::NotFoundException(None))? - .into(), - ) + points.push(alignmentPattern.ok_or(Exceptions::notFound)?.into()) } Ok(QRCodeDetectorResult::new(bits, points)) @@ -244,7 +240,7 @@ impl<'a> Detector<'_> { match dimension & 0x03 { 0 => dimension += 1, 2 => dimension -= 1, - 3 => return Err(Exceptions::NotFoundException(None)), + 3 => return Err(Exceptions::notFound), _ => {} } Ok(dimension as u32) @@ -440,13 +436,13 @@ impl<'a> Detector<'_> { let alignmentAreaLeftX = 0.max(estAlignmentX as i32 - allowance as i32) as u32; let alignmentAreaRightX = (self.image.getWidth() - 1).min(estAlignmentX + allowance); if ((alignmentAreaRightX - alignmentAreaLeftX) as f32) < overallEstModuleSize * 3.0 { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let alignmentAreaTopY = 0.max(estAlignmentY as i32 - allowance as i32) as u32; let alignmentAreaBottomY = (self.image.getHeight() - 1).min(estAlignmentY + allowance); if alignmentAreaBottomY - alignmentAreaTopY < overallEstModuleSize as u32 * 3 { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } let mut alignmentFinder = AlignmentPatternFinder::new( diff --git a/src/qrcode/encoder/mask_util.rs b/src/qrcode/encoder/mask_util.rs index e6d25fd..7b0fac9 100644 --- a/src/qrcode/encoder/mask_util.rs +++ b/src/qrcode/encoder/mask_util.rs @@ -175,9 +175,9 @@ pub fn getDataMaskBit(maskPattern: u32, x: u32, y: u32) -> Result { ((temp % 3) + ((y + x) & 0x1)) & 0x1 } _ => { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "Invalid mask pattern: {maskPattern}" - )))) + ))) } }; // switch (maskPattern) { diff --git a/src/qrcode/encoder/matrix_util.rs b/src/qrcode/encoder/matrix_util.rs index e476ad4..f5d3495 100644 --- a/src/qrcode/encoder/matrix_util.rs +++ b/src/qrcode/encoder/matrix_util.rs @@ -274,11 +274,11 @@ pub fn embedDataBits(dataBits: &BitArray, maskPattern: i32, matrix: &mut ByteMat } // All bits should be consumed. if bitIndex != dataBits.getSize() { - return Err(Exceptions::WriterException(Some(format!( + return Err(Exceptions::writerWith(format!( "Not all bits consumed: {}/{}", bitIndex, dataBits.getSize() - )))); + ))); } Ok(()) } @@ -319,9 +319,7 @@ pub fn findMSBSet(value: u32) -> u32 { // operations. We don't care if coefficients are positive or negative. pub fn calculateBCHCode(value: u32, poly: u32) -> Result { if poly == 0 { - return Err(Exceptions::IllegalArgumentException(Some( - "0 polynomial".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith("0 polynomial")); } let mut value = value; // If poly is "1 1111 0010 0101" (version info poly), msbSetInPoly is 13. We'll subtract 1 @@ -345,9 +343,7 @@ pub fn makeTypeInfoBits( bits: &mut BitArray, ) -> Result<()> { if !QRCode::isValidMaskPattern(maskPattern as i32) { - return Err(Exceptions::WriterException(Some( - "Invalid mask pattern".to_owned(), - ))); + return Err(Exceptions::writerWith("Invalid mask pattern")); } let typeInfo = (ecLevel.get_value() << 3) as u32 | maskPattern; bits.appendBits(typeInfo, 5)?; @@ -361,10 +357,10 @@ pub fn makeTypeInfoBits( if bits.getSize() != 15 { // Just in case. - return Err(Exceptions::WriterException(Some(format!( + return Err(Exceptions::writerWith(format!( "should not happen but we got: {}", bits.getSize() - )))); + ))); } Ok(()) } @@ -378,10 +374,10 @@ pub fn makeVersionInfoBits(version: &Version, bits: &mut BitArray) -> Result<()> if bits.getSize() != 18 { // Just in case. - return Err(Exceptions::WriterException(Some(format!( + return Err(Exceptions::writerWith(format!( "should not happen but we got: {}", bits.getSize() - )))); + ))); } Ok(()) } @@ -411,7 +407,7 @@ pub fn embedTimingPatterns(matrix: &mut ByteMatrix) { // Embed the lonely dark dot at left bottom corner. JISX0510:2004 (p.46) pub fn embedDarkDotAtLeftBottomCorner(matrix: &mut ByteMatrix) -> Result<()> { if matrix.get(8, matrix.getHeight() - 8) == 0 { - return Err(Exceptions::WriterException(None)); + return Err(Exceptions::writer); } matrix.set(8, matrix.getHeight() - 8, 1); Ok(()) @@ -424,7 +420,7 @@ pub fn embedHorizontalSeparationPattern( ) -> Result<()> { for x in 0..8 { if !isEmpty(matrix.get(xStart + x, yStart)) { - return Err(Exceptions::WriterException(None)); + return Err(Exceptions::writer); } matrix.set(xStart + x, yStart, 0); } @@ -438,7 +434,7 @@ pub fn embedVerticalSeparationPattern( ) -> Result<()> { for y in 0..7 { if !isEmpty(matrix.get(xStart, yStart + y)) { - return Err(Exceptions::WriterException(None)); + return Err(Exceptions::writer); } matrix.set(xStart, yStart + y, 0); } diff --git a/src/qrcode/encoder/minimal_encoder.rs b/src/qrcode/encoder/minimal_encoder.rs index e3a6cbd..4a1d11c 100644 --- a/src/qrcode/encoder/minimal_encoder.rs +++ b/src/qrcode/encoder/minimal_encoder.rs @@ -158,9 +158,9 @@ impl MinimalEncoder { Self::getVersion(Self::getVersionSize(result.getVersion()))?, &self.ecLevel, ) { - return Err(Exceptions::WriterException(Some(format!( + return Err(Exceptions::writerWith(format!( "Data too big for version {version}" - )))); + ))); } Ok(result) } else { @@ -186,9 +186,7 @@ impl MinimalEncoder { } } if smallestRXingResult < 0 { - return Err(Exceptions::WriterException(Some( - "Data too big for any version".to_owned(), - ))); + return Err(Exceptions::writerWith("Data too big for any version")); } Ok(results[smallestRXingResult as usize].clone()) } @@ -249,9 +247,9 @@ impl MinimalEncoder { Some(Mode::ALPHANUMERIC) => Ok(1), Some(Mode::BYTE) => Ok(3), Some(Mode::KANJI) | None => Ok(0), - _ => Err(Exceptions::IllegalArgumentException(Some(format!( + _ => Err(Exceptions::illegalArgumentWith(format!( "Illegal mode {mode:?}" - )))), + ))), } } @@ -276,12 +274,9 @@ impl MinimalEncoder { if modeEdges[modeOrdinal].is_none() || modeEdges[modeOrdinal] .as_ref() - .ok_or(Exceptions::FormatException(None))? + .ok_or(Exceptions::format)? .cachedTotalSize - > edge - .as_ref() - .ok_or(Exceptions::FormatException(None))? - .cachedTotalSize + > edge.as_ref().ok_or(Exceptions::format)?.cachedTotalSize { modeEdges[modeOrdinal] = edge; } @@ -304,12 +299,12 @@ impl MinimalEncoder { .encoders .canEncode( &self.stringToEncode[from], - priorityEncoderIndex.ok_or(Exceptions::FormatException(None))?, + priorityEncoderIndex.ok_or(Exceptions::format)?, ) - .ok_or(Exceptions::FormatException(None))? + .ok_or(Exceptions::format)? { - start = priorityEncoderIndex.ok_or(Exceptions::FormatException(None))?; - end = priorityEncoderIndex.ok_or(Exceptions::FormatException(None))? + 1; + start = priorityEncoderIndex.ok_or(Exceptions::format)?; + end = priorityEncoderIndex.ok_or(Exceptions::format)? + 1; } for i in start..end { @@ -318,10 +313,10 @@ impl MinimalEncoder { .canEncode( self.stringToEncode .get(from) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?, + .ok_or(Exceptions::indexOutOfBounds)?, i, ) - .ok_or(Exceptions::FormatException(None))? + .ok_or(Exceptions::format)? { self.addEdge( edges, @@ -337,7 +332,7 @@ impl MinimalEncoder { self.encoders.clone(), self.stringToEncode.clone(), ) - .ok_or(Exceptions::WriterException(None))?, + .ok_or(Exceptions::writer)?, )), )?; } @@ -345,9 +340,7 @@ impl MinimalEncoder { if self.canEncode( &Mode::KANJI, - self.stringToEncode - .get(from) - .ok_or(Exceptions::FormatException(None))?, + self.stringToEncode.get(from).ok_or(Exceptions::format)?, ) { self.addEdge( edges, @@ -363,7 +356,7 @@ impl MinimalEncoder { self.encoders.clone(), self.stringToEncode.clone(), ) - .ok_or(Exceptions::WriterException(None))?, + .ok_or(Exceptions::writer)?, )), )?; } @@ -373,7 +366,7 @@ impl MinimalEncoder { &Mode::ALPHANUMERIC, self.stringToEncode .get(from) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?, + .ok_or(Exceptions::indexOutOfBounds)?, ) { self.addEdge( edges, @@ -388,7 +381,7 @@ impl MinimalEncoder { &Mode::ALPHANUMERIC, self.stringToEncode .get(from + 1) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?, + .ok_or(Exceptions::indexOutOfBounds)?, ) { 1 @@ -400,7 +393,7 @@ impl MinimalEncoder { self.encoders.clone(), self.stringToEncode.clone(), ) - .ok_or(Exceptions::WriterException(None))?, + .ok_or(Exceptions::writer)?, )), )?; } @@ -409,7 +402,7 @@ impl MinimalEncoder { &Mode::NUMERIC, self.stringToEncode .get(from) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?, + .ok_or(Exceptions::indexOutOfBounds)?, ) { self.addEdge( edges, @@ -424,7 +417,7 @@ impl MinimalEncoder { &Mode::NUMERIC, self.stringToEncode .get(from + 1) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?, + .ok_or(Exceptions::indexOutOfBounds)?, ) { 1 @@ -433,7 +426,7 @@ impl MinimalEncoder { &Mode::NUMERIC, self.stringToEncode .get(from + 2) - .ok_or(Exceptions::IndexOutOfBoundsException(None))?, + .ok_or(Exceptions::indexOutOfBounds)?, ) { 2 @@ -445,7 +438,7 @@ impl MinimalEncoder { self.encoders.clone(), self.stringToEncode.clone(), ) - .ok_or(Exceptions::WriterException(None))?, + .ok_or(Exceptions::writer)?, )), )?; } @@ -605,22 +598,22 @@ impl MinimalEncoder { version, edges[inputLength][minJ][minK] .as_ref() - .ok_or(Exceptions::WriterException(None))? + .ok_or(Exceptions::writer)? .clone(), self.isGS1, &self.ecLevel, self.encoders.clone(), self.stringToEncode.clone(), ) - .ok_or(Exceptions::WriterException(None))?) + .ok_or(Exceptions::writer)?) } else { - Err(Exceptions::WriterException(Some(format!( + Err(Exceptions::writerWith(format!( r#"Internal error: failed to encode "{}"#, self.stringToEncode .iter() .map(String::from) .collect::() - )))) + ))) } } } @@ -1030,7 +1023,7 @@ impl RXingResultNode { bits, self.encoders .getCharset(self.charsetEncoderIndex) - .ok_or(Exceptions::WriterException(None))?, + .ok_or(Exceptions::writer)?, )?; } Ok(()) diff --git a/src/qrcode/encoder/qrcode_encoder.rs b/src/qrcode/encoder/qrcode_encoder.rs index 50b5ad6..4c9aa01 100644 --- a/src/qrcode/encoder/qrcode_encoder.rs +++ b/src/qrcode/encoder/qrcode_encoder.rs @@ -100,10 +100,8 @@ pub fn encode_with_hints( let mut has_encoding_hint = hints.contains_key(&EncodeHintType::CHARACTER_SET); if has_encoding_hint { if let Some(EncodeHintValue::CharacterSet(v)) = hints.get(&EncodeHintType::CHARACTER_SET) { - encoding = Some( - encoding::label::encoding_from_whatwg_label(v) - .ok_or(Exceptions::WriterException(None))?, - ) + encoding = + Some(encoding::label::encoding_from_whatwg_label(v).ok_or(Exceptions::writer)?) } } @@ -181,9 +179,7 @@ pub fn encode_with_hints( version = Version::getVersionForNumber(versionNumber)?; let bitsNeeded = calculateBitsNeeded(mode, &header_bits, &data_bits, version); if !willFit(bitsNeeded, version, &ec_level) { - return Err(Exceptions::WriterException(Some( - "Data too big for requested version".to_owned(), - ))); + return Err(Exceptions::writerWith("Data too big for requested version")); } } else { version = recommendVersion(&ec_level, mode, &header_bits, &data_bits)?; @@ -388,9 +384,9 @@ fn chooseVersion(numInputBits: u32, ecLevel: &ErrorCorrectionLevel) -> Result Result<()> { let capacity = num_data_bytes * 8; if bits.getSize() > capacity as usize { - return Err(Exceptions::WriterException(Some(format!( + return Err(Exceptions::writerWith(format!( "data bits cannot fit in the QR Code{capacity} > " - )))); + ))); } // Append Mode.TERMINATE if there is enough space (value is 0000) for _i in 0..4 { @@ -444,9 +440,7 @@ pub fn terminateBits(num_data_bytes: u32, bits: &mut BitArray) -> Result<()> { bits.appendBits(if (i & 0x01) == 0 { 0xEC } else { 0x11 }, 8)?; } if bits.getSize() != capacity as usize { - return Err(Exceptions::WriterException(Some( - "Bits size does not equal capacity".to_owned(), - ))); + return Err(Exceptions::writerWith("Bits size does not equal capacity")); } Ok(()) } @@ -465,9 +459,7 @@ pub fn getNumDataBytesAndNumECBytesForBlockID( // numECBytesInBlock: &mut [u32], ) -> Result<(u32, u32)> { if block_id >= num_rsblocks { - return Err(Exceptions::WriterException(Some( - "Block ID too large".to_owned(), - ))); + return Err(Exceptions::writerWith("Block ID too large")); } // numRsBlocksInGroup2 = 196 % 5 = 1 let num_rs_blocks_in_group2 = num_total_bytes % num_rsblocks; @@ -488,24 +480,18 @@ pub fn getNumDataBytesAndNumECBytesForBlockID( // Sanity checks. // 26 = 26 if num_ec_bytes_in_group1 != numEcBytesInGroup2 { - return Err(Exceptions::WriterException(Some( - "EC bytes mismatch".to_owned(), - ))); + return Err(Exceptions::writerWith("EC bytes mismatch")); } // 5 = 4 + 1. if num_rsblocks != num_rs_blocks_in_group1 + num_rs_blocks_in_group2 { - return Err(Exceptions::WriterException(Some( - "RS blocks mismatch".to_owned(), - ))); + return Err(Exceptions::writerWith("RS blocks mismatch")); } // 196 = (13 + 26) * 4 + (14 + 26) * 1 if num_total_bytes != ((num_data_bytes_in_group1 + num_ec_bytes_in_group1) * num_rs_blocks_in_group1) + ((num_data_bytes_in_group2 + numEcBytesInGroup2) * num_rs_blocks_in_group2) { - return Err(Exceptions::WriterException(Some( - "total bytes mismatch".to_owned(), - ))); + return Err(Exceptions::writerWith("total bytes mismatch")); } Ok(if block_id < num_rs_blocks_in_group1 { @@ -527,9 +513,9 @@ pub fn interleaveWithECBytes( ) -> Result { // "bits" must have "getNumDataBytes" bytes of data. if bits.getSizeInBytes() as u32 != num_data_bytes { - return Err(Exceptions::WriterException(Some( - "Number of bits and data bytes does not match".to_owned(), - ))); + return Err(Exceptions::writerWith( + "Number of bits and data bytes does not match", + )); } // Step 1. Divide data bytes into blocks and generate error correction bytes for them. We'll @@ -562,9 +548,7 @@ pub fn interleaveWithECBytes( data_bytes_offset += numDataBytesInBlock as usize; } if num_data_bytes != data_bytes_offset as u32 { - return Err(Exceptions::WriterException(Some( - "Data bytes does not match offset".to_owned(), - ))); + return Err(Exceptions::writerWith("Data bytes does not match offset")); } let mut result = BitArray::new(); @@ -589,11 +573,11 @@ pub fn interleaveWithECBytes( } if num_total_bytes != result.getSizeInBytes() as u32 { // Should be same. - return Err(Exceptions::WriterException(Some(format!( + return Err(Exceptions::writerWith(format!( "Interleaving error: {} and {} differ.", num_total_bytes, result.getSizeInBytes() - )))); + ))); } Ok(result) @@ -636,11 +620,11 @@ pub fn appendLengthInfo( ) -> Result<()> { let numBits = mode.getCharacterCountBits(version); if num_letters >= (1 << numBits) { - return Err(Exceptions::WriterException(Some(format!( + return Err(Exceptions::writerWith(format!( "{} is bigger than {}", num_letters, ((1 << numBits) - 1) - )))); + ))); } bits.appendBits(num_letters, numBits as usize) } @@ -659,9 +643,7 @@ pub fn appendBytes( Mode::ALPHANUMERIC => appendAlphanumericBytes(content, bits), Mode::BYTE => append8BitBytes(content, bits, encoding), Mode::KANJI => appendKanjiBytes(content, bits), - _ => Err(Exceptions::WriterException(Some(format!( - "Invalid mode: {mode:?}" - )))), + _ => Err(Exceptions::writerWith(format!("Invalid mode: {mode:?}"))), } } @@ -669,22 +651,18 @@ pub fn appendNumericBytes(content: &str, bits: &mut BitArray) -> Result<()> { let length = content.len(); let mut i = 0; while i < length { - let num1 = content - .chars() - .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? as u8 - - b'0'; + let num1 = content.chars().nth(i).ok_or(Exceptions::indexOutOfBounds)? as u8 - b'0'; if i + 2 < length { // Encode three numeric letters in ten bits. let num2 = content .chars() .nth(i + 1) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? as u8 + .ok_or(Exceptions::indexOutOfBounds)? as u8 - b'0'; let num3 = content .chars() .nth(i + 2) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? as u8 + .ok_or(Exceptions::indexOutOfBounds)? as u8 - b'0'; bits.appendBits(num1 as u32 * 100 + num2 as u32 * 10 + num3 as u32, 10)?; i += 3; @@ -693,7 +671,7 @@ pub fn appendNumericBytes(content: &str, bits: &mut BitArray) -> Result<()> { let num2 = content .chars() .nth(i + 1) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? as u8 + .ok_or(Exceptions::indexOutOfBounds)? as u8 - b'0'; bits.appendBits(num1 as u32 * 10 + num2 as u32, 7)?; i += 2; @@ -710,24 +688,20 @@ pub fn appendAlphanumericBytes(content: &str, bits: &mut BitArray) -> Result<()> let length = content.len(); let mut i = 0; while i < length { - let code1 = getAlphanumericCode( - content - .chars() - .nth(i) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? as u32, - ); + let code1 = + getAlphanumericCode(content.chars().nth(i).ok_or(Exceptions::indexOutOfBounds)? as u32); if code1 == -1 { - return Err(Exceptions::WriterException(None)); + return Err(Exceptions::writer); } if i + 1 < length { let code2 = getAlphanumericCode( content .chars() .nth(i + 1) - .ok_or(Exceptions::IndexOutOfBoundsException(None))? as u32, + .ok_or(Exceptions::indexOutOfBounds)? as u32, ); if code2 == -1 { - return Err(Exceptions::WriterException(None)); + return Err(Exceptions::writer); } // Encode two alphanumeric letters in 11 bits. bits.appendBits((code1 as i16 * 45 + code2 as i16) as u32, 11)?; @@ -744,7 +718,7 @@ pub fn appendAlphanumericBytes(content: &str, bits: &mut BitArray) -> Result<()> pub fn append8BitBytes(content: &str, bits: &mut BitArray, encoding: EncodingRef) -> Result<()> { let bytes = encoding .encode(content, encoding::EncoderTrap::Strict) - .map_err(|e| Exceptions::WriterException(Some(format!("error {e}"))))?; + .map_err(|e| Exceptions::writerWith(format!("error {e}")))?; for b in bytes { bits.appendBits(b as u32, 8)?; } @@ -756,11 +730,9 @@ pub fn appendKanjiBytes(content: &str, bits: &mut BitArray) -> Result<()> { let bytes = sjis .encode(content, encoding::EncoderTrap::Strict) - .map_err(|e| Exceptions::WriterException(Some(format!("error {e}"))))?; + .map_err(|e| Exceptions::writerWith(format!("error {e}")))?; if bytes.len() % 2 != 0 { - return Err(Exceptions::WriterException(Some( - "Kanji byte size not even".to_owned(), - ))); + return Err(Exceptions::writerWith("Kanji byte size not even")); } let max_i = bytes.len() - 1; // bytes.length must be even let mut i = 0; @@ -775,9 +747,7 @@ pub fn appendKanjiBytes(content: &str, bits: &mut BitArray) -> Result<()> { subtracted = code as i32 - 0xc140; } if subtracted == -1 { - return Err(Exceptions::WriterException(Some( - "Invalid byte sequence".to_owned(), - ))); + return Err(Exceptions::writerWith("Invalid byte sequence")); } let encoded = ((subtracted >> 8) * 0xc0) + (subtracted & 0xff); bits.appendBits(encoded as u32, 13)?; diff --git a/src/qrcode/qr_code_reader.rs b/src/qrcode/qr_code_reader.rs index 767fbdc..b268518 100644 --- a/src/qrcode/qr_code_reader.rs +++ b/src/qrcode/qr_code_reader.rs @@ -80,7 +80,7 @@ impl Reader for QRCodeReader { // if (decoderRXingResult.getOther() instanceof QRCodeDecoderMetaData) { other .downcast_ref::() - .ok_or(Exceptions::IllegalStateException(None))? + .ok_or(Exceptions::illegalState)? .applyMirroredCorrection(&mut points); } } @@ -150,12 +150,11 @@ impl QRCodeReader { let leftTopBlack = image.getTopLeftOnBit(); let rightBottomBlack = image.getBottomRightOnBit(); if leftTopBlack.is_none() || rightBottomBlack.is_none() { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } - let leftTopBlack = leftTopBlack.ok_or(Exceptions::IndexOutOfBoundsException(None))?; - let rightBottomBlack = - rightBottomBlack.ok_or(Exceptions::IndexOutOfBoundsException(None))?; + let leftTopBlack = leftTopBlack.ok_or(Exceptions::indexOutOfBounds)?; + let rightBottomBlack = rightBottomBlack.ok_or(Exceptions::indexOutOfBounds)?; let moduleSize = Self::moduleSize(&leftTopBlack, image)?; @@ -166,7 +165,7 @@ impl QRCodeReader { // Sanity check! if left >= right || top >= bottom { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } if bottom - top != right - left { @@ -175,17 +174,17 @@ impl QRCodeReader { right = left + (bottom - top); if right >= image.getWidth() as i32 { // Abort if that would not make sense -- off image - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } } let matrixWidth = ((right as f32 - left as f32 + 1.0) / moduleSize).round() as u32; let matrixHeight = ((bottom as f32 - top as f32 + 1.0) / moduleSize).round() as u32; if matrixWidth == 0 || matrixHeight == 0 { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } if matrixHeight != matrixWidth { // Only possibly decode square regions - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } // Push in the "border" by half the module width so that we start @@ -203,7 +202,7 @@ impl QRCodeReader { if nudgedTooFarRight > 0 { if nudgedTooFarRight > nudge as i32 { // Neither way fits; abort - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } left -= nudgedTooFarRight; } @@ -212,7 +211,7 @@ impl QRCodeReader { if nudgedTooFarDown > 0 { if nudgedTooFarDown > nudge as i32 { // Neither way fits; abort - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } top -= nudgedTooFarDown; } @@ -249,7 +248,7 @@ impl QRCodeReader { y += 1; } if x == width || y == height { - return Err(Exceptions::NotFoundException(None)); + return Err(Exceptions::notFound); } Ok((x - leftTopBlack[0]) as f32 / 7.0) } diff --git a/src/qrcode/qr_code_writer.rs b/src/qrcode/qr_code_writer.rs index d374156..956bc63 100644 --- a/src/qrcode/qr_code_writer.rs +++ b/src/qrcode/qr_code_writer.rs @@ -59,22 +59,20 @@ impl Writer for QRCodeWriter { hints: &crate::EncodingHintDictionary, ) -> Result { if contents.is_empty() { - return Err(Exceptions::IllegalArgumentException(Some( - "found empty contents".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith("found empty contents")); } if format != &BarcodeFormat::QR_CODE { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "can only encode QR_CODE, but got {format:?}" - )))); + ))); // throw new IllegalArgumentException("Can only encode QR_CODE, but got " + format); } if width < 0 || height < 0 { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegalArgumentWith(format!( "requested dimensions are too small: {width}x{height}" - )))); + ))); } let errorCorrectionLevel = if let Some(EncodeHintValue::ErrorCorrection(ec_level)) = @@ -87,9 +85,9 @@ impl Writer for QRCodeWriter { let quietZone = if let Some(EncodeHintValue::Margin(margin)) = hints.get(&EncodeHintType::MARGIN) { - margin.parse::().map_err(|e| { - Exceptions::ParseException(Some(format!("could not parse {margin}: {e}"))) - })? + margin + .parse::() + .map_err(|e| Exceptions::parseWith(format!("could not parse {margin}: {e}")))? } else { QUIET_ZONE_SIZE }; @@ -111,14 +109,10 @@ impl QRCodeWriter { ) -> Result { let input = code.getMatrix(); if input.is_none() { - return Err(Exceptions::IllegalStateException(Some( - "matrix is empty".to_owned(), - ))); + return Err(Exceptions::illegalStateWith("matrix is empty")); } - let input = input - .as_ref() - .ok_or(Exceptions::IllegalStateException(None))?; + let input = input.as_ref().ok_or(Exceptions::illegalState)?; let inputWidth = input.getWidth() as i32; let inputHeight = input.getHeight() as i32; diff --git a/src/rgb_luminance_source.rs b/src/rgb_luminance_source.rs index 7d8fe59..5f4be37 100644 --- a/src/rgb_luminance_source.rs +++ b/src/rgb_luminance_source.rs @@ -128,7 +128,7 @@ impl LuminanceSource for RGBLuminanceSource { height, ) { Ok(crop) => Ok(Box::new(crop)), - Err(_error) => Err(Exceptions::UnsupportedOperationException(None)), + Err(_error) => Err(Exceptions::unsupportedOperation), } } @@ -180,9 +180,9 @@ impl RGBLuminanceSource { height: usize, ) -> Result { if left + width > data_width || top + height > data_height { - return Err(Exceptions::IllegalArgumentException(Some( - "Crop rectangle does not fit within image data.".to_owned(), - ))); + return Err(Exceptions::illegalArgumentWith( + "Crop rectangle does not fit within image data.", + )); } Ok(Self { luminances: pixels.to_owned(), diff --git a/src/svg_luminance_source.rs b/src/svg_luminance_source.rs index ee61438..74762b2 100644 --- a/src/svg_luminance_source.rs +++ b/src/svg_luminance_source.rs @@ -57,11 +57,11 @@ impl SVGLuminanceSource { pub fn new(svg_data: &[u8]) -> Result { // Load the SVG file let Ok(tree) = resvg::usvg::Tree::from_data(svg_data, &Options::default()) else { - return Err(Exceptions::FormatException(Some(format!("could not parse svg data: {}", "err")))); + return Err(Exceptions::formatWith(format!("could not parse svg data: {}", "err"))); }; let Some(mut pixmap) = resvg::tiny_skia::Pixmap::new(tree.size.width() as u32, tree.size.height() as u32) else { - return Err(Exceptions::FormatException(Some("could not create pixmap".to_owned()))); + return Err(Exceptions::formatWith("could not create pixmap")); }; resvg::render( @@ -72,11 +72,11 @@ impl SVGLuminanceSource { ); let Some(buffer) = RgbaImage::from_raw(tree.size.width() as u32, tree.size.height() as u32, pixmap.data().to_vec()) else { - return Err(Exceptions::FormatException(Some("could not create image buffer".to_owned()))); + return Err(Exceptions::formatWith("could not create image buffer")); }; // let Ok(image) = image::load_from_memory_with_format(pixmap.data(), image::ImageFormat::Bmp) else { - // return Err(Exceptions::FormatException(Some("could not generate image".to_owned()))); + // return Err(Exceptions::format("could not generate image")); // }; Ok(Self(BufferedImageLuminanceSource::new(DynamicImage::from(