refactor: 提取正整数转换函数并优化参数验证逻辑

Author: a76yyyy

src/utils/validation.rs

@@ -1,38 +1,60 @@
 use pyo3::prelude::*;
 use std::time::Duration;
 
-/// 验证 `interval_ms` 参数并转换为 u64
+/// 将正整数 i64 转换为 u64，用于 DNS 解析超时等参数
 ///
-/// 由于 ping 命令的 -i 参数格式化为一位小数，所以 `interval_ms` 必须是 100ms 的倍数且不小于 100ms
-pub fn validate_interval_ms(value: i64, param_name: &str) -> PyResult<u64> {
-    if value < 0 {
+/// 如果值为负数或零，返回错误
+pub fn i64_to_u64_positive(value: i64, param_name: &str) -> PyResult<u64> {
+    if value <= 0 {
         return Err(PyErr::new::<pyo3::exceptions::PyValueError, _>(format!(
-            "{param_name} must be a non-negative integer"
+            "{param_name} must be a positive integer, got {value}"
         )));
     }
-    if value < 100 {
+    // 已验证 value > 0，使用 try_from 进行类型转换
+    u64::try_from(value).map_err(|e| {
+        PyErr::new::<pyo3::exceptions::PyValueError, _>(format!("{param_name} ({value}) conversion to u64 failed: {e}"))
+    })
+}
+
+/// 将正整数 i32 转换为 usize，用于 count 等参数
+///
+/// 如果值为负数或零，返回错误
+pub fn i32_to_usize_positive(value: i32, param_name: &str) -> PyResult<usize> {
+    if value <= 0 {
+        return Err(PyErr::new::<pyo3::exceptions::PyValueError, _>(format!(
+            "{param_name} ({value}) must be a positive integer"
+        )));
+    }
+    // 已验证 value > 0，使用 try_from 进行类型转换
+    usize::try_from(value).map_err(|e| {
+        PyErr::new::<pyo3::exceptions::PyValueError, _>(format!(
+            "{param_name} ({value}) conversion to usize failed: {e}"
+        ))
+    })
+}
+
+/// 验证 `interval_ms` 参数并转换为 u64
+///
+/// 由于 ping 命令的 -i 参数格式化为一位小数，所以 `interval_ms` 必须是 100ms 的倍数且不小于 100ms
+pub fn validate_interval_ms(value: i64, param_name: &str) -> PyResult<u64> {
+    let value_u64 = i64_to_u64_positive(value, param_name)?;
+
+    if value_u64 < 100 {
         return Err(PyErr::new::<pyo3::exceptions::PyValueError, _>(format!(
             "{param_name} must be at least 100ms"
         )));
     }
-    if value % 100 != 0 {
+    if value_u64 % 100 != 0 {
         return Err(PyErr::new::<pyo3::exceptions::PyValueError, _>(format!(
             "{param_name} must be a multiple of 100ms due to ping command's decimal precision"
         )));
     }
-    #[allow(clippy::cast_sign_loss)]
-    Ok(value as u64)
+    Ok(value_u64)
 }
 
 /// 验证 count 参数并转换为 usize
 pub fn validate_count(count: i32, param_name: &str) -> PyResult<usize> {
-    if count <= 0 {
-        return Err(PyErr::new::<pyo3::exceptions::PyValueError, _>(format!(
-            "{param_name} ({count}) must be a positive integer"
-        )));
-    }
-    #[allow(clippy::cast_sign_loss)]
-    Ok(count as usize)
+    i32_to_usize_positive(count, param_name)
 }
 
 /// 验证 `timeout_ms` 参数并转换为 Duration