Add Search section

And remove any `input_introducer` markers to allow sections
like `Search` show the "clean" input stream

src/musicplayer.gleam

@@ -8,7 +8,6 @@ import musicplayer/ui/ui
 
 pub fn main() -> Nil {
   let input_keys_name: Name(Key) = process.new_name("input_keys")
-  let input_stream_name: Name(List(String)) = process.new_name("input_stream")
 
   // `input_inject` is created by name to allow the `input` process that
   // owns `read_input` to be able to register and receive from it,
@@ -17,20 +16,13 @@ pub fn main() -> Nil {
   let input_inject_name: Name(Key) = process.new_name("input_inject_keys")
 
   // TODO should input.new just return the inject_subject?
-  input.new(input_keys_name, input_stream_name, input_inject_name)
+  input.new(input_keys_name, input_inject_name)
 
   let assert Ok(ui) = ui.new()
   let assert Ok(mpv) = mpv.new()
 
   let exit = process.new_subject()
   let assert Ok(_) =
-    musicplayer.new(
+    musicplayer.new(ui, mpv, input_keys_name, input_inject_name, exit)
-      ui,
-      mpv,
-      input_keys_name,
-      input_stream_name,
-      input_inject_name,
-      exit,
-    )
   process.receive_forever(exit)
 }

src/musicplayer/control.gleam

@@ -2,13 +2,16 @@ import musicplayer/input/key.{type Key}
 
 pub type Control {
   TogglePlayPause
-  Search
+
+  Input(String)
+  Search(List(String))
 
   Exit
 }
 
 pub fn from_key(key: Key) -> Result(Control, Nil) {
   case key {
+    key.Input(content) -> Ok(Input(content))
     key.Char(char) -> char_control(char)
     _ -> Error(Nil)
   }
@@ -17,7 +20,7 @@ pub fn from_key(key: Key) -> Result(Control, Nil) {
 fn char_control(char: String) -> Result(Control, Nil) {
   case char {
     " " -> Ok(TogglePlayPause)
-    "/" -> Ok(Search)
+    "/" -> Ok(Search([]))
     "q" -> Ok(Exit)
     _ -> Error(Nil)
   }

src/musicplayer/input/input.gleam

@@ -1,4 +1,4 @@
-import gleam/erlang/process.{type Name, type Subject}
+import gleam/erlang/process.{type Name}
 
 import musicplayer/input/key.{type Key}
 
@@ -10,38 +10,17 @@ import musicplayer/input/key.{type Key}
 /// and
 ///   - a subject name that is used to create a `Subject` that other processes
 ///     know they can inject a `Key` into the input with
-pub fn new(
+pub fn new(input_keys_name: Name(Key), input_inject_name: Name(Key)) -> Nil {
-  input_keys_name: Name(Key),
-  input_stream_name: Name(List(String)),
-  input_inject_name: Name(Key),
-) -> Nil {
   let _ =
     process.spawn(fn() {
       let input_keys = process.named_subject(input_keys_name)
-      let input_stream = process.named_subject(input_stream_name)
       let input_inject = process.named_subject(input_inject_name)
 
       let assert Ok(_) = process.register(process.self(), input_inject_name)
 
-      read_input(input_keys, input_stream, input_inject)
+      key.read_input_until_key(input_keys, input_inject)
     })
 
   key.start_raw_shell()
   Nil
 }
-
-fn read_input(
-  input_keys: Subject(Key),
-  input_stream: Subject(List(String)),
-  input_inject: Subject(Key),
-) -> Nil {
-  let buffer = case process.receive(input_inject, 1) {
-    Ok(key.Continue(buffer)) -> buffer
-    Ok(_) | Error(_) -> []
-  }
-
-  key.read_input_until_key(buffer, input_stream)
-  |> process.send(input_keys, _)
-
-  read_input(input_keys, input_stream, input_inject)
-}

src/musicplayer/input/key.gleam

@@ -61,9 +61,19 @@ pub fn start_raw_shell() {
 }
 
 pub fn read_input_until_key(
-  l: List(String),
+  input_keys: Subject(Key),
-  input_stream: Subject(List(String)),
+  input_inject: Subject(Key),
-) -> Key {
+) -> Nil {
+  case process.receive(input_inject, 1) {
+    Ok(Continue(buffer)) -> buffer
+    Ok(_) | Error(_) -> []
+  }
+  |> forward_input_to(input_keys)
+
+  read_input_until_key(input_keys, input_inject)
+}
+
+pub fn forward_input_to(l: List(String), input_keys: Subject(Key)) -> Nil {
   case
     internal_input.read_input()
     |> list.wrap
@@ -71,9 +81,14 @@ pub fn read_input_until_key(
     |> from_list
   {
     Continue(l) -> {
-      process.send(input_stream, l)
+      case l {
-      read_input_until_key(l, input_stream)
+        [ii, cmd] if ii == input_introducer -> {
+          process.send(input_keys, Continue([cmd]))
+          forward_input_to(l, input_keys)
         }
-    k -> k
+        _ -> forward_input_to(l, input_keys)
+      }
+    }
+    k -> process.send(input_keys, k)
   }
 }

src/musicplayer/musicplayer.gleam

@@ -1,14 +1,14 @@
 import gleam/erlang/process.{type Name, type Subject}
-import gleam/float
 import gleam/otp/actor
 import gleam/result
 import gleam/string
+import musicplayer/time/time
 
 import musicplayer/control.{type Control}
 import musicplayer/input/key.{type Key}
 import musicplayer/mpv/control as mpv_control
 import musicplayer/ui/control as ui_control
-import musicplayer/ui/section
+import musicplayer/ui/layout
 
 type State(ui, mpv, input_inject, exit) {
   State(
@@ -23,12 +23,10 @@ pub fn new(
   ui: Subject(ui_control.Control),
   mpv: Subject(mpv_control.Control),
   input_keys_name: Name(Key),
-  input_stream_name: Name(List(String)),
   input_inject_name: Name(Key),
   exit: Subject(Nil),
 ) -> Result(Nil, String) {
   let input_keys = process.named_subject(input_keys_name)
-  let input_stream = process.named_subject(input_stream_name)
   let input_inject = process.named_subject(input_inject_name)
 
   case
@@ -44,10 +42,7 @@ pub fn new(
         handle_key(musicplayer, input_keys)
       })
 
-      process.spawn(fn() {
+      process.spawn(fn() { update_playback_time_loop(mpv, ui, 1000) })
-        let assert Ok(_) = process.register(process.self(), input_stream_name)
-        temp_input_stream(input_stream)
-      })
 
       Ok(Nil)
     }
@@ -59,40 +54,25 @@ fn handle_message(
   control: Control,
 ) -> actor.Next(State(ui, mpv, input_inject, exit), Control) {
   case control {
-    control.Search -> {
+    control.Search([]) -> {
       process.send(state.input_inject, key.Continue([key.input_introducer]))
-
+      update_search(state.ui, "searching: ")
       actor.continue(state)
     }
+    control.Search(content) -> {
+      update_search(state.ui, "searching: " <> string.join(content, ""))
+      actor.continue(state)
+    }
+    control.Input(_) -> {
+      update_search(state.ui, "")
+      actor.continue(state)
+    }
+
     control.TogglePlayPause -> {
       echo "toggling play/pause"
 
       process.send(state.mpv, mpv_control.TogglePlayPause)
-
+      update_playback_time(state.mpv, state.ui)
-      case
-        process.call(state.mpv, 1000, fn(reply_to) {
-          mpv_control.GetPlaybackTime(reply_to)
-        })
-      {
-        Error(err) ->
-          process.send(
-            state.ui,
-            ui_control.UpdateState(
-              section.PlaybackTime,
-              "playback time: N/A (err: " <> err.details <> ")",
-            ),
-          )
-
-        Ok(mpv_control.PlaybackTime(data: playback_time)) ->
-          process.send(
-            state.ui,
-            ui_control.UpdateState(
-              section.PlaybackTime,
-              "playback time: " <> float.to_string(playback_time),
-            ),
-          )
-      }
-
       actor.continue(state)
     }
     control.Exit -> {
@@ -109,19 +89,66 @@ fn handle_message(
   }
 }
 
+fn update_playback_time_loop(
+  mpv: Subject(mpv_control.Control),
+  ui: Subject(ui_control.Control),
+  interval_ms: Int,
+) {
+  process.sleep(interval_ms)
+  update_playback_time(mpv, ui)
+
+  update_playback_time_loop(mpv, ui, interval_ms)
+}
+
+fn update_playback_time(
+  mpv: Subject(mpv_control.Control),
+  ui: Subject(ui_control.Control),
+) -> Nil {
+  case
+    process.call(mpv, 1000, fn(reply_to) {
+      mpv_control.GetPlaybackTime(reply_to)
+    })
+  {
+    Error(err) ->
+      process.send(
+        ui,
+        ui_control.UpdateState(
+          layout.PlaybackTime,
+          "playback time: N/A (err: " <> err.details <> ")",
+        ),
+      )
+
+    Ok(mpv_control.PlaybackTime(data: playback_time)) ->
+      process.send(
+        ui,
+        ui_control.UpdateState(
+          layout.PlaybackTime,
+          "playback time: " <> time.to_duration_string(playback_time),
+        ),
+      )
+  }
+}
+
+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
 /// parsed `Key`s which will be mapped to `Control`s (if possible)
 fn handle_key(musicplayer: Subject(Control), input_keys: Subject(Key)) -> Nil {
-  let _ =
+  let _ = case
-    process.receive_forever(input_keys)
+    process.new_selector()
+    |> process.select(input_keys)
+    |> process.selector_receive_forever
+  {
+    key.Continue(buffer:) ->
+      Ok(process.send(musicplayer, control.Search(buffer)))
+
+    key ->
+      key
       |> control.from_key
       |> result.map(process.send(musicplayer, _))
+  }
 
   handle_key(musicplayer, input_keys)
 }
-
-fn temp_input_stream(input_stream: Subject(List(String))) -> Nil {
-  let stream = process.receive_forever(input_stream)
-  echo "input stream: " <> string.inspect(stream)
-  temp_input_stream(input_stream)
-}

src/musicplayer/time/time.gleam

@@ -0,0 +1,23 @@
+import gleam/float
+import gleam/int
+import gleam/string
+
+pub fn to_duration_string(seconds: Float) -> String {
+  let total =
+    seconds
+    |> float.max(0.0)
+    |> float.truncate
+
+  let minutes = total / 60
+  let seconds = total % 60
+
+  let mins =
+    int.to_string(minutes)
+    |> string.pad_start(to: 2, with: "0")
+
+  let secs =
+    int.to_string(seconds)
+    |> string.pad_start(to: 2, with: "0")
+
+  mins <> ":" <> secs
+}

src/musicplayer/ui/control.gleam

@@ -1,6 +1,6 @@
 import gleam/erlang/process.{type Subject}
 
-import musicplayer/ui/section.{type Section}
+import musicplayer/ui/layout.{type Section}
 
 pub type Control {
   UpdateState(section: Section, content: String)

src/musicplayer/ui/internal.gleam

@@ -1,3 +1,4 @@
+import gleam/int
 import gleam/io
 
 pub fn print(content: String) -> Nil {
@@ -10,6 +11,11 @@ pub fn clear_screen() -> Nil {
   io.print("\u{001B}[2J\u{001B}[H")
 }
 
+pub fn print_at(text: String, x: Int, y: Int) -> Nil {
+  let seq = "\u{001B}[" <> int.to_string(y) <> ";" <> int.to_string(x) <> "H"
+  io.print(seq <> text)
+}
+
 pub fn hide_cursor() -> Nil {
   io.print("\u{001B}[?25l")
 }

src/musicplayer/ui/layout.gleam

@@ -0,0 +1,51 @@
+import gleam/dict
+
+pub type Layout {
+  Layout(nodes: dict.Dict(Section, Node))
+}
+
+pub type Section {
+  Root
+  Header
+  Search
+  PlaybackTime
+}
+
+pub type Node {
+  Node(content: String, x: Int, y: Int, children: List(Section))
+}
+
+pub fn new() -> Layout {
+  let nodes =
+    dict.from_list([
+      #(
+        Root,
+        Node(content: "", x: 0, y: 0, children: [
+          Header,
+          Search,
+          PlaybackTime,
+        ]),
+      ),
+      #(Header, Node(content: "Music Player", x: 1, y: 1, children: [])),
+      #(Search, Node(content: "", x: 30, y: 1, children: [])),
+      #(PlaybackTime, Node(content: "00:00", x: 1, y: 2, children: [])),
+    ])
+
+  Layout(nodes: nodes)
+}
+
+pub fn update_section(
+  layout: Layout,
+  section: Section,
+  content: String,
+) -> Layout {
+  case dict.get(layout.nodes, section) {
+    Error(_) -> layout
+    Ok(node) ->
+      Layout(nodes: dict.insert(
+        layout.nodes,
+        section,
+        Node(..node, content: content),
+      ))
+  }
+}

src/musicplayer/ui/section.gleam

@@ -1,13 +0,0 @@
-import gleam/dict
-
-pub type Section {
-  Header
-  PlaybackTime
-}
-
-pub type Content {
-  Content(content: String)
-}
-
-pub type SectionContent =
-  dict.Dict(Section, Content)

src/musicplayer/ui/ui.gleam

@@ -1,28 +1,25 @@
 import gleam/dict
 import gleam/erlang/process.{type Subject}
+import gleam/list
 import gleam/otp/actor
 import gleam/string
 
 import musicplayer/ui/control.{type Control}
 import musicplayer/ui/internal as ui_internal
-import musicplayer/ui/section.{type Section, type SectionContent, Content}
+import musicplayer/ui/layout.{type Layout, type Section}
 
 pub type State(redraw, content) {
-  State(redraw: Subject(SectionContent), sections: SectionContent)
+  State(redraw: Subject(Layout), layout: Layout)
 }
 
 pub fn new() -> Result(Subject(Control), String) {
   let redraw_name = process.new_name("redraw")
-  let redraw: Subject(String) = process.named_subject(redraw_name)
+  let redraw: Subject(Layout) = process.named_subject(redraw_name)
 
-  let sections =
+  let layout = layout.new()
-    dict.from_list([
-      #(section.Header, Content("musicplayer:")),
-      #(section.PlaybackTime, Content("")),
-    ])
 
   case
-    actor.new(State(redraw, sections))
+    actor.new(State(redraw, layout))
     |> actor.on_message(handle_message)
     |> actor.start
   {
@@ -35,7 +32,7 @@ pub fn new() -> Result(Subject(Control), String) {
         ui_internal.clear_screen()
         ui_internal.hide_cursor()
 
-        redraw_loop(redraw)
+        redraw_on_update_loop(redraw)
       })
 
       Ok(ui)
@@ -44,15 +41,15 @@ pub fn new() -> Result(Subject(Control), String) {
 }
 
 fn handle_message(
-  state: State(redraw, content),
+  state: State(redraw, layout),
   control: Control,
-) -> actor.Next(State(redraw, content), Control) {
+) -> actor.Next(State(redraw, layout), Control) {
   case control {
     control.UpdateState(section, content) -> {
-      let content = dict.insert(state.content, section, content)
+      let layout = layout.update_section(state.layout, section, content)
-      let state = State(..state, content:)
+      let state = State(..state, layout:)
 
-      actor.send(state.redraw, content)
+      actor.send(state.redraw, layout)
       actor.continue(state)
     }
 
@@ -64,11 +61,21 @@ fn handle_message(
   }
 }
 
-fn redraw_loop(redraw: Subject(SectionContent)) -> Nil {
+fn redraw_on_update_loop(redraw: Subject(Layout)) -> Nil {
-  let content = process.receive_forever(redraw)
+  let layout = process.receive_forever(redraw)
 
   ui_internal.clear_screen()
-  ui_internal.print(content)
+  render_layout(layout, layout.Root)
 
-  redraw_loop(redraw)
+  redraw_on_update_loop(redraw)
+}
+
+fn render_layout(layout: Layout, from: Section) -> Nil {
+  case dict.get(layout.nodes, from) {
+    Error(_) -> Nil
+    Ok(node) -> {
+      list.each(node.children, fn(child) { render_layout(layout, child) })
+      ui_internal.print_at(node.content, node.x, node.y)
+    }
+  }
 }

test/musicplayer/time/time_test.gleam

@@ -0,0 +1,32 @@
+import gleam/list
+import gleeunit
+
+import musicplayer/time/time
+
+pub fn main() -> Nil {
+  gleeunit.main()
+}
+
+type TestCase {
+  TestCase(seconds: Float, expected: String)
+}
+
+pub fn to_duration_string_test() {
+  let test_cases = [
+    TestCase(-1.0, "00:00"),
+    TestCase(0.0, "00:00"),
+    TestCase(9.0, "00:09"),
+    TestCase(10.0, "00:10"),
+    TestCase(11.0, "00:11"),
+    TestCase(60.0, "01:00"),
+    TestCase(61.0, "01:01"),
+    TestCase(120.0, "02:00"),
+    TestCase(600.0, "10:00"),
+    TestCase(6000.0, "100:00"),
+    TestCase(6001.0, "100:01"),
+  ]
+
+  list.each(test_cases, fn(tc) {
+    assert tc.expected == time.to_duration_string(tc.seconds)
+  })
+}