remove length from read_raw return value, fix metadata check

Univa · Dec 23, 2024 · d73468f · d73468f
1 parent f083bc2
commit d73468f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/rumcake/src/storage.rs b/rumcake/src/storage.rs
@@ -144,7 +144,7 @@ where
         .await
         {
             (Ok(_), Some(buf), len) => {
-                let changed = current_metadata.len() != len || *current_metadata != *buf;
+                let changed = *current_metadata != buf[..len];
                 if changed {
                     warn!(
                         "[STORAGE] Metadata for {} has changed.",
@@ -238,7 +238,7 @@ where
 
     /// Read data from the storage peripheral, using the given key to look it up. This skips the
     /// deserialization step, returning raw bytes.
-    pub async fn read_raw(&self, key: StorageKey) -> Result<(&[u8], usize), ()> {
+    pub async fn read_raw(&self, key: StorageKey) -> Result<&[u8], ()> {
         let mut database = self.get_database().await;
         let buffer = S::get_storage_buffer();
 
@@ -262,7 +262,7 @@ where
                     Debug2Format(&error)
                 );
             })
-            .map(|_code| (&*buf.unwrap(), len))
+            .map(|_code| &buf.unwrap()[..len])
     }
 
     /// Write data to the storage peripheral, at the given key. This will serialize the given data

diff --git a/rumcake/src/via/handlers.rs b/rumcake/src/via/handlers.rs
@@ -170,7 +170,8 @@ pub async fn dynamic_keymap_macro_set_buffer<K: ViaKeyboard + 'static>(
 
         // Read data
         let stored_len = match database.read_raw(StorageKey::DynamicKeymapMacro).await {
-            Ok((stored_data, stored_len)) => {
+            Ok(stored_data) => {
+                let stored_len = stored_data.len();
                 buf[..stored_len].copy_from_slice(stored_data);
                 stored_len
             }
@@ -276,8 +277,8 @@ pub async fn dynamic_keymap_set_keycode<K: ViaKeyboard + 'static>(
 
             // Read data
             match database.read_raw(StorageKey::DynamicKeymap).await {
-                Ok((stored_data, stored_len)) => {
-                    buf[..stored_len].copy_from_slice(stored_data);
+                Ok(stored_data) => {
+                    buf[..stored_data.len()].copy_from_slice(stored_data);
                 }
                 Err(()) => {
                     warn!("[VIA] Could not read dynamic keymap buffer.");
@@ -342,8 +343,8 @@ pub async fn dynamic_keymap_set_encoder<K: ViaKeyboard + 'static>(
 
             // Read data
             match database.read_raw(StorageKey::DynamicKeymapEncoder).await {
-                Ok((stored_data, stored_len)) => {
-                    buf[..stored_len].copy_from_slice(stored_data);
+                Ok(stored_data) => {
+                    buf[..stored_data.len()].copy_from_slice(stored_data);
                 }
                 Err(()) => {
                     warn!("[VIA] Could not read dynamic keymap encoder.");
@@ -470,8 +471,8 @@ pub async fn dynamic_keymap_set_buffer<K: ViaKeyboard + 'static>(
 
         // Read data
         match database.read_raw(StorageKey::DynamicKeymap).await {
-            Ok((stored_data, stored_len)) => {
-                buf[..stored_len].copy_from_slice(stored_data);
+            Ok(stored_data) => {
+                buf[..stored_data.len()].copy_from_slice(stored_data);
             }
             Err(()) => {
                 warn!("[VIA] Could not read dynamic keymap buffer.");

diff --git a/rumcake/src/via/mod.rs b/rumcake/src/via/mod.rs
@@ -244,12 +244,12 @@ where
         let _ = database
             .check_metadata(crate::storage::StorageKey::LayoutOptions, &options_metadata)
             .await;
-        if let Ok((stored_data, stored_len)) = database
+        if let Ok(stored_data) = database
             .read_raw(crate::storage::StorageKey::LayoutOptions)
             .await
         {
             let mut bytes = [0; 4];
-            bytes[(4 - stored_len)..].copy_from_slice(&stored_data[..stored_len]);
+            bytes[(4 - stored_data.len())..].copy_from_slice(stored_data);
             VIA_LAYOUT_OPTIONS.signal(u32::from_be_bytes(bytes))
         };
 
@@ -262,13 +262,13 @@ where
         let _ = database
             .check_metadata(crate::storage::StorageKey::DynamicKeymap, &layout_metadata)
             .await;
-        if let Ok((stored_data, stored_len)) = database
+        if let Ok(stored_data) = database
             .read_raw(crate::storage::StorageKey::DynamicKeymap)
             .await
         {
             // Load layout from flash
             let mut layout = V::Layout::get_layout().layout.lock().await;
-            for byte in (0..stored_len).step_by(2) {
+            for byte in (0..stored_data.len()).step_by(2) {
                 if let Some(action) = protocol::keycodes::convert_keycode_to_action::<V>(
                     u16::from_be_bytes(stored_data[byte..byte + 2].try_into().unwrap()),
                 ) {
@@ -322,12 +322,12 @@ where
                 &layout_metadata,
             )
             .await;
-        if let Ok((stored_data, stored_len)) = database
+        if let Ok(stored_data) = database
             .read_raw(crate::storage::StorageKey::DynamicKeymapMacro)
             .await
         {
             if let Some(macro_data) = V::get_macro_buffer() {
-                macro_data.update_buffer(0, &stored_data[..stored_len])
+                macro_data.update_buffer(0, stored_data)
             }
         };
     }