chore: Accessor methods for keycodes in Layout

Author: ids1024

backend/src/key.rs

@@ -89,7 +89,7 @@ impl Key {
             debug!("    Scancode: {:04X}", scancode);
             debug!(
                 "    Scancode Name: {:?}",
-                board.layout().scancode_names.get(&scancode)
+                board.layout().scancode_to_name(scancode)
             );
 
             scancodes.push(Cell::new(scancode));
@@ -145,7 +145,7 @@ impl Key {
     pub fn get_scancode(&self, layer: usize) -> Option<(u16, String)> {
         let board = self.board();
         let scancode = self.scancodes.get(layer)?.get();
-        let scancode_name = match board.layout().scancode_names.get(&scancode) {
+        let scancode_name = match board.layout().scancode_to_name(scancode) {
             Some(some) => some.to_string(),
             None => String::new(),
         };
@@ -154,10 +154,9 @@ impl Key {
 
     pub fn set_scancode(&self, layer: usize, scancode_name: &str) -> Result<(), String> {
         let board = self.board();
-        let scancode = *board
+        let scancode = board
             .layout()
-            .keymap
-            .get(scancode_name)
+            .scancode_from_name(scancode_name)
             .ok_or_else(|| format!("Unable to find scancode '{}'", scancode_name))?;
         board.0.daemon.keymap_set(
             board.0.board,

backend/src/layout/mod.rs

@@ -10,8 +10,8 @@ use crate::KeyMap;
 pub struct Layout {
     pub meta: Meta,
     pub default: KeyMap,
-    pub keymap: HashMap<String, u16>,
-    pub scancode_names: HashMap<u16, String>,
+    keymap: HashMap<String, u16>,
+    scancode_names: HashMap<u16, String>,
     pub(crate) physical: Vec<PhysicalLayoutKey>,
     pub(crate) layout: HashMap<String, (u8, u8)>,
     pub(crate) leds: HashMap<String, Vec<u8>>,
@@ -133,6 +133,14 @@ impl Layout {
             },
         )
     }
+
+    pub fn scancode_to_name(&self, scancode: u16) -> Option<&str> {
+        self.scancode_names.get(&scancode).map(String::as_str)
+    }
+
+    pub fn scancode_from_name(&self, name: &str) -> Option<u16> {
+        self.keymap.get(name).copied()
+    }
 }
 
 fn parse_keymap_json(keymap_json: &str) -> (HashMap<String, u16>, HashMap<u16, String>) {

src/application/keyboard.rs

@@ -237,7 +237,7 @@ impl Keyboard {
     }
 
     pub fn has_scancode(&self, scancode_name: &str) -> bool {
-        self.layout().keymap.contains_key(scancode_name)
+        self.layout().scancode_from_name(scancode_name).is_some()
     }
 
     pub fn keymap_set(&self, key_index: usize, layer: usize, scancode_name: &str) {