Add musicplayer module that wraps all logic

src/input/input.gleam

@@ -1,50 +0,0 @@
-import gleam/erlang/process.{type Name, type Subject}
-
-import input/key.{type Key}
-
-/// `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(
-  ui_input_keys_name: Name(Key),
-  ui_input_stream_name: Name(List(String)),
-  input_ui_inject_name: Name(Key),
-) -> Nil {
-  let _ =
-    process.spawn(fn() {
-      let ui_input_keys: Subject(Key) =
-        process.named_subject(ui_input_keys_name)
-      let ui_input_stream: Subject(List(String)) =
-        process.named_subject(ui_input_stream_name)
-
-      let input_ui_inject_input: Subject(Key) =
-        process.named_subject(input_ui_inject_name)
-      let assert Ok(_) = process.register(process.self(), input_ui_inject_name)
-
-      read_input(ui_input_keys, ui_input_stream, input_ui_inject_input)
-    })
-
-  echo "waiting for input"
-  key.start_raw_shell()
-
-  Nil
-}
-
-fn read_input(
-  ui_input_keys: Subject(Key),
-  ui_input_stream: Subject(List(String)),
-  input_ui_inject: Subject(Key),
-) -> Nil {
-  let buffer = case process.receive(input_ui_inject, 1) {
-    Ok(key.Continue(buffer)) -> buffer
-    Ok(_) | Error(_) -> []
-  }
-
-  key.read_input_until_key(buffer, ui_input_stream)
-  |> process.send(ui_input_keys, _)
-
-  read_input(ui_input_keys, ui_input_stream, input_ui_inject)
-}

src/mpv/mpv.gleam

@@ -1,91 +0,0 @@
-import gleam/erlang/process.{type Name, type Subject}
-import gleam/float
-import gleam/otp/actor
-import gleam/result
-import gleam/string
-
-import mpv/control as mpv_control
-import tcp/reason
-import tcp/tcp.{type Socket}
-import ui/control as ui_control
-
-type State(socket, mpv_ui, ui_mpv) {
-  State(
-    socket: Socket,
-    mpv_ui: Subject(ui_control.Control),
-    ui_mpv: Subject(mpv_control.Control),
-  )
-}
-
-pub fn new(
-  mpv_ui_name: Name(ui_control.Control),
-  ui_mpv_name: Name(mpv_control.Control),
-) -> Result(Nil, String) {
-  // TODO start up mvp here, currently hi-jacking `naviterm`s socket
-  let socket_path = "/tmp/naviterm_mpv"
-
-  let mpv_ui: Subject(ui_control.Control) = process.named_subject(mpv_ui_name)
-  let ui_mpv: Subject(mpv_control.Control) = process.named_subject(ui_mpv_name)
-
-  case tcp.connect(socket_path) {
-    Error(r) -> Error("Could not connect to mpv: " <> reason.to_string(r))
-    Ok(socket) -> {
-      case
-        actor.new(State(socket, mpv_ui, ui_mpv))
-        |> actor.on_message(handle_message)
-        |> actor.start
-      {
-        Error(start_error) ->
-          Error("Could not start actor: " <> string.inspect(start_error))
-        Ok(actor.Started(data: mpv, ..)) -> {
-          process.spawn(fn() {
-            let assert Ok(_) = process.register(process.self(), ui_mpv_name)
-            handle_ui_control(mpv, ui_mpv)
-          })
-
-          Ok(Nil)
-        }
-      }
-    }
-  }
-}
-
-fn handle_message(
-  state: State(socket, mpv_ui, ui_mpv),
-  control: mpv_control.Control,
-) -> actor.Next(State(socket, mpv_ui, ui_mpv), mpv_control.Control) {
-  case control {
-    mpv_control.TogglePlayPause -> {
-      echo "toggling play/pause"
-
-      let _ =
-        result.map_error(mpv_control.toggle_play_pause(state.socket), fn(err) {
-          echo "Could not toggle play/pause: " <> err.details
-        })
-
-      let _ =
-        result.map(mpv_control.get_playback_time(state.socket), fn(playback) {
-          echo "playback: " <> float.to_string(playback.data)
-        })
-
-      process.send(state.mpv_ui, ui_control.Ack)
-
-      actor.continue(state)
-    }
-    mpv_control.Exit -> {
-      // TODO close sockets
-      actor.stop()
-    }
-  }
-}
-
-fn handle_ui_control(
-  mpv: Subject(mpv_control.Control),
-  ui_mpv: Subject(mpv_control.Control),
-) {
-  let control = process.receive_forever(ui_mpv)
-  echo "handle_ui_control: " <> string.inspect(control)
-  process.send(mpv, control)
-
-  handle_ui_control(mpv, ui_mpv)
-}

src/musicplayer.gleam

@@ -1,45 +1,32 @@
 import gleam/erlang/process.{type Name}
 
-import input/input
-import input/key.{type Key}
-import mpv/control as mpv_control
-import mpv/mpv
-import ui/control as ui_control
-import ui/ui
+import musicplayer/input/input
+import musicplayer/input/key.{type Key}
+import musicplayer/mpv/mpv
+import musicplayer/musicplayer
 
 pub fn main() -> Nil {
-  let exit = process.new_subject()
+  let input_keys_name: Name(Key) = process.new_name("input_keys")
+  let input_stream_name: Name(List(String)) = process.new_name("input_stream")
 
-  // `ui_input_keys` is owned by `ui`, this is where input sends keys
-  let ui_input_keys_name: Name(Key) = process.new_name("ui_input_keys")
-  // `ui_input_stream` is owned by `ui`, thi sis where input is streamed
-  let ui_input_stream_name: Name(List(String)) =
-    process.new_name("ui_input_stream")
-
-  // `inject_input` is created by name to allow the `input` process that
+  // `input_inject` 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 input_inject_name: Name(Key) = process.new_name("input_inject_keys")
 
-  // `input_ui_inject`  is owned by `input`, this is where `ui` injects `Key`
-  let input_ui_inject_name: Name(Key) = process.new_name("input_ui_inject_keys")
+  input.new(input_keys_name, input_stream_name, input_inject_name)
 
-  // `ui_mpv` is owned by `ui`, this is where `ui` asks `mpv` for things
-  let ui_mpv_name: Name(mpv_control.Control) = process.new_name("ui_mpv")
-  //   `mpv_ui` is owned by mpv and this is where mpv responds to ui
-  let mpv_ui_name: Name(ui_control.Control) = process.new_name("mpv_ui")
+  let assert Ok(mpv) = mpv.new()
 
+  let exit = process.new_subject()
   let assert Ok(_) =
-    ui.new(
-      ui_mpv_name,
-      mpv_ui_name,
-      ui_input_keys_name,
-      ui_input_stream_name,
+    musicplayer.new(
+      mpv,
+      input_keys_name,
+      input_stream_name,
+      input_inject_name,
       exit,
     )
-
-  let assert Ok(_) = mpv.new(mpv_ui_name, ui_mpv_name)
-  input.new(ui_input_keys_name, ui_input_stream_name, input_ui_inject_name)
-
   process.receive_forever(exit)
 }

src/musicplayer/control.gleam

@@ -1,10 +1,10 @@
-import input/key.{type Key}
+import musicplayer/input/key.{type Key}
 
 pub type Control {
-  Ack
-
   TogglePlayPause
 
+  Search
+
   Exit
 }
 
@@ -19,6 +19,7 @@ fn char_control(char: String) -> Result(Control, Nil) {
   case char {
     " " -> Ok(TogglePlayPause)
     "q" -> Ok(Exit)
+    "/" -> Ok(Search)
     _ -> Error(Nil)
   }
 }

src/musicplayer/input/input.gleam

@@ -0,0 +1,48 @@
+import gleam/erlang/process.{type Name, type Subject}
+
+import musicplayer/input/key.{type Key}
+
+// TODO REWRITE below
+
+/// `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(
+  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)
+    })
+
+  echo "waiting for input"
+  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

@@ -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),
-  ui_input_stream: Subject(List(String)),
+  input_stream: Subject(List(String)),
 ) -> Key {
   case
     internal_input.read_input()
@@ -71,8 +71,8 @@ pub fn read_input_until_key(
     |> from_list
   {
     Continue(l) -> {
-      process.send(ui_input_stream, l)
-      read_input_until_key(l, ui_input_stream)
+      process.send(input_stream, l)
+      read_input_until_key(l, input_stream)
     }
     k -> k
   }

src/musicplayer/mpv/control.gleam

@@ -1,15 +1,18 @@
+import gleam/erlang/process.{type Subject}
 import gleam/json
 import gleam/result
 import gleam/string
 
-import mpv/internal as internal_control
-import tcp/reason.{type Reason}
-import tcp/tcp.{type Socket}
+import musicplayer/mpv/internal as internal_control
+import musicplayer/tcp/reason.{type Reason}
+import musicplayer/tcp/tcp.{type Socket}
 
 pub type Control {
   TogglePlayPause
 
-  Exit
+  GetPlaybackTime(reply_to: Subject(Result(PlaybackTime, ControlError)))
+
+  Exit(reply_to: Subject(Nil))
 }
 
 pub type ControlError {

src/musicplayer/mpv/mpv.gleam

@@ -0,0 +1,62 @@
+import gleam/erlang/process.{type Subject}
+import gleam/otp/actor
+import gleam/result
+import gleam/string
+
+import musicplayer/mpv/control
+import musicplayer/tcp/reason
+import musicplayer/tcp/tcp.{type Socket}
+
+type State(socket) {
+  State(socket: Socket)
+}
+
+pub fn new() -> Result(Subject(control.Control), 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) -> {
+      case
+        actor.new(State(socket))
+        |> actor.on_message(handle_message)
+        |> actor.start
+      {
+        Error(start_error) ->
+          Error("Could not start actor: " <> string.inspect(start_error))
+        Ok(actor.Started(data: mpv, ..)) -> Ok(mpv)
+      }
+    }
+  }
+}
+
+fn handle_message(
+  state: State(socket),
+  control: control.Control,
+) -> actor.Next(State(socket), control.Control) {
+  case control {
+    control.TogglePlayPause -> {
+      echo "mpv: toggling play/pause"
+
+      let _ =
+        result.map_error(control.toggle_play_pause(state.socket), fn(err) {
+          echo "Could not toggle play/pause: " <> err.details
+        })
+
+      actor.continue(state)
+    }
+
+    control.GetPlaybackTime(reply_to) -> {
+      let res = control.get_playback_time(state.socket)
+      process.send(reply_to, res)
+      actor.continue(state)
+    }
+
+    control.Exit(reply_to) -> {
+      tcp.close(state.socket)
+      process.send(reply_to, Nil)
+      actor.stop()
+    }
+  }
+}

src/musicplayer/musicplayer.gleam

@@ -0,0 +1,106 @@
+import gleam/erlang/process.{type Name, type Subject}
+import gleam/float
+import gleam/otp/actor
+import gleam/result
+import gleam/string
+
+import musicplayer/control.{type Control}
+import musicplayer/input/key.{type Key}
+import musicplayer/mpv/control as mpv_control
+
+type State(mpv, input_inject, exit) {
+  State(
+    mpv: Subject(mpv_control.Control),
+    input_inject: Subject(Key),
+    exit: Subject(Nil),
+  )
+}
+
+pub fn new(
+  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
+    actor.new(State(mpv, input_inject, exit))
+    |> actor.on_message(handle_message)
+    |> actor.start
+  {
+    Error(start_error) ->
+      Error("Could not start actor: " <> string.inspect(start_error))
+    Ok(actor.Started(data: musicplayer, ..)) -> {
+      process.spawn(fn() {
+        let assert Ok(_) = process.register(process.self(), input_keys_name)
+        handle_key(musicplayer, input_keys)
+      })
+
+      process.spawn(fn() {
+        let assert Ok(_) = process.register(process.self(), input_stream_name)
+        temp_input_stream(input_stream)
+      })
+
+      Ok(Nil)
+    }
+  }
+}
+
+fn handle_message(
+  state: State(mpv, input_inject, exit),
+  control: Control,
+) -> actor.Next(State(mpv, input_inject, exit), Control) {
+  case control {
+    control.Search -> {
+      process.send(state.input_inject, key.Continue([key.input_introducer]))
+
+      actor.continue(state)
+    }
+    control.TogglePlayPause -> {
+      echo "toggling play/pause"
+
+      process.send(state.mpv, mpv_control.TogglePlayPause)
+
+      case
+        process.call(state.mpv, 1000, fn(reply_to) {
+          mpv_control.GetPlaybackTime(reply_to)
+        })
+      {
+        Error(err) -> echo "! could not get playbackTime: " <> err.details
+        Ok(mpv_control.PlaybackTime(data: playback_time)) ->
+          echo "playbacktime from mpv: " <> float.to_string(playback_time)
+      }
+
+      actor.continue(state)
+    }
+    control.Exit -> {
+      // Close socket to `mpv`
+      process.call(state.mpv, 1000, fn(reply_to) { mpv_control.Exit(reply_to) })
+
+      // End main process
+      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(musicplayer: Subject(Control), input_keys: Subject(Key)) -> Nil {
+  let _ =
+    process.receive_forever(input_keys)
+    |> 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/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,122 +0,0 @@
-import gleam/erlang/process.{type Name, type Subject}
-import gleam/otp/actor
-import gleam/result
-import gleam/string
-
-import input/key.{type Key}
-import mpv/control as mpv_control
-import ui/control as ui_control
-
-pub type State(ui_mpv, mpv_ui, ui_input_keys, ui_input_stream, exit) {
-  State(
-    ui_mpv: Subject(mpv_control.Control),
-    mpv_ui: Subject(ui_control.Control),
-    ui_input_keys: Subject(Key),
-    ui_input_stream: Subject(List(String)),
-    exit: Subject(Nil),
-  )
-}
-
-pub fn new(
-  ui_mpv_name: Name(mpv_control.Control),
-  mpv_ui_name: Name(ui_control.Control),
-  ui_input_keys_name: Name(Key),
-  ui_input_stream_name: Name(List(String)),
-  exit: Subject(Nil),
-) -> Result(Nil, String) {
-  let ui_mpv: Subject(mpv_control.Control) = process.named_subject(ui_mpv_name)
-  let mpv_ui: Subject(ui_control.Control) = process.named_subject(mpv_ui_name)
-
-  let ui_input_keys: Subject(Key) = process.named_subject(ui_input_keys_name)
-  let ui_input_stream: Subject(List(String)) =
-    process.named_subject(ui_input_stream_name)
-
-  case
-    actor.new(State(ui_mpv, mpv_ui, ui_input_keys, ui_input_stream, exit))
-    |> actor.on_message(handle_message)
-    |> actor.start
-  {
-    Error(start_error) ->
-      Error("Could not start ui: " <> string.inspect(start_error))
-    Ok(actor.Started(data: ui, ..)) -> {
-      echo "ui started"
-
-      process.spawn(fn() {
-        let assert Ok(_) = process.register(process.self(), ui_input_keys_name)
-        handle_key(ui, ui_input_keys)
-      })
-
-      process.spawn(fn() {
-        let assert Ok(_) = process.register(process.self(), mpv_ui_name)
-        handle_mpv_control(ui, mpv_ui)
-      })
-
-      process.spawn(fn() {
-        let assert Ok(_) =
-          process.register(process.self(), ui_input_stream_name)
-        temp_input_stream(ui_input_stream)
-      })
-
-      Ok(Nil)
-    }
-  }
-}
-
-fn handle_message(
-  state: State(ui_mpv, mpv_ui, ui_input_keys, ui_input_stream, exit),
-  control: ui_control.Control,
-) -> actor.Next(
-  State(ui_mpv, mpv_ui, ui_input_keys, ui_input_stream, exit),
-  ui_control.Control,
-) {
-  case control {
-    ui_control.Ack -> {
-      echo "ack! use this to re-render?"
-      actor.continue(state)
-    }
-    ui_control.TogglePlayPause -> {
-      process.send(state.mpv_ui, ui_control.TogglePlayPause)
-      case process.receive(state.mpv_ui, 5000) {
-        Error(_) -> echo "mpv not responding: could not toggle pause :("
-        Ok(_) -> echo "toggled pause"
-      }
-
-      actor.continue(state)
-    }
-    ui_control.Exit -> {
-      // TODO call `mpv` to exit, wait for response
-      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(
-  ui: Subject(ui_control.Control),
-  ui_input_keys: Subject(Key),
-) -> Nil {
-  let _ =
-    process.receive_forever(ui_input_keys)
-    |> ui_control.from_key
-    |> result.map(process.send(ui, _))
-
-  handle_key(ui, ui_input_keys)
-}
-
-fn handle_mpv_control(
-  ui: Subject(ui_control.Control),
-  mpv_ui: Subject(ui_control.Control),
-) {
-  let control = process.receive_forever(mpv_ui)
-  process.send(ui, control)
-
-  handle_mpv_control(ui, mpv_ui)
-}
-
-fn temp_input_stream(ui_input_stream: Subject(List(String))) -> Nil {
-  let stream = process.receive_forever(ui_input_stream)
-  echo "input stream: " <> string.inspect(stream)
-  temp_input_stream(ui_input_stream)
-}

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/control_test.gleam

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

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/mpv_test.gleam

@@ -1,6 +1,6 @@
 import gleeunit
 
-import mpv/internal as control_internal
+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()