wip-forward-control

src/musicplayer/control.gleam

@@ -1,15 +1,19 @@
-import gleam/string
-
 import musicplayer/input/key.{type Key}
 
 pub type Mode {
   Idle
-  Searching(input: String)
+  Searching
 }
 
 pub type Control {
+  InputKey(Key)
+
   TogglePlayPause
-  Search(input: String, capturing: Bool)
+  Search
+
+  Raw(String)
+  Return
+  Backspace
 
   Exit
 }
@@ -17,35 +21,24 @@ pub type Control {
 pub fn from_key(key: Key, mode: Mode) -> Result(Control, Nil) {
   case mode {
     Idle -> idle_from_key(key)
-    Searching(input) -> searching_from_key(key, input)
+    Searching -> todo
   }
 }
 
 pub fn idle_from_key(key: Key) -> Result(Control, Nil) {
   case key {
-    key.Char(char) -> {
+    key.Return -> Ok(Return)
+    key.Backspace -> Ok(Backspace)
+    key.Char(char) -> Ok(idle_char_control(char))
+    _ -> Error(Nil)
+  }
+}
+
+fn idle_char_control(char: String) -> Control {
   case char {
-        " " -> Ok(TogglePlayPause)
+    " " -> TogglePlayPause
-        "/" -> Ok(Search(input: "", capturing: True))
+    "/" -> Search
-        "q" -> Ok(Exit)
+    "q" -> Exit
-
+    _ -> Raw(char)
-        // NOOP
-        _ -> Error(Nil)
-      }
-    }
-
-    // NOOP
-    _ -> Error(Nil)
-  }
-}
-
-pub fn searching_from_key(key: Key, input: String) -> Result(Control, Nil) {
-  case key {
-    key.Char(char) -> Ok(Search(input <> char, True))
-    key.Backspace -> Ok(Search(string.drop_end(input, 1), True))
-    key.Return -> Ok(Search(input, False))
-
-    // 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 Mode}
+import musicplayer/control.{type Control, type Mode}
 import musicplayer/input/key.{type Key}
 import musicplayer/logging/logging
 import musicplayer/mpv/control as mpv_control
@@ -10,9 +10,14 @@ 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),
   )
@@ -25,8 +30,10 @@ 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, ui, mpv))
+    actor.new(State(control.Idle, input, ui, mpv))
     |> actor.on_message(handle_message)
     |> actor.start
   {
@@ -36,7 +43,7 @@ pub fn new(
       logging.log("musicplayer - started")
       process.spawn(fn() {
         let assert Ok(_) = process.register(process.self(), input_keys_name)
-        forward_key(musicplayer, input_keys)
+        handle_key(musicplayer, input_keys)
       })
 
       process.spawn(fn() { update_playback_time_loop(mpv, ui, 250) })
@@ -46,34 +53,85 @@ pub fn new(
   }
 }
 
-fn handle_message(state: State, key: Key) -> actor.Next(State, Key) {
+fn handle_message(state: State, control: Control) -> actor.Next(State, Control) {
-  case control.from_key(key, state.mode) {
+  case control {
-    Error(_) -> actor.continue(state)
+    control.InputKey(key) -> {
-    Ok(c) ->
+      let _ = control.from_key(key, state.mode)
-      case c {
+      // TODO get control and send it back to self
-        control.Search(input, capturing) -> {
+      actor.continue(state)
-          case capturing {
-            True -> {
-              logging.log("musicplayer - searching: " <> input)
-
-              update_search(state.ui, "searching: " <> input)
-
-              actor.continue(State(..state, mode: control.Searching(input)))
     }
-            False -> {
+
+    control.Search -> {
+      logging.log("musicplayer - initiating search")
+
+      update_search(state.ui, "searching: ")
+
+      actor.continue(
+        State(
+          ..state,
+          mode: control.Searching,
+          input: Input(..state.input, capturing: True),
+        ),
+      )
+    }
+
+    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 return. `input`: "
+        "musicplayer - recieved backspace. mode:" <> string.inspect(state.mode),
+      )
+
+      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`: "
         <> "'"
-                <> input
+        <> state.input.content
         <> "'",
       )
 
-              update_search(state.ui, "")
+      // Note: state.input.content is now the final input, use it
+      // before it is reset
+      case state.mode {
+        control.Idle -> Nil
+        control.Searching -> update_search(state.ui, "")
+      }
 
-              actor.continue(State(..state, mode: control.Idle))
+      actor.continue(
-            }
+        State(
-          }
+          ..state,
+          mode: control.Idle,
+          input: Input(capturing: False, content: ""),
+        ),
+      )
     }
+
     control.TogglePlayPause -> {
       logging.log("musicplayer - toggling play/pause")
 
@@ -84,21 +142,16 @@ fn handle_message(state: State, key: Key) -> actor.Next(State, Key) {
     control.Exit -> {
       logging.log("musicplayer - initiating musicplayer shutdown")
       // Close `mpv` socket
-          process.call(state.mpv, 1000, fn(reply_to) {
+      process.call(state.mpv, 1000, fn(reply_to) { mpv_control.Exit(reply_to) })
-            mpv_control.Exit(reply_to)
-          })
 
       // Reset terminal state (show cursor etc.)
-          process.call(state.ui, 1000, fn(reply_to) {
+      process.call(state.ui, 1000, fn(reply_to) { ui_control.Exit(reply_to) })
-            ui_control.Exit(reply_to)
-          })
 
       logging.log("musicplayer - stopped")
 
       actor.stop()
     }
   }
-  }
 }
 
 fn update_playback_time_loop(
@@ -146,14 +199,14 @@ fn update_search(ui: Subject(ui_control.Control), content: String) -> Nil {
   process.send(ui, ui_control.UpdateState(layout.Search, content))
 }
 
-/// `forward_key` listens to a subject onto which `input` will send messages with `Key`s
+/// `handle_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 handle_key(musicplayer: Subject(Control), input_keys: Subject(Key)) -> Nil {
-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, _)
 
-  forward_key(musicplayer, input_keys)
+  handle_key(musicplayer, input_keys)
 }

src/musicplayer/ui/control.gleam

@@ -7,5 +7,6 @@ pub type Control {
   UpdateState(section: Section, content: String)
   SetView(view_idx: layout.ViewIdx)
 
+  // NodeEvent
   Exit(reply_to: Subject(Nil))
 }

src/musicplayer/ui/layout.gleam

@@ -1,9 +1,11 @@
 import gleam/dict
+import gleam/int
 import gleam/list
 import gleam/pair
 import gleam/set
 import gleam/string
 
+import musicplayer/logging/logging
 import musicplayer/ui/internal
 import musicplayer/ui/plot.{type Buffer}
 

test/musicplayer/control_test.gleam

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