wip

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

@@ -2,23 +2,35 @@ import gleam/erlang/process.{type Name}
 
 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 input_keys_name: Name(Key) = process.new_name("input_keys")
-  input.new(input_keys_name)
+  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,
+  //  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")
+
+  // TODO should input.new just return the inject_subject?
+  input.new(input_keys_name, input_stream_name, input_inject_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
+  let exit = process.new_subject()
+  let assert Ok(_) =
+    musicplayer.new(
+      ui,
+      mpv,
+      input_keys_name,
+      input_stream_name,
+      input_inject_name,
+      exit,
+    )
+  process.receive_forever(exit)
 }

src/musicplayer/control.gleam

@@ -4,27 +4,21 @@ 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))
+    key.Char(char) -> char_control(char)
     _ -> Error(Nil)
   }
 }
 
-fn char_control(char: String) -> Control {
+fn char_control(char: String) -> Result(Control, Nil) {
   case char {
-    " " -> TogglePlayPause
-    "/" -> Search
-    "q" -> Exit
-    _ -> Raw(char)
+    " " -> Ok(TogglePlayPause)
+    "/" -> Ok(Search)
+    "q" -> Ok(Exit)
+    _ -> Error(Nil)
   }
 }

src/musicplayer/input/input.gleam

@@ -1,15 +1,47 @@
-import gleam/erlang/process.{type Name}
+import gleam/erlang/process.{type Name, type Subject}
 
 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 {
+// 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)
-      key.read_input_until_key(input_keys)
+      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.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

@@ -1,21 +1,20 @@
 import gleam/erlang/atom
 import gleam/erlang/process.{type Subject}
 import gleam/list
+import gleam/string
 
 import musicplayer/input/internal as internal_input
 
 pub type Key {
-  Continue(buffer: List(String))
   Char(String)
 
+  Input(String)
   Left
   Right
   Up
   Down
 
-  Return
-  Backspace
-
+  Continue(buffer: List(String))
   Unknown
 }
 
@@ -24,9 +23,8 @@ pub const esc = "\u{001B}"
 // control sequence introducer
 pub const csi = "["
 
-pub const return = "\r"
-
-pub const backspace = "\u{007F}"
+// input introducer
+pub const input_introducer = "::"
 
 pub fn from_list(l: List(String)) -> Key {
   case l {
@@ -37,9 +35,18 @@ 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 {
+        // Return
+        "\r" -> Input(cmd)
+        // Backspace
+        "\u{007F}" -> Continue([ii, string.drop_end(cmd, 1)])
+        _ -> 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 +60,20 @@ pub fn start_raw_shell() {
   internal_input.shell_start_interactive(#(no_shell, raw))
 }
 
-pub fn read_input_until_key(input_keys: Subject(Key)) -> Nil {
-  read_input_until_key_loop([], input_keys)
-}
-
-pub fn read_input_until_key_loop(
+pub fn read_input_until_key(
   l: List(String),
-  input_keys: Subject(Key),
-) -> Nil {
+  input_stream: Subject(List(String)),
+) -> Key {
   case
     internal_input.read_input()
     |> list.wrap
     |> list.append(l, _)
     |> from_list
   {
-    Continue(l) -> read_input_until_key_loop(l, input_keys)
-    k -> {
-      process.send(input_keys, k)
-      read_input_until_key_loop([], input_keys)
-    }
+    Continue(l) -> {
+      process.send(input_stream, l)
+      read_input_until_key(l, input_stream)
+    }
+    k -> k
   }
 }

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

@@ -24,7 +24,7 @@ pub fn new() -> Result(Subject(Control), String) {
         |> actor.start
       {
         Error(start_error) ->
-          Error("Could not start mpv: " <> string.inspect(start_error))
+          Error("Could not start actor: " <> string.inspect(start_error))
         Ok(actor.Started(data: mpv, ..)) -> Ok(mpv)
       }
     }
@@ -37,6 +37,8 @@ fn handle_message(
 ) -> actor.Next(State(socket), 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

src/musicplayer/musicplayer.gleam

@@ -1,31 +1,21 @@
-import gleam/erlang/process.{type Name, type Pid, type Subject}
+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/logging/logging
 import musicplayer/mpv/control as mpv_control
-import musicplayer/time/time
 import musicplayer/ui/control as ui_control
-import musicplayer/ui/layout
+import musicplayer/ui/section
 
-type Mode {
-  Idle
-  Searching
-}
-
-type Input {
-  Input(capturing: Bool, content: String)
-}
-
-type State {
+type State(ui, mpv, input_inject, exit) {
   State(
-    mode: Mode,
-    input: Input,
     ui: Subject(ui_control.Control),
     mpv: Subject(mpv_control.Control),
+    input_inject: Subject(Key),
+    exit: Subject(Nil),
   )
 }
 
@@ -33,166 +23,105 @@ pub fn new(
   ui: Subject(ui_control.Control),
   mpv: Subject(mpv_control.Control),
   input_keys_name: Name(Key),
-) -> Result(Pid, String) {
+  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 = Input(False, "")
+  let input_stream = process.named_subject(input_stream_name)
+  let input_inject = process.named_subject(input_inject_name)
 
   case
-    actor.new(State(Idle, input, ui, mpv))
+    actor.new(State(ui, 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(pid:, data: musicplayer)) -> {
-      logging.log("musicplayer - started")
+    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() { update_playback_time_loop(mpv, ui, 250) })
+      process.spawn(fn() {
+        let assert Ok(_) = process.register(process.self(), input_stream_name)
+        temp_input_stream(input_stream)
+      })
 
-      Ok(pid)
+      Ok(Nil)
     }
   }
 }
 
-fn handle_message(state: State, control: Control) -> actor.Next(State, Control) {
+fn handle_message(
+  state: State(ui, mpv, input_inject, exit),
+  control: Control,
+) -> actor.Next(State(ui, mpv, input_inject, exit), Control) {
   case control {
     control.Search -> {
-      logging.log("musicplayer - initiating search")
+      process.send(state.input_inject, key.Continue([key.input_introducer]))
 
-      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) })
+    control.TogglePlayPause -> {
+      echo "toggling play/pause"
 
-      // Reset terminal state (show cursor etc.)
-      process.call(state.ui, 1000, fn(reply_to) { ui_control.Exit(reply_to) })
+      process.send(state.mpv, mpv_control.TogglePlayPause)
 
-      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)
-  // TODO only update if state is playing
-  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) {
+        process.call(state.mpv, 1000, fn(reply_to) {
           mpv_control.GetPlaybackTime(reply_to)
         })
       {
         Error(err) ->
           process.send(
-        ui,
+            state.ui,
             ui_control.UpdateState(
-          layout.PlaybackTime,
+              section.PlaybackTime,
               "playback time: N/A (err: " <> err.details <> ")",
             ),
           )
 
         Ok(mpv_control.PlaybackTime(data: playback_time)) ->
           process.send(
-        ui,
+            state.ui,
             ui_control.UpdateState(
-          layout.PlaybackTime,
-          "playback time: " <> time.to_duration_string(playback_time),
+              section.PlaybackTime,
+              "playback time: " <> float.to_string(playback_time),
             ),
           )
       }
+
+      actor.continue(state)
+    }
+    control.Exit -> {
+      // 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) })
+
+      // End main process
+      process.send(state.exit, Nil)
+      actor.stop()
+    }
+  }
 }
 
-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
+/// `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.new_selector()
-    |> process.select(input_keys)
-    |> process.selector_receive_forever
+    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/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,9 +1,8 @@
 import gleam/erlang/process.{type Subject}
 
-import musicplayer/ui/layout.{type Section}
+import musicplayer/ui/section.{type Section}
 
 pub type Control {
-  UpdateDimensions(columns: Int, rows: Int)
   UpdateState(section: Section, content: String)
 
   Exit(reply_to: Subject(Nil))

src/musicplayer/ui/internal.gleam

@@ -1,27 +1,15 @@
-import gleam/int
 import gleam/io
 
+pub fn print(content: String) -> Nil {
+  io.print(content <> "\n")
+}
+
 // https://en.wikipedia.org/wiki/ANSI_escape_code#Control_Sequence_Introducer_commands
 
-pub const move_to_home = "\u{001B}[H"
-
-pub const disable_auto_wrap = "\u{001B}[?7l"
-
-pub const enable_auto_wrap = "\u{001B}[?7h"
-
-pub fn update(frame: String) -> Nil {
-  io.print(disable_auto_wrap <> move_to_home <> frame <> enable_auto_wrap)
-}
-
 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 hide_cursor() -> Nil {
   io.print("\u{001B}[?25l")
 }
@@ -29,13 +17,3 @@ pub fn hide_cursor() -> Nil {
 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,246 +0,0 @@
-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}
-
-pub const root_section = "reserved_root_section"
-
-pub type Section {
-  Section(String)
-
-  Header
-  Search
-  PlaybackTime
-}
-
-pub type Dimension {
-  Percent(width: Int, height: Int)
-  // TODO add Flex that flows
-}
-
-pub type Style {
-  Style(dimensions: Dimension)
-}
-
-pub type Node {
-  Row(content: String, style: Style, children: List(Section))
-  Cell(content: String, style: Style)
-}
-
-pub type ViewIdx =
-  Int
-
-pub type View =
-  dict.Dict(Section, Node)
-
-// Layout consists of a list Views, and only one View is rendered at a time
-pub type Layout {
-  Layout(
-    columns: Int,
-    rows: Int,
-    current_view: ViewIdx,
-    views: dict.Dict(ViewIdx, View),
-  )
-}
-
-pub fn new(
-  columns: Int,
-  rows: Int,
-  views: List(List(#(Section, Node))),
-) -> Layout {
-  let views =
-    list.index_map(views, fn(view_nodes, i) { #(i, view_nodes) })
-    |> list.fold(dict.new(), fn(view_acc, iv) {
-      let #(i, view_nodes) = iv
-
-      dict.insert(view_acc, i, view_loop(i, view_nodes))
-    })
-
-  Layout(columns:, rows:, current_view: 0, views:)
-}
-
-fn view_loop(i: ViewIdx, view_nodes: List(#(Section, Node))) -> View {
-  let children =
-    view_nodes
-    |> list.flat_map(fn(node) {
-      case pair.second(node) {
-        Row(children: c, ..) -> c
-        Cell(..) -> []
-      }
-    })
-    |> set.from_list
-
-  // All sections that are not children of other nodes will be added as
-  // children to the root
-  let orphans =
-    view_nodes
-    |> list.map(pair.first)
-    |> list.filter(fn(node) { !set.contains(children, node) })
-
-  dict.from_list(view_nodes)
-  |> dict.insert(
-    Section(string.append("view_", string.inspect(i))),
-    Row(
-      content: "",
-      style: Style(dimensions: Percent(width: 100, height: 100)),
-      children: orphans,
-    ),
-  )
-}
-
-pub fn update_section(
-  layout: Layout,
-  section: Section,
-  content: String,
-) -> Layout {
-  case dict.get(layout.views, layout.current_view) {
-    Error(_) -> layout
-    Ok(view) ->
-      case dict.get(view, section) {
-        Error(_) -> layout
-        Ok(node) -> {
-          let updated_node = case node {
-            Cell(..) -> Cell(..node, content: content)
-            Row(..) -> Row(..node, content: content)
-          }
-
-          let updated_view = dict.insert(view, section, updated_node)
-
-          Layout(
-            ..layout,
-            views: dict.insert(layout.views, layout.current_view, updated_view),
-          )
-        }
-      }
-  }
-}
-
-pub fn update_dimensions(layout: Layout, columns: Int, rows: Int) -> Layout {
-  Layout(..layout, columns:, rows:)
-}
-
-pub fn render(layout: Layout) -> Nil {
-  [layout.columns, layout.rows]
-  |> list.map(int.to_string)
-  |> string.join(" ")
-  |> string.append("layout - render: ", _)
-  |> logging.log
-
-  let context =
-    RenderContext(
-      parent_width: layout.columns,
-      parent_height: layout.rows,
-      parent_top_left_x: 1,
-      parent_top_left_y: 1,
-      position_index: 0,
-    )
-
-  case dict.get(layout.views, layout.current_view) {
-    Error(_) -> Nil
-    Ok(view) -> {
-      let buffer: Buffer = dict.new()
-
-      render_loop(
-        view,
-        context,
-        Section(string.append("view_", string.inspect(layout.current_view))),
-        buffer,
-      )
-      |> plot.flush_buffer(layout.columns, layout.rows)
-      |> internal.update
-    }
-  }
-}
-
-pub type RenderContext {
-  RenderContext(
-    parent_width: Int,
-    parent_height: Int,
-    parent_top_left_x: Int,
-    parent_top_left_y: Int,
-    position_index: Int,
-  )
-}
-
-pub fn render_loop(
-  view: View,
-  context: RenderContext,
-  from: Section,
-  buffer: Buffer,
-) -> Buffer {
-  case dict.get(view, from) {
-    Error(_) -> buffer
-    Ok(node) -> {
-      // Margin between container and the node being rendered
-      let margin = 2
-
-      let #(node_width, node_height) = case node.style.dimensions {
-        Percent(width:, height:) -> {
-          let width = { context.parent_width * width } / 100
-          let height = { context.parent_height * height } / 100
-
-          #(width, height)
-        }
-      }
-
-      // Check if this node should be placed to the left or below the parent
-      let #(node_top_left_x, node_top_left_y) = case node {
-        Row(..) -> #(
-          context.parent_top_left_x,
-          context.parent_top_left_y + { context.position_index * node_height },
-        )
-        Cell(..) -> #(
-          context.parent_top_left_x + { context.position_index * node_width },
-          context.parent_top_left_y,
-        )
-      }
-
-      let parent =
-        plot.box(
-          buffer,
-          node_top_left_x,
-          node_top_left_y,
-          node_width,
-          node_height,
-        )
-        |> plot.text(node.content, node_top_left_x, node_top_left_y)
-
-      case node {
-        Cell(..) -> parent
-        Row(children:, ..) -> {
-          list.index_map(children, fn(child, i) { #(i, child) })
-          |> list.fold(parent, fn(acc_buffer, ic) {
-            let #(i, child) = ic
-
-            let #(child_width, child_height) = case node.style.dimensions {
-              Percent(width:, height:) -> {
-                let width = { { context.parent_width * width } / 100 } - margin
-                let height =
-                  { { context.parent_height * height } / 100 } - margin
-
-                #(width, height)
-              }
-            }
-
-            let context =
-              RenderContext(
-                parent_width: child_width,
-                parent_height: child_height,
-                parent_top_left_x: context.parent_top_left_x + 1,
-                parent_top_left_y: context.parent_top_left_y + 1,
-                position_index: i,
-              )
-
-            render_loop(view, context, child, acc_buffer)
-          })
-        }
-      }
-    }
-  }
-}

src/musicplayer/ui/layout_examples/layout_examples.gleam

@@ -1,58 +0,0 @@
-import musicplayer/ui/internal
-import musicplayer/ui/layout.{Percent, Section, Style}
-import musicplayer/ui/layout_examples/wait_for_input.{wait_for_input}
-
-pub fn main() {
-  let assert Ok(columns) = internal.io_get_columns()
-  let assert Ok(rows) = internal.io_get_rows()
-
-  two_rows_with_cells(columns, rows)
-  |> layout.render
-
-  wait_for_input()
-}
-
-/// Two rows:
-/// First row has two cells
-/// Second row has no cells
-fn two_rows_with_cells(columns: Int, rows: Int) -> layout.Layout {
-  let views = [
-    [
-      #(
-        Section("Row1"),
-        layout.Row(
-          content: "row 1",
-          style: Style(dimensions: Percent(width: 100, height: 50)),
-          children: [
-            Section("A"),
-            Section("B"),
-          ],
-        ),
-      ),
-      #(
-        Section("A"),
-        layout.Cell(
-          content: "cell 1",
-          style: Style(dimensions: Percent(width: 50, height: 50)),
-        ),
-      ),
-      #(
-        Section("B"),
-        layout.Cell(
-          content: "cell 2",
-          style: Style(dimensions: Percent(width: 50, height: 50)),
-        ),
-      ),
-      #(
-        Section("Row2"),
-        layout.Row(
-          content: "row 2",
-          style: Style(dimensions: Percent(width: 50, height: 50)),
-          children: [],
-        ),
-      ),
-    ],
-  ]
-
-  layout.new(columns, rows, views)
-}

src/musicplayer/ui/layout_examples/wait_for_input.gleam

@@ -1,15 +0,0 @@
-import gleam/erlang/process.{type Name}
-
-import musicplayer/input/input
-import musicplayer/input/key.{type Key}
-
-pub fn wait_for_input() {
-  let input_keys_name: Name(Key) = process.new_name("input_keys")
-  let assert Ok(_) = process.register(process.self(), input_keys_name)
-
-  input.new(input_keys_name)
-
-  process.new_selector()
-  |> process.select(process.named_subject(input_keys_name))
-  |> process.selector_receive_forever
-}

src/musicplayer/ui/plot.gleam

@@ -1,71 +0,0 @@
-import gleam/dict.{type Dict}
-import gleam/list
-import gleam/string
-
-pub type Buffer =
-  Dict(#(Int, Int), String)
-
-pub fn flush_buffer(buffer: Buffer, columns: Int, rows: Int) -> String {
-  list.range(1, rows)
-  |> list.map(fn(y) {
-    list.range(1, columns)
-    |> list.map(fn(x) {
-      case dict.get(buffer, #(x, y)) {
-        Ok(char) -> char
-        Error(_) -> " "
-      }
-    })
-    |> string.join("")
-  })
-  |> string.join("\r\n")
-}
-
-pub fn text(buffer: Buffer, text: String, x: Int, y: Int) -> Buffer {
-  text
-  |> string.to_graphemes
-  |> list.index_fold(buffer, fn(acc, char, i) {
-    dict.insert(acc, #(x + i, y), char)
-  })
-}
-
-pub fn box(buffer: Buffer, x: Int, y: Int, width: Int, height: Int) -> Buffer {
-  let box_chars = #("┌", "┐", "└", "┘", "─", "│")
-  let #(tl, tr, bl, br, hor, ver) = box_chars
-
-  case width < 2 || height < 2 {
-    True -> buffer
-    False -> {
-      buffer
-      |> dict.insert(#(x, y), tl)
-      |> dict.insert(#(x + width - 1, y), tr)
-      |> dict.insert(#(x, y + height - 1), bl)
-      |> dict.insert(#(x + width - 1, y + height - 1), br)
-      |> horizontal_line(x + 1, y, width - 2, hor)
-      |> horizontal_line(x + 1, y + height - 1, width - 2, hor)
-      |> vertical_line(x, y + 1, height - 2, ver)
-      |> vertical_line(x + width - 1, y + 1, height - 2, ver)
-    }
-  }
-}
-
-fn horizontal_line(
-  buffer: Buffer,
-  x: Int,
-  y: Int,
-  len: Int,
-  char: String,
-) -> Buffer {
-  list.range(0, len - 1)
-  |> list.fold(buffer, fn(acc, i) { dict.insert(acc, #(x + i, y), char) })
-}
-
-fn vertical_line(
-  buffer: Buffer,
-  x: Int,
-  y: Int,
-  len: Int,
-  char: String,
-) -> Buffer {
-  list.range(0, len - 1)
-  |> list.fold(buffer, fn(acc, i) { dict.insert(acc, #(x, y + i), char) })
-}

src/musicplayer/ui/section.gleam

@@ -0,0 +1,13 @@
+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,80 +1,39 @@
+import gleam/dict
 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}
+import musicplayer/ui/internal as ui_internal
+import musicplayer/ui/section.{type Section, type SectionContent, Content}
 
 pub type State(redraw, content) {
-  State(redraw: Subject(Layout), layout: Layout)
+  State(redraw: Subject(SectionContent), sections: SectionContent)
 }
 
 pub fn new() -> Result(Subject(Control), String) {
   let redraw_name = process.new_name("redraw")
-  let redraw: Subject(Layout) = process.named_subject(redraw_name)
+  let redraw: Subject(String) = process.named_subject(redraw_name)
 
-  let layout =
-    [
-      [
-        #(
-          layout.Header,
-          layout.Row(
-            content: "Foo (1) | Bar (2) | Baz (3)",
-            style: layout.Style(dimensions: layout.Percent(
-              width: 100,
-              height: 33,
-            )),
-            children: [],
-          ),
-        ),
-        #(
-          layout.Search,
-          layout.Row(
-            content: "",
-            style: layout.Style(dimensions: layout.Percent(
-              width: 100,
-              height: 33,
-            )),
-            children: [],
-          ),
-        ),
-        #(
-          layout.PlaybackTime,
-          layout.Row(
-            content: "00:00",
-            style: layout.Style(dimensions: layout.Percent(
-              width: 100,
-              height: 33,
-            )),
-            children: [],
-          ),
-        ),
-      ],
-    ]
-    |> layout.new(0, 0, _)
+  let sections =
+    dict.from_list([
+      #(section.Header, Content("musicplayer:")),
+      #(section.PlaybackTime, Content("")),
+    ])
 
   case
-    actor.new(State(redraw, layout))
+    actor.new(State(redraw, sections))
     |> 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()
+        ui_internal.clear_screen()
+        ui_internal.hide_cursor()
 
         redraw_loop(redraw)
       })
@@ -85,59 +44,31 @@ pub fn new() -> Result(Subject(Control), String) {
 }
 
 fn handle_message(
-  state: State(redraw, layout),
+  state: State(redraw, content),
   control: Control,
-) -> actor.Next(State(redraw, layout), Control) {
+) -> actor.Next(State(redraw, content), Control) {
   case control {
-    control.UpdateDimensions(columns, rows) -> {
-      let current_dimensions = #(state.layout.columns, state.layout.rows)
-
-      case #(columns, rows) == current_dimensions {
-        True -> actor.continue(state)
-        False -> {
-          [columns, rows]
-          |> list.map(int.to_string)
-          |> string.join(" ")
-          |> string.append("ui - updating dimensions: ", _)
-          |> logging.log
-
-          let layout = layout.update_dimensions(state.layout, columns, rows)
-
-          process.send(state.redraw, layout)
-          actor.continue(State(..state, layout:))
-        }
-      }
-    }
     control.UpdateState(section, content) -> {
-      let layout = layout.update_section(state.layout, section, content)
+      let content = dict.insert(state.content, section, content)
+      let state = State(..state, content:)
 
-      actor.send(state.redraw, layout)
-      actor.continue(State(..state, layout:))
+      actor.send(state.redraw, content)
+      actor.continue(state)
     }
 
     control.Exit(reply_to) -> {
-      internal.show_cursor()
+      ui_internal.show_cursor()
       process.send(reply_to, Nil)
       actor.stop()
     }
   }
 }
 
-fn redraw_loop(redraw: Subject(Layout)) -> Nil {
-  process.receive_forever(redraw)
-  |> layout.render
+fn redraw_loop(redraw: Subject(SectionContent)) -> Nil {
+  let content = process.receive_forever(redraw)
+
+  ui_internal.clear_screen()
+  ui_internal.print(content)
 
   redraw_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)
-}

test/musicplayer/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 musicplayer/input/key.{type Key, Char, csi, esc, input_introducer as ii}
 
 pub fn main() -> Nil {
   gleeunit.main()
@@ -27,8 +27,11 @@ pub fn key_from_list_test() {
   ]
 
   let input_tests = [
-    TestCase([return], key.Return),
-    TestCase([backspace], key.Backspace),
+    TestCase([ii], key.Continue([ii])),
+    TestCase([ii, "a"], key.Continue([ii, "a"])),
+    TestCase([ii, "a", "b"], key.Continue([ii, "ab"])),
+    TestCase([ii, "ab", "\u{007F}"], key.Continue([ii, "a"])),
+    TestCase([ii, "ab", "\r"], key.Input("ab")),
   ]
 
   let test_cases = [base_tests, char_tests, escape_tests, input_tests]

test/musicplayer/mpv/mpv_test.gleam

@@ -1,6 +1,6 @@
 import gleeunit
 
-import musicplayer/mpv/internal
+import musicplayer/mpv/internal as control_internal
 
 pub fn main() -> Nil {
   gleeunit.main()
@@ -10,6 +10,6 @@ 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)
+  let assert Ok(data) = control_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/musicplayer/ui/layout_test.gleam

@@ -1,116 +0,0 @@
-import gleam/dict
-import gleam/io
-import gleam/string
-import gleeunit
-import gleeunit/should
-
-import musicplayer/ui/layout.{Percent, RenderContext, Section, Style}
-import musicplayer/ui/plot
-
-pub fn main() -> Nil {
-  gleeunit.main()
-}
-
-pub fn percent_layout_test() {
-  let views = [
-    [
-      #(
-        Section("Row1"),
-        layout.Row(
-          content: "row 1",
-          style: Style(dimensions: Percent(width: 100, height: 50)),
-          children: [
-            Section("A"),
-            Section("B"),
-          ],
-        ),
-      ),
-      #(
-        Section("A"),
-        layout.Cell(
-          content: "cell 1",
-          style: Style(dimensions: Percent(width: 50, height: 100)),
-        ),
-      ),
-      #(
-        Section("B"),
-        layout.Cell(
-          content: "cell 2",
-          style: Style(dimensions: Percent(width: 50, height: 100)),
-        ),
-      ),
-      #(
-        Section("Row2"),
-        layout.Row(
-          content: "row 1",
-          style: Style(dimensions: Percent(width: 100, height: 50)),
-          children: [],
-        ),
-      ),
-    ],
-  ]
-
-  let columns = 80
-  let rows = 20
-  let layout = layout.new(columns, rows, views)
-
-  let expected =
-    "
-┌──────────────────────────────────────────────────────────────────────────────┐
-│row 1────────────────────────────────────────────────────────────────────────┐│
-││cell 1───────────────────────────────┐cell 2───────────────────────────────┐││
-│││                                    ││                                    │││
-│││                                    ││                                    │││
-│││                                    ││                                    │││
-│││                                    ││                                    │││
-│││                                    ││                                    │││
-││└────────────────────────────────────┘└────────────────────────────────────┘││
-│└────────────────────────────────────────────────────────────────────────────┘│
-│row 1────────────────────────────────────────────────────────────────────────┐│
-││                                                                            ││
-││                                                                            ││
-││                                                                            ││
-││                                                                            ││
-││                                                                            ││
-││                                                                            ││
-││                                                                            ││
-│└────────────────────────────────────────────────────────────────────────────┘│
-└──────────────────────────────────────────────────────────────────────────────┘
-"
-    |> string.replace(each: "\n", with: "\r\n")
-    |> string.trim
-
-  let context =
-    RenderContext(
-      parent_width: layout.columns,
-      parent_height: layout.rows,
-      parent_top_left_x: 1,
-      parent_top_left_y: 1,
-      position_index: 0,
-    )
-
-  let assert Ok(view) = dict.get(layout.views, layout.current_view)
-
-  let flushed =
-    layout.render_loop(
-      view,
-      context,
-      Section(string.append("view_", string.inspect(layout.current_view))),
-      dict.new(),
-    )
-    |> plot.flush_buffer(layout.columns, layout.rows)
-
-  case flushed == expected {
-    True -> Nil
-    False -> {
-      io.println("Test failed")
-      io.println("Expected:")
-      io.println(string.trim(expected))
-
-      io.println("Got:")
-      io.println(flushed)
-
-      should.equal(flushed, expected)
-    }
-  }
-}