New settings

Cargo.toml

@@ -19,11 +19,11 @@ categories = [
 
 [dependencies]
 # Simpler error handling
-anyhow = "1.0.100"
+anyhow = "1.0.101"
 # Get current date and time
 chrono = { version = "0.4.42", default-features = false, features = ["clock"] }
 # Framework for parsing CLI args
-clap = { version = "4.5.54", features = ["derive"] }
+clap = { version = "4.5.57", features = ["derive"] }
 # Detect message boundaries in serial port output from device
 cobs = "0.5.0"
 # Generate PNG images (sign chunks)
@@ -33,13 +33,13 @@ crossterm = "0.29.0"
 # Find the best place to sotre the VFS
 directories = "6.0.0"
 # Serialize app config into meta file in the ROM
-firefly-types = { version = "0.7.1" }
+firefly-types = { version = "0.8.0" }
 # Read gz archives (to install emulator).
-flate2 = "1.1.5"
+flate2 = "1.1.9"
 # Decode wav files
 hound = "3.5.1"
 # Parse PNG images
-image = { version = "0.25.6", default-features = false, features = ["png"] }
+image = { version = "0.25.9", default-features = false, features = ["png"] }
 # Generate PNG images (compress frame)
 libflate = "2.2.1"
 # Random device name generation

src/vfs.rs

@@ -32,13 +32,12 @@ pub fn init_vfs(path: &Path) -> anyhow::Result<()> {
     fs::create_dir_all(path.join("sys").join("priv")).context("create sys/priv directory")?;
     fs::create_dir_all(path.join("data")).context("create data directory")?;
     let settings_path = path.join("sys").join("config");
-    if !settings_path.exists() {
+    println!("{}", is_valid_settings(&settings_path));
+    if !is_valid_settings(&settings_path) {
         let mut settings = firefly_types::Settings {
-            xp: 0,
-            badges: 0,
-            lang: [b'e', b'n'],
-            name: generate_valid_name(),
             timezone: detect_tz(),
+            name: generate_valid_name(),
+            ..Default::default()
         };
         if !settings.timezone.contains('/') {
             settings.timezone = "Europe/Amsterdam".to_string();
@@ -50,6 +49,17 @@ pub fn init_vfs(path: &Path) -> anyhow::Result<()> {
     Ok(())
 }
 
+fn is_valid_settings(path: &Path) -> bool {
+    if !path.exists() {
+        return false;
+    }
+    let Ok(data) = std::fs::read(path) else {
+        return false;
+    };
+    let res = firefly_types::Settings::decode(&data);
+    res.is_ok()
+}
+
 /// Generate a random valid device name.
 pub fn generate_valid_name() -> String {
     loop {