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

Merge branch 'juliancoffee/asset_tweak_fix' into 'master'

Browse Source 
serialize AssetTweakWrapper<T>, not just T

See merge request veloren/veloren!2402
This commit is contained in:
Marcel 2021-06-08 22:39:55 +00:00
commit d16fcbc410
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab/CI/build.gitlab-ci.yml
View File

@ -9,7 +9,7 @@ unittests:
- rm -r target/debug/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
- cargo test --package veloren-i18n --lib test_all_localizations -- --nocapture --ignored
- rm -r target/debug/incremental* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
- cargo test
- cargo test --features asset_tweak
retry:
max: 2

25
common/assets/src/lib.rs
View File

@ -269,7 +269,7 @@ pub mod asset_tweak {
use ron::ser::{to_writer_pretty, PrettyConfig};
use serde::{de::DeserializeOwned, Deserialize, Serialize};
#[derive(Clone, Deserialize)]
#[derive(Clone, Deserialize, Serialize)]
struct AssetTweakWrapper<T>(T);
impl<T> Asset for AssetTweakWrapper<T>
@ -357,9 +357,10 @@ pub mod asset_tweak {
let f = fs::File::create(tweak_dir.join(&filename)).unwrap_or_else(|err| {
panic!("failed to create file {:?}. Error: {:?}", &filename, err)
});
to_writer_pretty(f, &value, PrettyConfig::new()).unwrap_or_else(|err| {
panic!("failed to write to file {:?}. Error: {:?}", &filename, err)
});
to_writer_pretty(f, &AssetTweakWrapper(value.clone()), PrettyConfig::new())
.unwrap_or_else(|err| {
panic!("failed to write to file {:?}. Error: {:?}", &filename, err)
});
value
}
@ -485,15 +486,27 @@ pub mod asset_tweak {
fn test_tweaked_create() {
let root = find_root().expect("failed to discover repository_root");
let tweak_dir = root.join("assets/tweak/");
let test_path1 = tweak_dir.join("__test_int_create.ron");
let _file_guard1 = FileGuard::hold(&test_path1);
let x = tweak_expect_or_create("__test_int_create", 5);
assert_eq!(x, 5);
assert!(test_path1.is_file());
// Recheck it loads back correctly
let x = tweak_expect_or_create("__test_int_create", 5);
assert_eq!(x, 5);
let test_path2 = tweak_dir.join("__test_tuple_create.ron");
let _file_guard2 = FileGuard::hold(&test_path2);
let (x, y, z) = tweak_expect_or_create("__test_tuple_create", (5.0, 6.0, 7.0));
assert_eq!((x, y, z), (5.0, 6.0, 7.0));
// Recheck it loads back correctly
let (x, y, z) = tweak_expect_or_create("__test_tuple_create", (5.0, 6.0, 7.0));
assert_eq!((x, y, z), (5.0, 6.0, 7.0));
// Test that file has stronger priority
let test_path2 = tweak_dir.join("__test_priority.ron");
let (_file_guard2, mut file) = FileGuard::create(&test_path2);
let test_path3 = tweak_dir.join("__test_priority.ron");
let (_file_guard3, mut file) = FileGuard::create(&test_path3);
file.write_all(b"(10)")
.expect("failed to write to the file");
let x = tweak_expect_or_create("__test_priority", 6);