iwp

gleam.toml

@@ -18,7 +18,6 @@ gleam_otp = ">= 1.2.0 and < 2.0.0"
 gleam_erlang = ">= 1.3.0 and < 2.0.0"
 simplifile = ">= 2.3.1 and < 3.0.0"
 gleam_json = ">= 3.1.0 and < 4.0.0"
-gleam_time = ">= 1.6.0 and < 2.0.0"
 
 [dev-dependencies]
 gleeunit = ">= 1.0.0 and < 2.0.0"

manifest.toml

@@ -7,7 +7,6 @@ packages = [
   { name = "gleam_json", version = "3.1.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_json", source = "hex", outer_checksum = "44FDAA8847BE8FC48CA7A1C089706BD54BADCC4C45B237A992EDDF9F2CDB2836" },
   { name = "gleam_otp", version = "1.2.0", build_tools = ["gleam"], requirements = ["gleam_erlang", "gleam_stdlib"], otp_app = "gleam_otp", source = "hex", outer_checksum = "BA6A294E295E428EC1562DC1C11EA7530DCB981E8359134BEABC8493B7B2258E" },
   { name = "gleam_stdlib", version = "0.65.0", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "7C69C71D8C493AE11A5184828A77110EB05A7786EBF8B25B36A72F879C3EE107" },
-  { name = "gleam_time", version = "1.6.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_time", source = "hex", outer_checksum = "0DF3834D20193F0A38D0EB21F0A78D48F2EC276C285969131B86DF8D4EF9E762" },
   { name = "gleeunit", version = "1.9.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "DA9553CE58B67924B3C631F96FE3370C49EB6D6DC6B384EC4862CC4AAA718F3C" },
   { name = "simplifile", version = "2.3.1", build_tools = ["gleam"], requirements = ["filepath", "gleam_stdlib"], otp_app = "simplifile", source = "hex", outer_checksum = "957E0E5B75927659F1D2A1B7B75D7B9BA96FAA8D0C53EA71C4AD9CD0C6B848F6" },
 ]
@@ -17,6 +16,5 @@ gleam_erlang = { version = ">= 1.3.0 and < 2.0.0" }
 gleam_json = { version = ">= 3.1.0 and < 4.0.0" }
 gleam_otp = { version = ">= 1.2.0 and < 2.0.0" }
 gleam_stdlib = { version = ">= 0.44.0 and < 2.0.0" }
-gleam_time = { version = ">= 1.6.0 and < 2.0.0" }
 gleeunit = { version = ">= 1.0.0 and < 2.0.0" }
 simplifile = { version = ">= 2.3.1 and < 3.0.0" }

src/input/key.gleam

@@ -1,21 +1,18 @@
 import gleam/erlang/atom
-import gleam/erlang/process.{type Subject}
 import gleam/list
 
-import musicplayer/input/internal as internal_input
+import input/internal as internal_input
 
 pub type Key {
-  Continue(buffer: List(String))
   Char(String)
 
+  Input(String)
   Left
   Right
   Up
   Down
 
-  Return
+  Continue(buffer: List(String))
-  Backspace
-
   Unknown
 }
 
@@ -24,9 +21,8 @@ pub const esc = "\u{001B}"
 // control sequence introducer
 pub const csi = "["
 
-pub const return = "\r"
+// input introducer
-
+pub const input_introducer = "::"
-pub const backspace = "\u{007F}"
 
 pub fn from_list(l: List(String)) -> Key {
   case l {
@@ -37,9 +33,15 @@ pub fn from_list(l: List(String)) -> Key {
 
     [e, c] if e == esc && c == csi -> Continue(l)
 
+    [ci] | [ci, _] if ci == input_introducer -> Continue(l)
+    [ii, cmd, tail] if ii == input_introducer -> {
+      case tail == "\r" {
+        True -> Input(cmd)
+        False -> Continue([ii, cmd <> tail])
+      }
+    }
+
     [e] if e == esc -> Continue(l)
-    [bs] if bs == backspace -> Backspace
-    [rtn] if rtn == return -> Return
     [char] -> Char(char)
 
     [] -> Continue([])
@@ -53,24 +55,14 @@ pub fn start_raw_shell() {
   internal_input.shell_start_interactive(#(no_shell, raw))
 }
 
-pub fn read_input_until_key(input_keys: Subject(Key)) -> Nil {
+pub fn read_input_until_key(l: List(String)) -> Key {
-  read_input_until_key_loop([], input_keys)
-}
-
-pub fn read_input_until_key_loop(
-  l: List(String),
-  input_keys: Subject(Key),
-) -> Nil {
   case
     internal_input.read_input()
     |> list.wrap
     |> list.append(l, _)
     |> from_list
   {
-    Continue(l) -> read_input_until_key_loop(l, input_keys)
+    Continue(l) -> read_input_until_key(l)
-    k -> {
+    k -> k
-      process.send(input_keys, k)
-      read_input_until_key_loop([], input_keys)
-    }
   }
 }

src/mpv/control.gleam

@@ -1,24 +1,45 @@
-import gleam/erlang/process.{type Subject}
 import gleam/json
 import gleam/result
 import gleam/string
 
-import musicplayer/mpv/internal as internal_control
+import input/key.{type Key}
-import musicplayer/tcp/reason.{type Reason}
+import mpv/internal/control as internal_control
-import musicplayer/tcp/tcp.{type Socket}
+import tcp/reason.{type Reason}
+import tcp/tcp.{type Socket}
 
 pub type Control {
   TogglePlayPause
 
-  GetPlaybackTime(reply_to: Subject(Result(PlaybackTime, ControlError)))
+  Search
 
-  Exit(reply_to: Subject(Nil))
+  Exit
 }
 
 pub type ControlError {
   ControlError(details: String)
 }
 
+// TODO this should also have a context:
+// `/` in "artist list" "context will should be`control.Search`
+// `<some char>` in "create new playlist" context should be `control.Input`
+// `q` in most contexts should be `Exit`, but in a popup it should be `Close`
+pub fn from_key(key: Key) -> Result(Control, Nil) {
+  echo key
+  case key {
+    key.Char(char) -> char_control(char)
+    _ -> Error(Nil)
+  }
+}
+
+fn char_control(char: String) -> Result(Control, Nil) {
+  case char {
+    " " -> Ok(TogglePlayPause)
+    "q" -> Ok(Exit)
+    "/" -> Ok(Search)
+    _ -> Error(Nil)
+  }
+}
+
 pub fn toggle_play_pause(socket: Socket) -> Result(Nil, ControlError) {
   let command =
     json.object([#("command", json.array(["cycle", "pause"], of: json.string))])

src/mpv/mpv.gleam

@@ -0,0 +1,123 @@
+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}
+
+type State(socket, inject_input, exit) {
+  State(socket: Socket, inject_input: Subject(Key), exit: Subject(Nil))
+}
+
+pub fn new(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, 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 input = process.new_subject()
+            let assert Ok(_) =
+              process.register(process.self(), inject_input_name)
+
+            process.send(input, key.Continue([]))
+            read_input(data, input, inject_input)
+          })
+
+          Ok(Nil)
+        }
+      }
+    }
+  }
+}
+
+fn handle_message(
+  state: State(socket, inject, exit),
+  control: Control,
+) -> actor.Next(State(socket, inject, exit), Control) {
+  case control {
+    control.Search -> {
+      process.send(state.inject_input, key.Continue([key.input_introducer]))
+      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 selects from two subjects: `input` and `inject`
+/// `inject` can be used by the agent to send back input character(s)
+/// to force the input to be something other than user input.
+///
+/// This is useful to create a `Key` without the user having to
+/// input all of the character(s), to then be able to create a
+/// `Control` from that `Key`
+fn read_input(
+  agent: Subject(Control),
+  input: Subject(Key),
+  inject_input: Subject(Key),
+) -> Nil {
+  let buffer = case
+    process.new_selector()
+    |> process.select(input)
+    |> process.select(inject_input)
+    |> process.selector_receive_forever
+  {
+    key.Continue(buffer) -> buffer
+    _ -> []
+  }
+
+  case
+    key.read_input_until_key(buffer)
+    |> control.from_key
+  {
+    Error(_) -> Nil
+    Ok(control) -> process.send(agent, control)
+  }
+
+  // currently needed to allow injects to be received. not nice
+  // maybe timed out select on inject first, then normal?
+  process.sleep(100)
+
+  process.send(input, key.Continue([]))
+  read_input(agent, input, inject_input)
+}

src/musicplayer.gleam

@@ -1,24 +1,8 @@
-import gleam/erlang/process.{type Name}
+import gleam/erlang/process
-
+import mpv/mpv
-import musicplayer/input/input
-import musicplayer/input/key.{type Key}
-import musicplayer/logging/logging
-import musicplayer/mpv/mpv
-import musicplayer/musicplayer
-import musicplayer/ui/ui
 
 pub fn main() -> Nil {
-  let assert Ok(_) = logging.initialize()
+  let exit = process.new_subject()
-
+  let assert Ok(_) = mpv.new(exit)
-  let input_keys_name: Name(Key) = process.new_name("input_keys")
+  process.receive_forever(exit)
-  input.new(input_keys_name)
-
-  let assert Ok(ui) = ui.new()
-  let assert Ok(mpv) = mpv.new()
-  let assert Ok(musicplayer_pid) = musicplayer.new(ui, mpv, input_keys_name)
-
-  let monitor = process.monitor(musicplayer_pid)
-  process.new_selector()
-  |> process.select_specific_monitor(monitor, fn(_) { Nil })
-  |> process.selector_receive_forever
 }

src/musicplayer/control.gleam

@@ -1,30 +0,0 @@
-import musicplayer/input/key.{type Key}
-
-pub type Control {
-  TogglePlayPause
-  Search
-
-  Raw(String)
-  Return
-  Backspace
-
-  Exit
-}
-
-pub fn from_key(key: Key) -> Result(Control, Nil) {
-  case key {
-    key.Return -> Ok(Return)
-    key.Backspace -> Ok(Backspace)
-    key.Char(char) -> Ok(char_control(char))
-    _ -> Error(Nil)
-  }
-}
-
-fn char_control(char: String) -> Control {
-  case char {
-    " " -> TogglePlayPause
-    "/" -> Search
-    "q" -> Exit
-    _ -> Raw(char)
-  }
-}

src/musicplayer/input/input.gleam

@@ -1,15 +0,0 @@
-import gleam/erlang/process.{type Name}
-
-import musicplayer/input/key.{type Key}
-
-/// `new` accepts a subject that all input will be sent to
-pub fn new(input_keys_name: Name(Key)) -> Nil {
-  let _ =
-    process.spawn(fn() {
-      let input_keys = process.named_subject(input_keys_name)
-      key.read_input_until_key(input_keys)
-    })
-
-  key.start_raw_shell()
-  Nil
-}

src/musicplayer/logging/control.gleam

@@ -1,5 +0,0 @@
-pub type Control {
-  Write(String)
-
-  Exit
-}

src/musicplayer/logging/logging.gleam

@@ -1,30 +0,0 @@
-import gleam/result
-import gleam/string
-import gleam/time/calendar
-import gleam/time/timestamp
-import simplifile
-
-const filepath = "/tmp/musicplayer.log"
-
-pub fn initialize() -> Result(Nil, String) {
-  case simplifile.is_file(filepath) {
-    Ok(True) -> Ok(Nil)
-    _ -> simplifile.create_file(filepath)
-  }
-  |> result.map_error(fn(e) {
-    "Could not access or create log file: " <> string.inspect(e)
-  })
-}
-
-pub fn log(content: String) -> Nil {
-  let log_line =
-    timestamp.system_time()
-    |> timestamp.to_rfc3339(calendar.utc_offset)
-    <> ": "
-    <> content
-    <> "\n"
-
-  // Ignore any logging errors
-  let _ = simplifile.append(filepath, log_line)
-  Nil
-}

src/musicplayer/mpv/mpv.gleam

@@ -1,60 +0,0 @@
-import gleam/erlang/process.{type Subject}
-import gleam/otp/actor
-import gleam/result
-import gleam/string
-
-import musicplayer/mpv/control.{type Control}
-import musicplayer/tcp/reason
-import musicplayer/tcp/tcp.{type Socket}
-
-type State(socket) {
-  State(socket: Socket)
-}
-
-pub fn new() -> Result(Subject(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 mpv: " <> string.inspect(start_error))
-        Ok(actor.Started(data: mpv, ..)) -> Ok(mpv)
-      }
-    }
-  }
-}
-
-fn handle_message(
-  state: State(socket),
-  control: Control,
-) -> actor.Next(State(socket), Control) {
-  case control {
-    control.TogglePlayPause -> {
-      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

@@ -1,197 +0,0 @@
-import gleam/erlang/process.{type Name, type Pid, type Subject}
-import gleam/otp/actor
-import gleam/result
-import gleam/string
-
-import musicplayer/control.{type Control}
-import musicplayer/input/key.{type Key}
-import musicplayer/logging/logging
-import musicplayer/mpv/control as mpv_control
-import musicplayer/time/time
-import musicplayer/ui/control as ui_control
-import musicplayer/ui/layout
-
-type Mode {
-  Idle
-  Searching
-}
-
-type Input {
-  Input(capturing: Bool, content: String)
-}
-
-type State {
-  State(
-    mode: Mode,
-    input: Input,
-    ui: Subject(ui_control.Control),
-    mpv: Subject(mpv_control.Control),
-  )
-}
-
-pub fn new(
-  ui: Subject(ui_control.Control),
-  mpv: Subject(mpv_control.Control),
-  input_keys_name: Name(Key),
-) -> Result(Pid, String) {
-  let input_keys = process.named_subject(input_keys_name)
-
-  let input = Input(False, "")
-
-  case
-    actor.new(State(Idle, input, ui, mpv))
-    |> actor.on_message(handle_message)
-    |> actor.start
-  {
-    Error(start_error) ->
-      Error("Could not start actor: " <> string.inspect(start_error))
-    Ok(actor.Started(pid:, data: musicplayer)) -> {
-      logging.log("musicplayer - started")
-      process.spawn(fn() {
-        let assert Ok(_) = process.register(process.self(), input_keys_name)
-        handle_key(musicplayer, input_keys)
-      })
-
-      process.spawn(fn() { update_playback_time_loop(mpv, ui, 1000) })
-
-      Ok(pid)
-    }
-  }
-}
-
-fn handle_message(state: State, control: Control) -> actor.Next(State, Control) {
-  case control {
-    control.Search -> {
-      logging.log("musicplayer - initiating search")
-
-      update_search(state.ui, "searching: ")
-
-      actor.continue(
-        State(
-          ..state,
-          mode: Searching,
-          input: Input(..state.input, capturing: True),
-        ),
-      )
-    }
-
-    control.Raw(content) -> {
-      logging.log("musicplayer - recieved raw input: " <> content)
-
-      let content = case state.mode {
-        Idle -> state.input.content
-        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")
-
-      let content = case state.mode {
-        Idle -> state.input.content
-        Searching -> string.drop_end(state.input.content, 1)
-      }
-      actor.continue(State(..state, input: Input(..state.input, content:)))
-    }
-    control.Return -> {
-      logging.log(
-        "musicplayer - recieved return. `input.capture`: "
-        <> "'"
-        <> state.input.content
-        <> "'",
-      )
-
-      // Note: state.input.content is now the final input, use it
-      // before it is reset
-      case state.mode {
-        Idle -> Nil
-        Searching -> update_search(state.ui, "")
-      }
-
-      actor.continue(
-        State(..state, mode: Idle, input: Input(capturing: False, content: "")),
-      )
-    }
-
-    control.TogglePlayPause -> {
-      logging.log("musicplayer - toggling play/pause")
-
-      process.send(state.mpv, mpv_control.TogglePlayPause)
-      update_playback_time(state.mpv, state.ui)
-      actor.continue(state)
-    }
-    control.Exit -> {
-      logging.log("musicplayer - initiating musicplayer shutdown")
-      // Close `mpv` socket
-      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) })
-
-      logging.log("musicplayer - stopped")
-
-      actor.stop()
-    }
-  }
-}
-
-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 `Key`s
-fn handle_key(musicplayer: Subject(Control), input_keys: Subject(Key)) -> Nil {
-  let _ =
-    process.new_selector()
-    |> process.select(input_keys)
-    |> process.selector_receive_forever
-    |> control.from_key
-    |> result.map(process.send(musicplayer, _))
-
-  handle_key(musicplayer, input_keys)
-}

src/musicplayer/time/time.gleam

@@ -1,23 +0,0 @@
-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,10 +0,0 @@
-import gleam/erlang/process.{type Subject}
-
-import musicplayer/ui/layout.{type Section}
-
-pub type Control {
-  UpdateDimensions(width: Int, height: Int)
-  UpdateState(section: Section, content: String)
-
-  Exit(reply_to: Subject(Nil))
-}

src/musicplayer/ui/internal.gleam

@@ -1,35 +0,0 @@
-import gleam/int
-import gleam/io
-
-// https://en.wikipedia.org/wiki/ANSI_escape_code#Control_Sequence_Introducer_commands
-
-pub fn clear_screen() -> Nil {
-  io.print("\u{001B}[2J\u{001B}[H")
-}
-
-pub fn chars_at(chars: String, x: Int, y: Int) -> String {
-  let seq = "\u{001B}[" <> int.to_string(y) <> ";" <> int.to_string(x) <> "H"
-  seq <> chars
-}
-
-pub fn print(chars: String) -> Nil {
-  io.print(chars)
-}
-
-pub fn hide_cursor() -> Nil {
-  io.print("\u{001B}[?25l")
-}
-
-pub fn show_cursor() -> Nil {
-  io.print("\u{001B}[?25h")
-}
-
-pub type Enotsup
-
-// https://www.erlang.org/doc/apps/stdlib/io.html#rows/0
-@external(erlang, "io", "rows")
-pub fn io_get_rows() -> Result(Int, Enotsup)
-
-// https://www.erlang.org/doc/apps/stdlib/io.html#columns/0
-@external(erlang, "io", "columns")
-pub fn io_get_columns() -> Result(Int, Enotsup)

src/musicplayer/ui/layout.gleam

@@ -1,90 +0,0 @@
-import gleam/dict
-import gleam/list
-import gleam/string_tree.{type StringTree}
-
-import musicplayer/ui/internal
-
-pub type Layout {
-  Layout(width: Int, height: Int, 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(0, 0, nodes: nodes)
-}
-
-pub fn update_section(
-  layout: Layout,
-  section: Section,
-  content: String,
-) -> Layout {
-  case dict.get(layout.nodes, section) {
-    Error(_) -> layout
-    Ok(node) ->
-      Layout(
-        ..layout,
-        nodes: dict.insert(
-          layout.nodes,
-          section,
-          Node(..node, content: content),
-        ),
-      )
-  }
-}
-
-pub fn update_dimensions(layout: Layout, width: Int, height: Int) -> Layout {
-  Layout(..layout, width:, height:)
-}
-
-pub fn render(layout: Layout, from: Section) -> Nil {
-  string_tree.new()
-  |> render_loop(layout, from, _)
-  |> string_tree.to_string
-  |> internal.print
-}
-
-pub fn render_loop(
-  layout: Layout,
-  from: Section,
-  into: StringTree,
-) -> StringTree {
-  case dict.get(layout.nodes, from) {
-    Error(_) -> into
-    Ok(node) -> {
-      let parent =
-        string_tree.append(
-          into,
-          internal.chars_at(node.content, node.x, node.y),
-        )
-
-      list.fold(node.children, parent, fn(into_acc, child) {
-        render_loop(layout, child, into_acc)
-      })
-    }
-  }
-}

src/musicplayer/ui/ui.gleam

@@ -1,110 +0,0 @@
-import gleam/erlang/process.{type Subject}
-import gleam/int
-import gleam/list
-import gleam/otp/actor
-import gleam/string
-
-import musicplayer/logging/logging
-import musicplayer/ui/control.{type Control}
-import musicplayer/ui/internal
-import musicplayer/ui/layout.{type Layout}
-
-pub type State(redraw, content) {
-  State(redraw: Subject(Layout), layout: Layout)
-}
-
-pub fn new() -> Result(Subject(Control), String) {
-  let redraw_name = process.new_name("redraw")
-  let redraw: Subject(Layout) = process.named_subject(redraw_name)
-
-  let layout = layout.new()
-
-  case
-    actor.new(State(redraw, layout))
-    |> actor.on_message(handle_message)
-    |> actor.start
-  {
-    Error(start_error) ->
-      Error("Could not start actor: " <> string.inspect(start_error))
-    Ok(actor.Started(data: ui, ..)) -> {
-      process.spawn(fn() {
-        let update_dimensions_interval_ms = 300
-        update_dimensions_on_interval(ui, update_dimensions_interval_ms)
-      })
-
-      process.spawn(fn() {
-        let assert Ok(_) = process.register(process.self(), redraw_name)
-
-        internal.clear_screen()
-        internal.hide_cursor()
-
-        redraw_on_update_loop(redraw)
-      })
-
-      Ok(ui)
-    }
-  }
-}
-
-fn handle_message(
-  state: State(redraw, layout),
-  control: Control,
-) -> actor.Next(State(redraw, layout), Control) {
-  case control {
-    control.UpdateDimensions(width, height) -> {
-      let current_dimensions = #(state.layout.width, state.layout.height)
-
-      case #(width, height) == current_dimensions {
-        True -> actor.continue(state)
-        False -> {
-          [width, height]
-          |> list.map(int.to_string)
-          |> string.join(" ")
-          |> string.append("ui - updating dimensions: ", _)
-          |> logging.log
-
-          actor.continue(
-            State(
-              ..state,
-              layout: layout.update_dimensions(state.layout, width, height),
-            ),
-          )
-        }
-      }
-    }
-    control.UpdateState(section, content) -> {
-      let layout = layout.update_section(state.layout, section, content)
-      let state = State(..state, layout:)
-
-      actor.send(state.redraw, layout)
-      actor.continue(state)
-    }
-
-    control.Exit(reply_to) -> {
-      internal.show_cursor()
-      process.send(reply_to, Nil)
-      actor.stop()
-    }
-  }
-}
-
-fn redraw_on_update_loop(redraw: Subject(Layout)) -> Nil {
-  let layout = process.receive_forever(redraw)
-
-  internal.clear_screen()
-  layout.render(layout, layout.Root)
-
-  redraw_on_update_loop(redraw)
-}
-
-fn update_dimensions_on_interval(ui: Subject(Control), interval_ms: Int) {
-  case internal.io_get_columns(), internal.io_get_rows() {
-    Ok(width), Ok(height) -> {
-      process.send(ui, control.UpdateDimensions(width, height))
-    }
-    _, _ -> logging.log("ui - failed to update dimensions")
-  }
-
-  process.sleep(interval_ms)
-  update_dimensions_on_interval(ui, interval_ms)
-}

src/tcp/tcp.gleam

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

test/echo_server.gleam

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

test/input/input_test.gleam

@@ -1,7 +1,7 @@
 import gleam/list
 import gleeunit
 
-import musicplayer/input/key.{type Key, Char, backspace, csi, esc, return}
+import input/key.{type Key, Char, csi, esc}
 
 pub fn main() -> Nil {
   gleeunit.main()
@@ -27,8 +27,10 @@ pub fn key_from_list_test() {
   ]
 
   let input_tests = [
-    TestCase([return], key.Return),
+    TestCase(["$"], key.Continue(["$"])),
-    TestCase([backspace], key.Backspace),
+    TestCase(["$", "a"], key.Continue(["$", "a"])),
+    TestCase(["$", "a", "b"], key.Continue(["$", "ab"])),
+    TestCase(["$", "ab", "\r"], key.Input("ab")),
   ]
 
   let test_cases = [base_tests, char_tests, escape_tests, input_tests]

test/mpv/control_test.gleam

@@ -1,8 +1,9 @@
 import gleam/list
 import gleeunit
 
-import musicplayer/control.{type Control}
+import input/key.{type Key, Char}
-import musicplayer/input/key.{type Key, Char}
+import mpv/control.{type Control}
+import mpv/internal/control as control_internal
 
 pub fn main() -> Nil {
   gleeunit.main()
@@ -22,3 +23,11 @@ pub fn control_from_key_test() {
     assert tc.expected == control.from_key(tc.key)
   })
 }
+
+pub fn parse_playback_time_test() {
+  let json_string =
+    "{\"data\":\"123.456789\",\"request_id\":0,\"error\":\"success\"}\n"
+
+  let assert Ok(data) = control_internal.parse_playback_time(json_string)
+  assert data == 123.456789
+}

test/musicplayer/mpv/mpv_test.gleam

@@ -1,15 +0,0 @@
-import gleeunit
-
-import musicplayer/mpv/internal
-
-pub fn main() -> Nil {
-  gleeunit.main()
-}
-
-pub fn parse_playback_time_test() {
-  let json_string =
-    "{\"data\":\"123.456789\",\"request_id\":0,\"error\":\"success\"}\n"
-
-  let assert Ok(data) = internal.parse_playback_time(json_string)
-  assert data == 123.456789
-}

test/musicplayer/time/time_test.gleam

@@ -1,32 +0,0 @@
-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)
-  })
-}

test/tcp/tcp_test.gleam

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