ishan/geofw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: create default json config if none exists

Browse Source
This commit is contained in:
Ishan Jain 2025-01-21 16:28:32 +05:30
parent 7612956830
commit 6d0e300e44
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
geofw/src/main.rs
View File

@ -14,7 +14,7 @@ use maxmind::{Data, ProcessedDb};
use serde_derive::{Deserialize, Serialize}; use serde_derive::{Deserialize, Serialize};
use std::{ use std::{
fs::File, fs::File,
io::{BufReader, ErrorKind, Read}, io::{BufReader, ErrorKind, Read, Write},
path::PathBuf, path::PathBuf,
}; };
use tar::Archive; use tar::Archive;
@ -67,10 +67,18 @@ fn read_config(path: &str) -> Result<Config, String> {
serde_json::from_slice(&contents).map_err(|e| e.to_string()) serde_json::from_slice(&contents).map_err(|e| e.to_string())
} }
Err(e) if e.kind() == ErrorKind::NotFound => { Err(e) if e.kind() == ErrorKind::NotFound => {
if let Err(e) = File::create(path) { let def: Config = Default::default();
warn!("error in writing config to {}: {}", path, e); match File::create(path) {
Ok(mut f) => {
let json = serde_json::to_string_pretty(&def)
.expect("error in marshalling config to json");
if let Err(e) = f.write_all(json.as_bytes()) {
warn!("error in writing default config to disk: {}", e);
}
}
Err(e) => warn!("error in writing config to {}: {}", path, e),
} }
Ok(Default::default()) Ok(def)
} }
Err(e) => Err(format!("permission denied reading {}: {}", path, e)), Err(e) => Err(format!("permission denied reading {}: {}", path, e)),
} }