Move all code into musicplayer module

And add the ability of other modules to listen to either
the final result (a `Key`) or tap into the input as it is read

src/mpv/mpv.gleam

@@ -1,118 +0,0 @@
-import gleam/erlang/process.{type Subject}
-import gleam/float
-import gleam/otp/actor
-import gleam/result
-import gleam/string
-
-import input/key.{type Key}
-import mpv/control.{type Control}
-import tcp/reason
-import tcp/tcp.{type Socket}
-import ui/ui.{type Event}
-
-type State(socket, inject_input, ui, exit) {
-  State(
-    socket: Socket,
-    inject_input: Subject(Key),
-    ui: Subject(Event),
-    exit: Subject(Nil),
-  )
-}
-
-pub fn new(
-  ui: Subject(Event),
-  input_sink: Subject(List(String)),
-  exit: Subject(Nil),
-) -> Result(Nil, String) {
-  // TODO start up mvp here, currently hi-jacking `naviterm`s socket
-  let socket_path = "/tmp/naviterm_mpv"
-
-  case tcp.connect(socket_path) {
-    Error(r) -> Error("Could not connect to mpv: " <> reason.to_string(r))
-    Ok(socket) -> {
-      // `inject_input` is created by name to allow the process that
-      // owns `read_input` to be able to register it, while the agent
-      // also have a reference to it to be able to inject input
-      let inject_input_name = process.new_name("inject_input")
-      let inject_input = process.named_subject(inject_input_name)
-
-      case
-        actor.new(State(socket, inject_input, ui, exit))
-        |> actor.on_message(handle_message)
-        |> actor.start
-      {
-        Error(start_error) ->
-          Error("Could not start actor: " <> string.inspect(start_error))
-        Ok(actor.Started(data:, ..)) -> {
-          echo "waiting for input"
-          key.start_raw_shell()
-
-          process.spawn(fn() {
-            let assert Ok(_) =
-              process.register(process.self(), inject_input_name)
-
-            read_input(data, inject_input, input_sink)
-          })
-
-          Ok(Nil)
-        }
-      }
-    }
-  }
-}
-
-fn handle_message(
-  state: State(socket, inject, ui, exit),
-  control: Control,
-) -> actor.Next(State(socket, inject, ui, exit), Control) {
-  case control {
-    control.Search -> {
-      echo "mpv search"
-      process.send(state.inject_input, key.Continue([key.input_introducer]))
-      process.send(state.ui, ui.Search)
-      actor.continue(state)
-    }
-    control.TogglePlayPause -> {
-      echo "toggling play/pause"
-
-      let _ =
-        result.map_error(control.toggle_play_pause(state.socket), fn(err) {
-          echo "Could not toggle play/pause: " <> err.details
-        })
-
-      let _ =
-        result.map(control.get_playback_time(state.socket), fn(playback) {
-          echo "playback: " <> float.to_string(playback.data)
-        })
-
-      actor.continue(state)
-    }
-    control.Exit -> {
-      process.send(state.exit, Nil)
-      actor.stop()
-    }
-  }
-}
-
-/// `read_input` operates by reading from input until a `Key` can be created.
-/// It is possible to create a `Key` without the users input by sending
-/// messages to `inject_input` which will initialize the "input to key" sequence.
-/// This is useful to ultimately create a `Control` without the user having to
-/// input all of the character(s) needed.
-fn read_input(
-  subject: Subject(Control),
-  inject_input: Subject(Key),
-  input_sink: Subject(List(String)),
-) -> Nil {
-  let buffer = case process.receive(inject_input, 1) {
-    Ok(key.Continue(buffer)) -> buffer
-    Ok(_) | Error(_) -> []
-  }
-
-  let _ =
-    key.read_input_until_key(buffer, input_sink)
-    |> control.from_key
-    |> result.map(process.send(subject, _))
-
-  read_input(subject, inject_input, input_sink)
-}

src/musicplayer.gleam

@@ -1,30 +1,22 @@
-import gleam/erlang/process
+import gleam/erlang/process.{type Name}
 
-import mpv/mpv
-import ui/ui
+import musicplayer/input/input.{type Listener}
+import musicplayer/input/key.{type Key}
+import musicplayer/mpv/mpv
 
 pub fn main() -> Nil {
-  // 1. user starts search
-  // ui should show "input: "
-  // user presses enter
-  // ui should show "input was: x"
-
-  // 1. listen for control.Search
-  // 2. start listening to tap_input and print io.print "input: "
-  // 3. simultaniously listen for control.Input
-  // 4. print "input was: x"
-
-  // ui need: tap_input
-  // input need: ui subject to send control events from
-
-  // new input process should return `Key`
-  // this key should be sent both to ui and mpv, and they will decide if they can act on it.
-  // its probably ok if both act on it, e.g. "TogglePlayPause" could stop mpv music and display |> or || in ui
-
   let exit = process.new_subject()
 
-  let assert Ok(#(ui, input_sink)) = ui.new()
-  let assert Ok(_) = mpv.new(ui, input_sink, exit)
+  // `inject_input` is created by name to allow the `input` process that
+  // owns `read_input` to be able to register and receive from it,
+  //  while the any other processes can use the name reference to
+  // inject input
+  let inject_input_name: Name(Key) = process.new_name("inject_input")
 
+  let assert Ok(mpv_listener) = mpv.new(exit)
+
+  let listeners: List(Listener) = [mpv_listener]
+
+  input.new(listeners, inject_input_name)
   process.receive_forever(exit)
 }

src/musicplayer/input/input.gleam

@@ -0,0 +1,59 @@
+import gleam/erlang/process.{type Name, type Subject}
+import gleam/list
+import gleam/option.{type Option, None, Some}
+
+import musicplayer/input/key.{type Key}
+
+pub type Listener {
+  InputListener(final: Subject(Key), tap: Option(Subject(List(String))))
+}
+
+/// `new` accepts a list of listeners that are composed of two subjects;
+///   - one to get the final `Key` and
+///   - one to tap the input as it is read from i/o
+/// 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(listeners: List(Listener), inject_input_name: Name(Key)) -> Nil {
+  let _ =
+    process.spawn(fn() {
+      let inject_input: Subject(Key) = process.named_subject(inject_input_name)
+      let assert Ok(_) = process.register(process.self(), inject_input_name)
+
+      // Extract all finals and taps (that are defined)
+      let #(finals, taps) =
+        list.fold(listeners, #([], []), fn(acc, listener) {
+          let #(finals, taps) = acc
+
+          let finals = [listener.final, ..finals]
+
+          let taps = case listener.tap {
+            Some(t) -> [t, ..taps]
+            None -> taps
+          }
+
+          #(finals, taps)
+        })
+
+      read_input(finals, taps, inject_input)
+    })
+
+  Nil
+}
+
+fn read_input(
+  finals: List(Subject(Key)),
+  taps: List(Subject(List(String))),
+  inject_input: Subject(Key),
+) -> Nil {
+  let buffer = case process.receive(inject_input, 1) {
+    Ok(key.Continue(buffer)) -> buffer
+    Ok(_) | Error(_) -> []
+  }
+
+  let _ =
+    key.read_input_until_key(buffer, taps)
+    |> fn(k) { list.each(finals, process.send(_, k)) }
+
+  read_input(finals, taps, inject_input)
+}

src/musicplayer/input/key.gleam

@@ -3,7 +3,7 @@ import gleam/erlang/process.{type Subject}
 import gleam/list
 import gleam/string
 
-import input/internal as internal_input
+import musicplayer/input/internal as internal_input
 
 pub type Key {
   Char(String)
@@ -62,7 +62,7 @@ pub fn start_raw_shell() {
 
 pub fn read_input_until_key(
   l: List(String),
-  input_sink: Subject(List(String)),
+  taps: List(Subject(List(String))),
 ) -> Key {
   case
     internal_input.read_input()
@@ -71,13 +71,9 @@ pub fn read_input_until_key(
     |> from_list
   {
     Continue(l) -> {
-      echo "key:read_input_until_key continue: " <> string.inspect(l)
-      process.send(input_sink, l)
-      read_input_until_key(l, input_sink)
-    }
-    k -> {
-      echo "key:read_input_until_key k: " <> string.inspect(k)
-      k
+      list.each(taps, process.send(_, l))
+      read_input_until_key(l, taps)
     }
+    k -> k
   }
 }

src/musicplayer/mpv/control.gleam

@@ -2,16 +2,14 @@ import gleam/json
 import gleam/result
 import gleam/string
 
-import input/key.{type Key}
-import mpv/internal/control as internal_control
-import tcp/reason.{type Reason}
-import tcp/tcp.{type Socket}
+import musicplayer/input/key.{type Key}
+import musicplayer/mpv/internal as internal_control
+import musicplayer/tcp/reason.{type Reason}
+import musicplayer/tcp/tcp.{type Socket}
 
 pub type Control {
   TogglePlayPause
 
-  Search
-
   Exit
 }
 
@@ -29,7 +27,6 @@ pub fn from_key(key: Key) -> Result(Control, Nil) {
 fn char_control(char: String) -> Result(Control, Nil) {
   case char {
     " " -> Ok(TogglePlayPause)
-    "/" -> Ok(Search)
     "q" -> Ok(Exit)
     _ -> Error(Nil)
   }

src/musicplayer/mpv/mpv.gleam

@@ -0,0 +1,89 @@
+import gleam/erlang/process.{type Subject}
+import gleam/float
+import gleam/option.{None}
+import gleam/otp/actor
+import gleam/result
+import gleam/string
+
+import musicplayer/input/input.{type Listener, InputListener}
+import musicplayer/input/key.{type Key}
+import musicplayer/mpv/control.{type Control}
+import musicplayer/tcp/reason
+import musicplayer/tcp/tcp.{type Socket}
+
+type State(socket, exit) {
+  State(socket: Socket, exit: Subject(Nil))
+}
+
+pub fn new(exit: Subject(Nil)) -> Result(Listener, String) {
+  // TODO start up mvp here, currently hi-jacking `naviterm`s socket
+  let socket_path = "/tmp/naviterm_mpv"
+
+  case tcp.connect(socket_path) {
+    Error(r) -> Error("Could not connect to mpv: " <> reason.to_string(r))
+    Ok(socket) -> {
+      let final_input_name = process.new_name("mpv_final_input")
+      let final_input: Subject(Key) = process.named_subject(final_input_name)
+
+      case
+        actor.new(State(socket, exit))
+        |> actor.on_message(handle_message)
+        |> actor.start
+      {
+        Error(start_error) ->
+          Error("Could not start actor: " <> string.inspect(start_error))
+        Ok(actor.Started(data:, ..)) -> {
+          echo "waiting for input"
+          key.start_raw_shell()
+
+          process.spawn(fn() {
+            let assert Ok(_) =
+              process.register(process.self(), final_input_name)
+
+            handle_key(final_input, data)
+          })
+
+          Ok(InputListener(final: final_input, tap: None))
+        }
+      }
+    }
+  }
+}
+
+fn handle_message(
+  state: State(socket, exit),
+  control: Control,
+) -> actor.Next(State(socket, exit), Control) {
+  case control {
+    control.TogglePlayPause -> {
+      echo "toggling play/pause"
+
+      let _ =
+        result.map_error(control.toggle_play_pause(state.socket), fn(err) {
+          echo "Could not toggle play/pause: " <> err.details
+        })
+
+      let _ =
+        result.map(control.get_playback_time(state.socket), fn(playback) {
+          echo "playback: " <> float.to_string(playback.data)
+        })
+
+      actor.continue(state)
+    }
+    control.Exit -> {
+      process.send(state.exit, Nil)
+      actor.stop()
+    }
+  }
+}
+
+/// `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(final_input: Subject(Key), subject: Subject(Control)) -> Nil {
+  let _ =
+    process.receive_forever(final_input)
+    |> control.from_key
+    |> result.map(process.send(subject, _))
+
+  handle_key(final_input, subject)
+}

src/musicplayer/tcp/tcp.gleam

@@ -2,7 +2,7 @@ import gleam/bit_array
 import gleam/erlang/atom
 import gleam/result
 
-import tcp/reason.{type Reason}
+import musicplayer/tcp/reason.{type Reason}
 
 pub type Socket
 

src/ui/ui.gleam

@@ -1,62 +0,0 @@
-import gleam/erlang/process.{type Name, type Subject}
-import gleam/otp/actor
-import gleam/string
-
-pub type Event {
-  Search
-  Input(List(String))
-}
-
-// TODO in input, split input into events and control?
-
-pub fn new() -> Result(#(Subject(Event), Subject(List(String))), String) {
-  let input_sink_name: Name(List(String)) = process.new_name("input_sink")
-  let input_sink = process.named_subject(input_sink_name)
-
-  // let input_sink = process.new_subject()
-
-  case
-    actor.new(Nil)
-    |> actor.on_message(handle_message)
-    |> actor.start
-  {
-    Error(start_error) ->
-      Error("Could not start ui actor: " <> string.inspect(start_error))
-    Ok(actor.Started(data: ui, ..)) -> {
-      echo "ui started"
-
-      // let assert Ok(_) = process.register(process.self(), input_sink_name)
-      process.spawn(fn() {
-        let assert Ok(_) = process.register(process.self(), input_sink_name)
-        drain_input_sink(ui, input_sink)
-      })
-
-      Ok(#(ui, input_sink))
-    }
-  }
-}
-
-fn handle_message(state: Nil, event: Event) -> actor.Next(Nil, Event) {
-  case event {
-    Search -> {
-      echo "ui:search"
-      actor.continue(state)
-    }
-    Input(content) -> {
-      echo "ui:input: " <> string.inspect(content)
-      actor.continue(state)
-    }
-  }
-}
-
-fn drain_input_sink(
-  subject: Subject(Event),
-  input_sink: Subject(List(String)),
-) -> Nil {
-  echo "ui:drain_input_sink"
-  let content = process.receive_forever(input_sink)
-
-  process.send(subject, Input(content))
-
-  drain_input_sink(subject, input_sink)
-}

test/echo_server.gleam

@@ -4,8 +4,8 @@ import gleam/otp/actor
 import gleam/result
 import gleam/string
 
-import tcp/reason.{type Reason}
-import tcp/tcp
+import musicplayer/tcp/reason.{type Reason}
+import musicplayer/tcp/tcp
 
 pub type Message {
   Shutdown

test/musicplayer/input/input_test.gleam

@@ -1,7 +1,7 @@
 import gleam/list
 import gleeunit
 
-import input/key.{type Key, Char, csi, esc, input_introducer as ii}
+import musicplayer/input/key.{type Key, Char, csi, esc, input_introducer as ii}
 
 pub fn main() -> Nil {
   gleeunit.main()

test/musicplayer/mpv/control_test.gleam

@@ -1,9 +1,9 @@
 import gleam/list
 import gleeunit
 
-import input/key.{type Key, Char}
-import mpv/control.{type Control}
-import mpv/internal/control as control_internal
+import musicplayer/input/key.{type Key, Char}
+import musicplayer/mpv/control.{type Control}
+import musicplayer/mpv/internal as control_internal
 
 pub fn main() -> Nil {
   gleeunit.main()

test/musicplayer/tcp/tcp_test.gleam

@@ -3,7 +3,7 @@ import gleeunit
 import simplifile
 
 import echo_server
-import tcp/tcp
+import musicplayer/tcp/tcp
 
 pub fn main() -> Nil {
   gleeunit.main()