Add ability to switch View

By forwarding all `Key`s to the agent and allow it to decide what should
be done, instead of converting the `Key` to a `Control` and then decide
what should be done

src/musicplayer/control.gleam

@@ -1,19 +1,18 @@
+import gleam/string
+import musicplayer/ui/layout
+
 import musicplayer/input/key.{type Key}
 
 pub type Mode {
   Idle
-  Searching
+  Searching(input: String)
 }
 
 pub type Control {
-  InputKey(Key)
-
   TogglePlayPause
-  Search
+  Search(input: String, capturing: Bool)
 
-  Raw(String)
+  SetView(view_idx: layout.ViewIdx)
-  Return
-  Backspace
 
   Exit
 }
@@ -21,24 +20,39 @@ pub type Control {
 pub fn from_key(key: Key, mode: Mode) -> Result(Control, Nil) {
   case mode {
     Idle -> idle_from_key(key)
-    Searching -> todo
+    Searching(input) -> searching_from_key(key, input)
   }
 }
 
 pub fn idle_from_key(key: Key) -> Result(Control, Nil) {
   case key {
-    key.Return -> Ok(Return)
+    key.Char(char) -> {
-    key.Backspace -> Ok(Backspace)
+      case char {
-    key.Char(char) -> Ok(idle_char_control(char))
+        // Views are zero indexed
+        "1" -> Ok(SetView(0))
+        "2" -> Ok(SetView(1))
+
+        " " -> Ok(TogglePlayPause)
+        "/" -> Ok(Search(input: "", capturing: True))
+        "q" -> Ok(Exit)
+
+        // NOOP
+        _ -> Error(Nil)
+      }
+    }
+
+    // NOOP
     _ -> Error(Nil)
   }
 }
 
-fn idle_char_control(char: String) -> Control {
+pub fn searching_from_key(key: Key, input: String) -> Result(Control, Nil) {
-  case char {
+  case key {
-    " " -> TogglePlayPause
+    key.Char(char) -> Ok(Search(input <> char, True))
-    "/" -> Search
+    key.Backspace -> Ok(Search(string.drop_end(input, 1), True))
-    "q" -> Exit
+    key.Return -> Ok(Search(input, False))
-    _ -> Raw(char)
+
+    // NOOP
+    _ -> Error(Nil)
   }
 }

src/musicplayer/musicplayer.gleam

@@ -2,7 +2,7 @@ import gleam/erlang/process.{type Name, type Pid, type Subject}
 import gleam/otp/actor
 import gleam/string
 
-import musicplayer/control.{type Control, type Mode}
+import musicplayer/control.{type Mode}
 import musicplayer/input/key.{type Key}
 import musicplayer/logging/logging
 import musicplayer/mpv/control as mpv_control
@@ -10,14 +10,9 @@ import musicplayer/time/time
 import musicplayer/ui/control as ui_control
 import musicplayer/ui/layout
 
-type Input {
-  Input(capturing: Bool, content: String)
-}
-
 type State {
   State(
     mode: Mode,
-    input: Input,
     ui: Subject(ui_control.Control),
     mpv: Subject(mpv_control.Control),
   )
@@ -30,10 +25,8 @@ pub fn new(
 ) -> Result(Pid, String) {
   let input_keys = process.named_subject(input_keys_name)
 
-  let input = Input(False, "")
-
   case
-    actor.new(State(control.Idle, input, ui, mpv))
+    actor.new(State(control.Idle, ui, mpv))
     |> actor.on_message(handle_message)
     |> actor.start
   {
@@ -43,7 +36,7 @@ pub fn new(
       logging.log("musicplayer - started")
       process.spawn(fn() {
         let assert Ok(_) = process.register(process.self(), input_keys_name)
-        handle_key(musicplayer, input_keys)
+        forward_key(musicplayer, input_keys)
       })
 
       process.spawn(fn() { update_playback_time_loop(mpv, ui, 250) })
@@ -53,85 +46,43 @@ pub fn new(
   }
 }
 
-fn handle_message(state: State, control: Control) -> actor.Next(State, Control) {
+fn handle_message(state: State, key: Key) -> actor.Next(State, Key) {
-  case control {
+  case control.from_key(key, state.mode) {
-    control.InputKey(key) -> {
+    Error(_) -> actor.continue(state)
-      let _ = control.from_key(key, state.mode)
+    Ok(c) ->
-      // TODO get control and send it back to self
+      case c {
+        control.SetView(view_idx) -> {
+          logging.log(
+            "musicplayer - setting current view to: "
+            <> string.inspect(view_idx),
+          )
+
+          update_current_view(state.ui, view_idx)
           actor.continue(state)
         }
+        control.Search(input, capturing) -> {
+          case capturing {
+            True -> {
+              logging.log("musicplayer - searching: " <> input)
 
-    control.Search -> {
+              update_search(state.ui, "searching: " <> input)
-      logging.log("musicplayer - initiating search")
 
-      update_search(state.ui, "searching: ")
+              actor.continue(State(..state, mode: control.Searching(input)))
-
-      actor.continue(
-        State(
-          ..state,
-          mode: control.Searching,
-          input: Input(..state.input, capturing: True),
-        ),
-      )
             }
-
+            False -> {
-    control.Raw(content) -> {
-      logging.log("musicplayer - recieved raw input: " <> content)
-
-      let content = case state.mode {
-        control.Idle ->
-          case content {
-            "1" -> state.input.content
-            _ -> state.input.content
-          }
-        control.Searching -> {
-          let updated = state.input.content <> content
-          update_search(state.ui, "searching: " <> updated)
-          updated
-        }
-      }
-
-      actor.continue(State(..state, input: Input(..state.input, content:)))
-    }
-    control.Backspace -> {
               logging.log(
-        "musicplayer - recieved backspace. mode:" <> string.inspect(state.mode),
+                "musicplayer - recieved return. `input`: "
-      )
-
-      let content = case state.mode {
-        control.Idle -> state.input.content
-        control.Searching -> {
-          let updated = string.drop_end(state.input.content, 1)
-          update_search(state.ui, "searching: " <> updated)
-          updated
-        }
-      }
-      actor.continue(State(..state, input: Input(..state.input, content:)))
-    }
-    control.Return -> {
-      logging.log(
-        "musicplayer - recieved return. `input.capture`: "
                 <> "'"
-        <> state.input.content
+                <> input
                 <> "'",
               )
 
-      // Note: state.input.content is now the final input, use it
+              update_search(state.ui, "")
-      // before it is reset
-      case state.mode {
-        control.Idle -> Nil
-        control.Searching -> update_search(state.ui, "")
-      }
 
-      actor.continue(
+              actor.continue(State(..state, mode: control.Idle))
-        State(
+            }
-          ..state,
+          }
-          mode: control.Idle,
-          input: Input(capturing: False, content: ""),
-        ),
-      )
         }
-
         control.TogglePlayPause -> {
           logging.log("musicplayer - toggling play/pause")
 
@@ -142,16 +93,21 @@ fn handle_message(state: State, control: Control) -> actor.Next(State, Control)
         control.Exit -> {
           logging.log("musicplayer - initiating musicplayer shutdown")
           // Close `mpv` socket
-      process.call(state.mpv, 1000, fn(reply_to) { mpv_control.Exit(reply_to) })
+          process.call(state.mpv, 1000, fn(reply_to) {
+            mpv_control.Exit(reply_to)
+          })
 
           // Reset terminal state (show cursor etc.)
-      process.call(state.ui, 1000, fn(reply_to) { ui_control.Exit(reply_to) })
+          process.call(state.ui, 1000, fn(reply_to) {
+            ui_control.Exit(reply_to)
+          })
 
           logging.log("musicplayer - stopped")
 
           actor.stop()
         }
       }
+  }
 }
 
 fn update_playback_time_loop(
@@ -199,14 +155,21 @@ fn update_search(ui: Subject(ui_control.Control), content: String) -> Nil {
   process.send(ui, ui_control.UpdateState(layout.Search, content))
 }
 
-/// `handle_key` listens to a subject onto which `input` will send messages with `Key`s
+fn update_current_view(
-fn handle_key(musicplayer: Subject(Control), input_keys: Subject(Key)) -> Nil {
+  ui: Subject(ui_control.Control),
+  view_idx: layout.ViewIdx,
+) {
+  process.send(ui, ui_control.SetView(view_idx))
+}
+
+/// `forward_key` listens to a subject onto which `input` will send messages with `Key`s
+/// that is then forwarded to the `musicplayer` agent to handle
+fn forward_key(musicplayer: Subject(Key), input_keys: Subject(Key)) -> Nil {
   let _ =
     process.new_selector()
     |> process.select(input_keys)
     |> process.selector_receive_forever
-    |> fn(key) { control.InputKey(key) }
     |> process.send(musicplayer, _)
 
-  handle_key(musicplayer, input_keys)
+  forward_key(musicplayer, input_keys)
 }

src/musicplayer/ui/control.gleam

@@ -1,12 +1,11 @@
 import gleam/erlang/process.{type Subject}
 
-import musicplayer/ui/layout.{type Section}
+import musicplayer/ui/layout.{type Section, type ViewIdx}
 
 pub type Control {
   UpdateDimensions(columns: Int, rows: Int)
   UpdateState(section: Section, content: String)
-  SetView(view_idx: layout.ViewIdx)
+  SetView(view_idx: ViewIdx)
 
-  // NodeEvent
   Exit(reply_to: Subject(Nil))
 }

src/musicplayer/ui/layout.gleam

@@ -5,7 +5,6 @@ import gleam/pair
 import gleam/set
 import gleam/string
 
-import musicplayer/logging/logging
 import musicplayer/ui/internal
 import musicplayer/ui/plot.{type Buffer}
 
@@ -85,7 +84,7 @@ fn view_loop(i: ViewIdx, view_nodes: List(#(Section, Node))) -> View {
 
   dict.from_list(view_nodes)
   |> dict.insert(
-    Section(string.append("view_", string.inspect(i))),
+    view_index_section(i),
     Row(
       content: "",
       style: Style(dimensions: Percent(width: 100, height: 100)),
@@ -94,6 +93,11 @@ fn view_loop(i: ViewIdx, view_nodes: List(#(Section, Node))) -> View {
   )
 }
 
+/// Takes a ViewIndex and create a Section key from it
+fn view_index_section(view_idx: ViewIdx) -> Section {
+  Section(string.append("view_", int.to_string(view_idx)))
+}
+
 pub fn update_section(
   layout: Layout,
   section: Section,
@@ -125,7 +129,7 @@ pub fn update_dimensions(layout: Layout, columns: Int, rows: Int) -> Layout {
   Layout(..layout, columns:, rows:)
 }
 
-pub fn set_view(layout: Layout, view_idx: ViewIdx) -> Layout {
+pub fn update_current_view(layout: Layout, view_idx: ViewIdx) -> Layout {
   Layout(..layout, current_view: view_idx)
 }
 
@@ -147,8 +151,7 @@ pub fn render(layout: Layout) -> Nil {
       render_loop(
         view,
         context,
-        // TODO extract to function `view_index`
+        view_index_section(layout.current_view),
-        Section(string.append("view_", string.inspect(layout.current_view))),
         buffer,
       )
       |> plot.flush_buffer(layout.columns, layout.rows)

src/musicplayer/ui/ui.gleam

@@ -23,7 +23,31 @@ pub fn new() -> Result(Subject(Control), String) {
         #(
           layout.Header,
           layout.Row(
-            content: "Foo (1) | Bar (2) | Baz (3)",
+            content: "Foo <1> | Bar (2)",
+            style: layout.Style(dimensions: layout.Percent(
+              width: 100,
+              height: 50,
+            )),
+            children: [],
+          ),
+        ),
+        #(
+          layout.PlaybackTime,
+          layout.Row(
+            content: "00:00",
+            style: layout.Style(dimensions: layout.Percent(
+              width: 100,
+              height: 50,
+            )),
+            children: [],
+          ),
+        ),
+      ],
+      [
+        #(
+          layout.Header,
+          layout.Row(
+            content: "Foo (1) | Bar <2>",
             style: layout.Style(dimensions: layout.Percent(
               width: 100,
               height: 33,
@@ -121,7 +145,7 @@ fn handle_message(
       actor.stop()
     }
     control.SetView(view_idx) -> {
-      let layout = layout.set_view(state.layout, view_idx)
+      let layout = layout.update_current_view(state.layout, view_idx)
 
       actor.send(state.redraw, layout)
       actor.continue(State(..state, layout:))

test/musicplayer/control_test.gleam

@@ -1,7 +1,7 @@
 import gleam/list
 import gleeunit
 
-import musicplayer/control.{type Control}
+import musicplayer/control.{type Control, type Mode}
 import musicplayer/input/key.{type Key, Char}
 
 pub fn main() -> Nil {
@@ -9,16 +9,24 @@ pub fn main() -> Nil {
 }
 
 type TestCase {
-  TestCase(key: Key, expected: Result(Control, Nil))
+  TestCase(key: Key, mode: Mode, expected: Result(Control, Nil))
 }
 
 pub fn control_from_key_test() {
-  let test_cases = [
+  let idle_tests = [
-    TestCase(Char(" "), Ok(control.TogglePlayPause)),
+    TestCase(Char(" "), control.Idle, Ok(control.TogglePlayPause)),
-    TestCase(Char("q"), Ok(control.Exit)),
+    TestCase(Char("/"), control.Idle, Ok(control.Search("", True))),
+    TestCase(Char("q"), control.Idle, Ok(control.Exit)),
   ]
 
-  list.each(test_cases, fn(tc) {
+  let search_tests = [
-    assert tc.expected == control.from_key(tc.key)
+    TestCase(Char("a"), control.Searching(""), Ok(control.Search("a", True))),
+    TestCase(Char("b"), control.Searching("a"), Ok(control.Search("ab", True))),
+  ]
+
+  let test_cases = [idle_tests, search_tests]
+
+  list.each(list.flatten(test_cases), fn(tc) {
+    assert tc.expected == control.from_key(tc.key, tc.mode)
   })
 }