RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 03:27:44 +00:00
Code Issues Activity

Merge pull request #6500 from cakebaker/uucore_checksum_simplify_determine_regex

Browse source 
uucore/checksum: simplify `determine_regex()`
This commit is contained in:
Sylvestre Ledru 2024-06-27 14:11:36 +02:00 • committed by GitHub
commit 6a489f5ee7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/uucore/src/lib/features/checksum.rs
View file

@ -295,11 +295,7 @@ fn get_filename_for_output(filename: &OsStr, input_is_stdin: bool) -> String {
} }
/// Determines the appropriate regular expression to use based on the provided lines. /// Determines the appropriate regular expression to use based on the provided lines.
fn determine_regex( fn determine_regex(lines: &[String]) -> Option<(Regex, bool)> {
filename: &OsStr,
input_is_stdin: bool,
lines: &[String],
) -> UResult<(Regex, bool)> {
let regexes = [ let regexes = [
(Regex::new(ALGO_BASED_REGEX).unwrap(), true), (Regex::new(ALGO_BASED_REGEX).unwrap(), true),
(Regex::new(DOUBLE_SPACE_REGEX).unwrap(), false), (Regex::new(DOUBLE_SPACE_REGEX).unwrap(), false),
@ -311,14 +307,12 @@ fn determine_regex(
let line_trim = line.trim(); let line_trim = line.trim();
for (regex, is_algo_based) in &regexes { for (regex, is_algo_based) in &regexes {
if regex.is_match(line_trim) { if regex.is_match(line_trim) {
return Ok((regex.clone(), *is_algo_based)); return Some((regex.clone(), *is_algo_based));
} }
} }
} }
Err(ChecksumError::NoProperlyFormattedChecksumLinesFound {
filename: get_filename_for_output(filename, input_is_stdin), None
}
.into())
} }
// Converts bytes to a hexadecimal string // Converts bytes to a hexadecimal string
@ -484,8 +478,12 @@ where
let reader = BufReader::new(file); let reader = BufReader::new(file);
let lines: Vec<String> = reader.lines().collect::<Result<_, _>>()?; let lines: Vec<String> = reader.lines().collect::<Result<_, _>>()?;
let (chosen_regex, is_algo_based_format) = let Some((chosen_regex, is_algo_based_format)) = determine_regex(&lines) else {
determine_regex(filename_input, input_is_stdin, &lines)?; return Err(ChecksumError::NoProperlyFormattedChecksumLinesFound {
filename: get_filename_for_output(filename_input, input_is_stdin),
}
.into());
};
for (i, line) in lines.iter().enumerate() { for (i, line) in lines.iter().enumerate() {
if let Some(caps) = chosen_regex.captures(line) { if let Some(caps) = chosen_regex.captures(line) {
@ -938,29 +936,22 @@ mod tests {
#[test] #[test]
fn test_determine_regex() { fn test_determine_regex() {
let filename = std::ffi::OsStr::new("test.txt");
// Test algo-based regex // Test algo-based regex
let lines_algo_based = let lines_algo_based =
vec!["MD5 (example.txt) = d41d8cd98f00b204e9800998ecf8427e".to_string()]; vec!["MD5 (example.txt) = d41d8cd98f00b204e9800998ecf8427e".to_string()];
let result = determine_regex(filename, false, &lines_algo_based); let (regex, algo_based) = determine_regex(&lines_algo_based).unwrap();
assert!(result.is_ok());
let (regex, algo_based) = result.unwrap();
assert!(algo_based); assert!(algo_based);
assert!(regex.is_match(&lines_algo_based[0])); assert!(regex.is_match(&lines_algo_based[0]));
// Test double-space regex // Test double-space regex
let lines_double_space = vec!["d41d8cd98f00b204e9800998ecf8427e example.txt".to_string()]; let lines_double_space = vec!["d41d8cd98f00b204e9800998ecf8427e example.txt".to_string()];
let result = determine_regex(filename, false, &lines_double_space); let (regex, algo_based) = determine_regex(&lines_double_space).unwrap();
assert!(result.is_ok());
let (regex, algo_based) = result.unwrap();
assert!(!algo_based); assert!(!algo_based);
assert!(regex.is_match(&lines_double_space[0])); assert!(regex.is_match(&lines_double_space[0]));
// Test single-space regex // Test single-space regex
let lines_single_space = vec!["d41d8cd98f00b204e9800998ecf8427e example.txt".to_string()]; let lines_single_space = vec!["d41d8cd98f00b204e9800998ecf8427e example.txt".to_string()];
let result = determine_regex(filename, false, &lines_single_space); let (regex, algo_based) = determine_regex(&lines_single_space).unwrap();
assert!(result.is_ok());
let (regex, algo_based) = result.unwrap();
assert!(!algo_based); assert!(!algo_based);
assert!(regex.is_match(&lines_single_space[0])); assert!(regex.is_match(&lines_single_space[0]));
@ -969,17 +960,14 @@ mod tests {
"ERR".to_string(), "ERR".to_string(),
"d41d8cd98f00b204e9800998ecf8427e example.txt".to_string(), "d41d8cd98f00b204e9800998ecf8427e example.txt".to_string(),
]; ];
let result = determine_regex(filename, false, &lines_double_space); let (regex, algo_based) = determine_regex(&lines_double_space).unwrap();
assert!(result.is_ok());
let (regex, algo_based) = result.unwrap();
assert!(!algo_based); assert!(!algo_based);
assert!(!regex.is_match(&lines_double_space[0])); assert!(!regex.is_match(&lines_double_space[0]));
assert!(regex.is_match(&lines_double_space[1])); assert!(regex.is_match(&lines_double_space[1]));
// Test invalid checksum line // Test invalid checksum line
let lines_invalid = vec!["invalid checksum line".to_string()]; let lines_invalid = vec!["invalid checksum line".to_string()];
let result = determine_regex(filename, false, &lines_invalid); assert!(determine_regex(&lines_invalid).is_none());
assert!(result.is_err());
} }
#[test] #[test]