From 6586c5db2c14ccd7f9a3ad286944f66885caa2c0 Mon Sep 17 00:00:00 2001 From: euzu Date: Thu, 24 Apr 2025 20:59:07 +0200 Subject: [PATCH] little code fixes --- src/api/model/active_provider_manager.rs | 4 ++-- src/api/model/streams/chunked_buffer.rs | 2 +- src/api/model/streams/readonly_ring_buffer.rs | 2 +- src/api/scheduler.rs | 2 +- src/foundation/filter.rs | 2 +- src/processing/parser/xtream.rs | 2 +- src/repository/bplustree.rs | 22 +++++++++---------- src/repository/indexed_document.rs | 2 +- src/tools/directed_graph.rs | 21 +++++++++--------- src/utils/crypto_utils.rs | 2 +- src/utils/file/config_reader.rs | 16 +++++++------- src/utils/network/request.rs | 10 ++++----- 12 files changed, 43 insertions(+), 44 deletions(-) diff --git a/src/api/model/active_provider_manager.rs b/src/api/model/active_provider_manager.rs index 1617344fb..f77ecfee7 100644 --- a/src/api/model/active_provider_manager.rs +++ b/src/api/model/active_provider_manager.rs @@ -747,7 +747,7 @@ mod tests { id, name: name.to_string(), url: "http://example.com".to_string(), - epg: Default::default(), + epg: Option::default(), username: None, password: None, persist: None, @@ -758,7 +758,7 @@ mod tests { max_connections, priority, aliases: None, - headers: Default::default(), + headers: HashMap::default(), options: None, method: InputFetchMethod::default(), t_base_url: String::default(), diff --git a/src/api/model/streams/chunked_buffer.rs b/src/api/model/streams/chunked_buffer.rs index 52885b133..ce4e9bc87 100644 --- a/src/api/model/streams/chunked_buffer.rs +++ b/src/api/model/streams/chunked_buffer.rs @@ -59,7 +59,7 @@ mod tests { let mut index:usize = 0; while let Some(chunk) = chunked_buffer.next_chunk() { - for &byte in chunk.iter() { + for byte in chunk { let expected_value = buffer[index % buffer.len()]; assert_eq!(byte, expected_value, "Wrong value {byte} != {expected_value} at index {index} detected!"); index+=1; diff --git a/src/api/model/streams/readonly_ring_buffer.rs b/src/api/model/streams/readonly_ring_buffer.rs index 5c7356af6..12e222180 100644 --- a/src/api/model/streams/readonly_ring_buffer.rs +++ b/src/api/model/streams/readonly_ring_buffer.rs @@ -68,7 +68,7 @@ mod tests { let mut index:usize = 0; while let Some(chunk) = ring_buffer.next_chunk() { - for &byte in chunk.iter() { + for byte in chunk { let expected_value = buffer[index % buffer.len()]; assert_eq!(byte, expected_value, "Wrong value {byte} != {expected_value} at index {index} detected!"); index+=1; diff --git a/src/api/scheduler.rs b/src/api/scheduler.rs index bac5c69ae..e869ced2e 100644 --- a/src/api/scheduler.rs +++ b/src/api/scheduler.rs @@ -72,7 +72,7 @@ mod tests { } } Err(_) => {} - }; + } let duration = start.elapsed(); assert!(runs.load(Ordering::SeqCst) == 6, "Failed to run"); diff --git a/src/foundation/filter.rs b/src/foundation/filter.rs index 13f5cf0df..3ed10713c 100644 --- a/src/foundation/filter.rs +++ b/src/foundation/filter.rs @@ -710,7 +710,7 @@ mod tests { match get_filter(flt, None) { Ok(filter) => { - let result = CONSTANTS.re_whitespace.replace_all(&flt, " "); + let result = CONSTANTS.re_whitespace.replace_all(flt, " "); assert_eq!(format!("{filter}"), result.trim()); } Err(e) => { diff --git a/src/processing/parser/xtream.rs b/src/processing/parser/xtream.rs index f540dfd42..61512f88c 100644 --- a/src/processing/parser/xtream.rs +++ b/src/processing/parser/xtream.rs @@ -121,7 +121,7 @@ pub fn parse_xtream(input: &ConfigInput, match map_to_xtream_streams(xtream_cluster, streams) { Ok(mut xtream_streams) => { - let mut group_map: HashMap:: = + let mut group_map: HashMap = xtream_categories.into_iter().map(|category| (category.category_id.to_string(), category) ).collect(); diff --git a/src/repository/bplustree.rs b/src/repository/bplustree.rs index 20465df24..f725b315f 100644 --- a/src/repository/bplustree.rs +++ b/src/repository/bplustree.rs @@ -425,7 +425,7 @@ where } } - const fn new_with_root(root: BPlusTreeNode::) -> Self { + const fn new_with_root(root: BPlusTreeNode) -> Self { let (inner_order, leaf_order) = calc_order::(); Self { root, @@ -822,22 +822,22 @@ mod tests { // Query the tree for i in 0u32..=test_size { let found = tree.query(&i); - assert!(found.is_some(), "{content} {} not found", i); + assert!(found.is_some(), "{content} {i} not found"); assert!(found.unwrap().eq(&Record { id: i, data: format!("{content} {i}"), - }), "{content} {} not found", i); + }), "{content} {i} not found"); } let mut tree_query: BPlusTreeQuery = BPlusTreeQuery::try_new(&filepath)?; for i in 0u32..=test_size { let found = tree_query.query(&i); - assert!(found.is_some(), "{content} {} not found", i); + assert!(found.is_some(), "{content} {i} not found"); let entry = found.unwrap(); assert!(entry.eq(&Record { id: i, data: format!("{content} {i}"), - }), "{content} {} not found", i); + }), "{content} {i} not found"); } let mut tree_update: BPlusTreeUpdate = BPlusTreeUpdate::try_new(&filepath)?; @@ -850,7 +850,7 @@ mod tests { }; tree_update.update(&i, new_record)?; } else { - assert!(false, "{content} {} not found", i); + assert!(false, "{content} {i} not found"); } } @@ -858,13 +858,13 @@ mod tests { for i in 0u32..=test_size { let found = tree_query.query(&i); - assert!(found.is_some(), "{content} {} not found", i); + assert!(found.is_some(), "{content} {i} not found"); let entry = found.unwrap(); let expected = Record { id: i, data: format!("{content} {}", i + 9000), }; - assert!(entry.eq(&expected), "Entry not equal {:?} != {:?}", entry, expected); + assert!(entry.eq(&expected), "Entry not equal {entry:?} != {expected:?}"); } Ok(()) @@ -890,7 +890,7 @@ mod tests { tree.traverse(|keys, values| { keys.iter().zip(values.iter()).for_each(|(k, v)| { - assert!(format!("{content} {}", k + 1).eq(&v.data), "Wrong entry") + assert!(format!("{content} {}", k + 1).eq(&v.data), "Wrong entry"); }); }); @@ -914,8 +914,8 @@ mod tests { let tree: BPlusTree = BPlusTree::load(&filepath)?; // Traverse the tree - for (key, value) in tree.iter() { - assert!(format!("Entry {}", key).eq(&value.data), "Wrong entry"); + for (key, value) in &tree { + assert!(format!("Entry {key}").eq(&value.data), "Wrong entry"); entry_set.remove(key); } assert!(entry_set.is_empty()); diff --git a/src/repository/indexed_document.rs b/src/repository/indexed_document.rs index c264f4ab1..1d62b98c2 100644 --- a/src/repository/indexed_document.rs +++ b/src/repository/indexed_document.rs @@ -544,7 +544,7 @@ mod tests { for i in 0u32..=500 { idw.write_doc(i, &Record { id: i, - data: format!("E {}", i), + data: format!("E {i}"), })?; } diff --git a/src/tools/directed_graph.rs b/src/tools/directed_graph.rs index 3a3a4eb74..f6cbd1ca5 100644 --- a/src/tools/directed_graph.rs +++ b/src/tools/directed_graph.rs @@ -196,6 +196,14 @@ where } } +impl Default for DirectedGraph +where + K: Eq + std::hash::Hash + Clone + Display + Debug, +{ + fn default() -> Self { + Self::new() + } +} #[cfg(test)] mod tests { @@ -203,8 +211,8 @@ mod tests { use std::collections::HashSet; fn are_vecs_equal(vec1: &Vec<&str>, vec2: Vec<&str>) -> bool { - let set1: HashSet = vec1.into_iter().map(|s| s.to_string()).collect(); - let set2: HashSet = vec2.into_iter().map(|s| s.to_string()).collect(); + let set1: HashSet = vec1.iter().map(|s| s.to_string()).collect(); + let set2: HashSet = vec2.iter().map(|s| s.to_string()).collect(); set1 == set2 } @@ -326,12 +334,3 @@ mod tests { } } - -impl Default for DirectedGraph -where - K: Eq + std::hash::Hash + Clone + Display + Debug, -{ - fn default() -> Self { - Self::new() - } -} diff --git a/src/utils/crypto_utils.rs b/src/utils/crypto_utils.rs index b1d231437..de7d74774 100644 --- a/src/utils/crypto_utils.rs +++ b/src/utils/crypto_utils.rs @@ -69,7 +69,7 @@ mod tests { fn test_encrypt() { let secret: [u8; 16] = rand::rng().random(); // Random IV (AES-CBC 16 Bytes) let plain = "hello world"; - let encrypted = encrypt_text(&secret, &plain); + let encrypted = encrypt_text(&secret, plain); let decrypted = decrypt_text(&secret, &encrypted.unwrap()).unwrap(); assert_eq!(decrypted, plain); diff --git a/src/utils/file/config_reader.rs b/src/utils/file/config_reader.rs index a82d679ac..7d7fc5b20 100644 --- a/src/utils/file/config_reader.rs +++ b/src/utils/file/config_reader.rs @@ -104,15 +104,15 @@ pub fn read_mapping(mapping_file: &str, resolve_var: bool) -> Result = serde_yaml::from_reader(config_file_reader(file, resolve_var)); - match mapping { + return match mapping { Ok(mut result) => { handle_m3u_filter_error_result!(M3uFilterErrorKind::Info, result.prepare()); - return Ok(Some(result)); + Ok(Some(result)) } Err(err) => { - return Err(info_err!(err.to_string())); + Err(info_err!(err.to_string())) } - } + }; } warn!("cant read mapping file: {}", mapping_file.to_str().unwrap_or("?")); Ok(None) @@ -339,10 +339,10 @@ fn get_csv_file_path(file_uri: &String) -> Result { if file_uri.contains("://") { if let Ok(url) = file_uri.parse::() { if url.scheme() == "file" { - match url.to_file_path() { - Ok(path) => return Ok(path), - Err(()) => return Err(str_to_io_error(&format!("Could not open {file_uri}"))), - } + return match url.to_file_path() { + Ok(path) => Ok(path), + Err(()) => Err(str_to_io_error(&format!("Could not open {file_uri}"))), + }; } } Err(str_to_io_error(&format!("Only file:// is supported {file_uri}"))) diff --git a/src/utils/network/request.rs b/src/utils/network/request.rs index f4d9ff99e..7ecbb663e 100644 --- a/src/utils/network/request.rs +++ b/src/utils/network/request.rs @@ -180,9 +180,9 @@ pub fn get_local_file_content(file_path: &PathBuf) -> Result { if content.len() >= 2 && is_gzip(&content[0..2]) { let mut decoder = GzDecoder::new(&content[..]); let mut decode_buffer = String::new(); - match decoder.read_to_string(&mut decode_buffer) { - Ok(_) => return Ok(decode_buffer), - Err(err) => return Err(str_to_io_error(&format!("failed to decode gzip content {err}"))) + return match decoder.read_to_string(&mut decode_buffer) { + Ok(_) => Ok(decode_buffer), + Err(err) => Err(str_to_io_error(&format!("failed to decode gzip content {err}"))) }; } return Ok(String::from_utf8_lossy(&content).parse().unwrap()); @@ -504,8 +504,8 @@ mod tests { fn test_url_mask() { // Replace with "***" let query = "https://bubblegum.tv/live/username/password/2344"; - let masked = sanitize_sensitive_info(&query); - println!("{masked}") + let masked = sanitize_sensitive_info(query); + println!("{masked}"); } #[test]