refactor: extract load_backup helper

Remove duplicated read+deserialize boilerplate shared by install_macos
and install_windows. The two call sites each had an identical 4-line
chain of read_to_string().ok().and_then(serde_json::from_str).ok() —
collapse into a single generic helper load_backup<T>().

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Razvan Dimescu
2026-04-08 05:01:17 +03:00
parent 9c9986b49d
commit a54fb99428

View File

@@ -6,6 +6,13 @@ fn is_loopback_or_stub(addr: &str) -> bool {
matches!(addr, "127.0.0.1" | "127.0.0.53" | "0.0.0.0" | "::1" | "") matches!(addr, "127.0.0.1" | "127.0.0.53" | "0.0.0.0" | "::1" | "")
} }
/// Load a JSON backup file as `T`, returning `None` if the file is missing
/// or unreadable (rather than erroring — callers fall back to a fresh capture).
#[cfg(any(target_os = "macos", windows))]
fn load_backup<T: serde::de::DeserializeOwned>(path: &std::path::Path) -> Option<T> {
serde_json::from_str(&std::fs::read_to_string(path).ok()?).ok()
}
/// A conditional forwarding rule: domains matching `suffix` are forwarded to `upstream`. /// A conditional forwarding rule: domains matching `suffix` are forwarded to `upstream`.
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct ForwardingRule { pub struct ForwardingRule {
@@ -572,9 +579,7 @@ fn install_windows() -> Result<(), String> {
// Preserve an existing useful backup rather than overwriting it with // Preserve an existing useful backup rather than overwriting it with
// numa-managed state (which would be self-referential after uninstall). // numa-managed state (which would be self-referential after uninstall).
let existing: Option<std::collections::HashMap<String, WindowsInterfaceDns>> = let existing: Option<std::collections::HashMap<String, WindowsInterfaceDns>> =
std::fs::read_to_string(&path) load_backup(&path);
.ok()
.and_then(|json| serde_json::from_str(&json).ok());
let has_useful_existing = existing let has_useful_existing = existing
.as_ref() .as_ref()
.map(backup_has_real_upstream_windows) .map(backup_has_real_upstream_windows)
@@ -831,10 +836,7 @@ fn install_macos() -> Result<(), String> {
// If a useful backup already exists (at least one non-loopback upstream), // If a useful backup already exists (at least one non-loopback upstream),
// preserve it — overwriting would destroy the original DNS state when // preserve it — overwriting would destroy the original DNS state when
// re-installing on top of a numa-managed configuration. // re-installing on top of a numa-managed configuration.
let existing_backup: Option<HashMap<String, Vec<String>>> = let existing_backup: Option<HashMap<String, Vec<String>>> = load_backup(&backup_path());
std::fs::read_to_string(backup_path())
.ok()
.and_then(|json| serde_json::from_str(&json).ok());
let has_useful_existing = existing_backup let has_useful_existing = existing_backup
.as_ref() .as_ref()
.map(backup_has_real_upstream_macos) .map(backup_has_real_upstream_macos)