init federation

src/config/default_keymap.toml

@@ -9,7 +9,7 @@
 # command: an Action name, optionally with parameters:
 #   command = { SeekForward = { seconds = 30 } }
 # context: optional view filter — global (default), library, search,
-#   playlists, queue, devices.
+#   playlists, queue, logs.
 
 [[keymaps]]
 key_sequence = "q"
@@ -47,6 +47,10 @@ command = { GoToTab = 2 }
 key_sequence = "4"
 command = { GoToTab = 3 }
 
+[[keymaps]]
+key_sequence = "5"
+command = { GoToTab = 4 }
+
 [[keymaps]]
 key_sequence = "a"
 command = "QueueAddNext"
@@ -204,12 +208,12 @@ key_sequence = "i"
 command = "OpenTrackInfo"
 
 [[keymaps]]
-key_sequence = "shift-l"
-command = "Logout"
+key_sequence = "e"
+command = "EditSelected"
 
 [[keymaps]]
 key_sequence = "shift-d"
-command = "OpenDevices"
+command = "DeleteSelected"
 
 [[keymaps]]
 key_sequence = "v"

src/config/keymap.rs

@@ -20,7 +20,7 @@ pub enum KeyContext {
     Search,
     Playlists,
     Queue,
-    Devices,
+    Federation,
     Logs,
 }
 
@@ -32,7 +32,7 @@ impl KeyContext {
             KeyContext::Search => "search",
             KeyContext::Playlists => "playlists",
             KeyContext::Queue => "queue",
-            KeyContext::Devices => "devices",
+            KeyContext::Federation => "federation",
             KeyContext::Logs => "logs",
         }
     }
@@ -81,8 +81,8 @@ impl Keymap {
         let mut bindings =
             parse_bindings(DEFAULT_KEYMAP).expect("embedded default keymap must parse");
         let mut warning = None;
-        if let Some(path) = user_keymap_path() {
-            if path.exists() {
+        if let Some(path) = user_keymap_path()
+            && path.exists() {
                 match fs::read_to_string(&path)
                     .map_err(anyhow::Error::from)
                     .and_then(|text| parse_bindings(&text))
@@ -96,7 +96,6 @@ impl Keymap {
                     }
                 }
             }
-        }
         let keymap = Self {
             bindings,
             pending: Vec::new(),
@@ -219,11 +218,10 @@ enum Lookup {
 /// Letters (of any alphabet) keep SHIFT (that is how "shift-g" works);
 /// symbols drop it so a "?" binding matches everywhere.
 fn normalize(key: KeyCombination) -> KeyCombination {
-    if let crokey::OneToThree::One(KeyCode::Char(c)) = key.codes {
-        if !c.is_alphabetic() && key.modifiers.contains(KeyModifiers::SHIFT) {
+    if let crokey::OneToThree::One(KeyCode::Char(c)) = key.codes
+        && !c.is_alphabetic() && key.modifiers.contains(KeyModifiers::SHIFT) {
             return KeyCombination::new(KeyCode::Char(c), key.modifiers - KeyModifiers::SHIFT);
         }
-    }
     key
 }
 
@@ -303,8 +301,8 @@ fn parse_chord(chord: &str) -> Result<KeyCombination> {
     // crokey only parses single-byte characters; non-ASCII keys (Cyrillic
     // bindings) are built directly.
     let mut chars = chord.chars();
-    if let (Some(c), None) = (chars.next(), chars.next()) {
-        if !c.is_ascii() {
+    if let (Some(c), None) = (chars.next(), chars.next())
+        && !c.is_ascii() {
             let modifiers = if c.is_uppercase() {
                 KeyModifiers::SHIFT
             } else {
@@ -312,7 +310,6 @@ fn parse_chord(chord: &str) -> Result<KeyCombination> {
             };
             return Ok(KeyCombination::new(KeyCode::Char(c), modifiers));
         }
-    }
     KeyCombination::from_str(chord)
         .map_err(|e| anyhow::anyhow!("{e}"))
         .map(normalize)

src/config/mod.rs

@@ -2,54 +2,7 @@ pub mod keymap;
 pub mod logging;
 
 use directories::ProjectDirs;
-use std::fs;
-use std::path::PathBuf;
-use std::time::{SystemTime, UNIX_EPOCH};
 
 pub fn project_dirs() -> Option<ProjectDirs> {
     ProjectDirs::from("", "", "furumi")
 }
-
-pub fn device_id_path() -> Option<PathBuf> {
-    project_dirs().map(|dirs| dirs.config_dir().join("device_id"))
-}
-
-pub fn load_or_create_device_id() -> String {
-    if let Some(path) = device_id_path() {
-        if let Ok(raw) = fs::read_to_string(&path) {
-            let id = raw.trim();
-            if valid_device_id(id) {
-                return id.to_string();
-            }
-        }
-
-        let id = generate_device_id();
-        if let Some(parent) = path.parent() {
-            if let Err(err) = fs::create_dir_all(parent) {
-                tracing::warn!(path = %parent.display(), %err, "failed to create config directory");
-                return id;
-            }
-        }
-        if let Err(err) = fs::write(&path, &id) {
-            tracing::warn!(path = %path.display(), %err, "failed to persist device id");
-        }
-        return id;
-    }
-    generate_device_id()
-}
-
-fn valid_device_id(id: &str) -> bool {
-    !id.is_empty()
-        && id.len() <= 128
-        && id
-            .chars()
-            .all(|ch| ch.is_ascii_alphanumeric() || ch == '-' || ch == '_')
-}
-
-fn generate_device_id() -> String {
-    let nanos = SystemTime::now()
-        .duration_since(UNIX_EPOCH)
-        .map(|d| d.as_nanos())
-        .unwrap_or(0);
-    format!("tui-{nanos:x}-{:x}", std::process::id())
-}