Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move meta.dat to ron, so we don't create memory allocation errors

Browse Source
This commit is contained in:
timokoesters 2020-03-23 14:18:05 +01:00
parent 0eebf945fe
commit c01cd62f5f
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
voxygen/src/meta.rs
View File

@ -2,7 +2,7 @@ use common::comp;
use directories::ProjectDirs;
use log::warn;
use serde_derive::{Deserialize, Serialize};
use std::{fs, io, path::PathBuf};
use std::{fs, io::Write, path::PathBuf};
#[derive(Clone, Debug, Serialize, Deserialize)]
#[repr(C)]
@ -38,14 +38,14 @@ impl Meta {
let path = Self::get_meta_path();
if let Ok(file) = fs::File::open(&path) {
match bincode::deserialize_from(file) {
match ron::de::from_reader(file) {
Ok(s) => return s,
Err(e) => {
log::warn!("Failed to parse meta file! Fallback to default. {}", e);
// Rename the corrupted settings file
let mut new_path = path.to_owned();
new_path.pop();
new_path.push("meta.invalid.dat");
new_path.push("meta.invalid.ron");
if let Err(err) = std::fs::rename(path, new_path) {
log::warn!("Failed to rename meta file. {}", err);
}
@ -71,14 +71,16 @@ impl Meta {
if let Some(dir) = path.parent() {
fs::create_dir_all(dir)?;
}
bincode::serialize_into(fs::File::create(path)?, self)
.map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
let mut meta_file = fs::File::create(path)?;
let s: &str = &ron::ser::to_string_pretty(self, ron::ser::PrettyConfig::default()).unwrap();
meta_file.write_all(s.as_bytes()).unwrap();
Ok(())
}
pub fn get_meta_path() -> PathBuf {
if let Some(val) = std::env::var_os("VOXYGEN_CONFIG") {
let meta = PathBuf::from(val).join("meta.dat");
let meta = PathBuf::from(val).join("meta.ron");
if meta.exists() || meta.parent().map(|x| x.exists()).unwrap_or(false) {
return meta;
}
@ -87,6 +89,6 @@ impl Meta {
let proj_dirs = ProjectDirs::from("net", "veloren", "voxygen")
.expect("System's $HOME directory path not found!");
proj_dirs.config_dir().join("meta").with_extension("dat")
proj_dirs.config_dir().join("meta").with_extension("ron")
}
}