Use StringTree to store the rendered layout

And print the entire layout at once

src/musicplayer.gleam

@@ -8,15 +8,14 @@ import musicplayer/musicplayer
 import musicplayer/ui/ui
 
 pub fn main() -> Nil {
-  let assert Ok(logger) = logging.new("/tmp/musicplayer.log")
+  let assert Ok(_) = logging.initialize()
 
   let input_keys_name: Name(Key) = process.new_name("input_keys")
   input.new(input_keys_name)
 
-  let assert Ok(ui) = ui.new(logger)
+  let assert Ok(ui) = ui.new()
   let assert Ok(mpv) = mpv.new()
-  let assert Ok(musicplayer_pid) =
+  let assert Ok(musicplayer_pid) = musicplayer.new(ui, mpv, input_keys_name)
-    musicplayer.new(logger, ui, mpv, input_keys_name)
 
   let monitor = process.monitor(musicplayer_pid)
   process.new_selector()

src/musicplayer/logging/control.gleam

@@ -1,7 +1,5 @@
-import gleam/erlang/process.{type Subject}
-
 pub type Control {
   Write(String)
 
-  Exit(reply_to: Subject(Nil))
+  Exit
 }

src/musicplayer/logging/logging.gleam

@@ -1,58 +1,30 @@
-import gleam/erlang/process.{type Subject}
-import gleam/otp/actor
 import gleam/result
 import gleam/string
 import gleam/time/calendar
 import gleam/time/timestamp
 import simplifile
 
-import musicplayer/logging/control.{type Control}
+const filepath = "/tmp/musicplayer.log"
 
-type State {
+pub fn initialize() -> Result(Nil, String) {
-  State(filepath: String)
+  case simplifile.is_file(filepath) {
-}
+    Ok(True) -> Ok(Nil)
-
+    _ -> simplifile.create_file(filepath)
-pub fn new(filepath: String) -> Result(Subject(Control), String) {
-  use _ <- result.try(
-    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)
-    }),
-  )
-
-  actor.new(State(filepath:))
-  |> actor.on_message(handle_message)
-  |> actor.start
-  |> result.map_error(fn(start_error) {
-    "Could not start logger: " <> string.inspect(start_error)
-  })
-  |> result.map(fn(started) { started.data })
-}
-
-fn handle_message(state: State, control: Control) -> actor.Next(State, Control) {
-  case control {
-    control.Write(content) -> {
-      let log_line =
-        timestamp.system_time()
-        |> timestamp.to_rfc3339(calendar.utc_offset)
-        <> ": "
-        <> content
-        <> "\n"
-
-      // Ignore any logging errors
-      let _ = simplifile.append(state.filepath, log_line)
-      actor.continue(state)
-    }
-    control.Exit(reply_to) -> {
-      process.send(reply_to, Nil)
-      actor.stop()
-    }
   }
+  |> result.map_error(fn(e) {
+    "Could not access or create log file: " <> string.inspect(e)
+  })
 }
 
-pub fn log(logger: Subject(Control), content: String) -> Nil {
+pub fn log(content: String) -> Nil {
-  process.send(logger, control.Write(content))
+  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/musicplayer.gleam

@@ -5,7 +5,6 @@ import gleam/string
 
 import musicplayer/control.{type Control}
 import musicplayer/input/key.{type Key}
-import musicplayer/logging/control as logging_control
 import musicplayer/logging/logging
 import musicplayer/mpv/control as mpv_control
 import musicplayer/time/time
@@ -25,14 +24,12 @@ type State {
   State(
     mode: Mode,
     input: Input,
-    logger: Subject(logging_control.Control),
     ui: Subject(ui_control.Control),
     mpv: Subject(mpv_control.Control),
   )
 }
 
 pub fn new(
-  logger: Subject(logging_control.Control),
   ui: Subject(ui_control.Control),
   mpv: Subject(mpv_control.Control),
   input_keys_name: Name(Key),
@@ -42,14 +39,14 @@ pub fn new(
   let input = Input(False, "")
 
   case
-    actor.new(State(Idle, input, logger, ui, mpv))
+    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(logger, "musicplayer - started")
+      logging.log("musicplayer - started")
       process.spawn(fn() {
         let assert Ok(_) = process.register(process.self(), input_keys_name)
         handle_key(musicplayer, input_keys)
@@ -65,7 +62,7 @@ pub fn new(
 fn handle_message(state: State, control: Control) -> actor.Next(State, Control) {
   case control {
     control.Search -> {
-      logging.log(state.logger, "musicplayer - initiating search")
+      logging.log("musicplayer - initiating search")
 
       update_search(state.ui, "searching: ")
 
@@ -79,7 +76,7 @@ fn handle_message(state: State, control: Control) -> actor.Next(State, Control)
     }
 
     control.Raw(content) -> {
-      logging.log(state.logger, "musicplayer - recieved raw input: " <> content)
+      logging.log("musicplayer - recieved raw input: " <> content)
 
       let content = case state.mode {
         Idle -> state.input.content
@@ -93,7 +90,7 @@ fn handle_message(state: State, control: Control) -> actor.Next(State, Control)
       actor.continue(State(..state, input: Input(..state.input, content:)))
     }
     control.Backspace -> {
-      logging.log(state.logger, "musicplayer - recieved backspace")
+      logging.log("musicplayer - recieved backspace")
 
       let content = case state.mode {
         Idle -> state.input.content
@@ -103,11 +100,10 @@ fn handle_message(state: State, control: Control) -> actor.Next(State, Control)
     }
     control.Return -> {
       logging.log(
-        state.logger,
         "musicplayer - recieved return. `input.capture`: "
-          <> "'"
+        <> "'"
-          <> state.input.content
+        <> state.input.content
-          <> "'",
+        <> "'",
       )
 
       // Note: state.input.content is now the final input, use it
@@ -123,26 +119,21 @@ fn handle_message(state: State, control: Control) -> actor.Next(State, Control)
     }
 
     control.TogglePlayPause -> {
-      logging.log(state.logger, "musicplayer - toggling play/pause")
+      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(state.logger, "musicplayer - initiating musicplayer shutdown")
+      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(state.logger, "musicplayer - stopped")
+      logging.log("musicplayer - stopped")
-
-      // Close logger (NOOP)
-      process.call(state.logger, 1000, fn(reply_to) {
-        logging_control.Exit(reply_to)
-      })
 
       actor.stop()
     }
@@ -155,7 +146,6 @@ fn update_playback_time_loop(
   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)

src/musicplayer/ui/internal.gleam

@@ -7,9 +7,13 @@ pub fn clear_screen() -> Nil {
   io.print("\u{001B}[2J\u{001B}[H")
 }
 
-pub fn print_at(text: String, x: Int, y: Int) -> Nil {
+pub fn chars_at(chars: String, x: Int, y: Int) -> String {
   let seq = "\u{001B}[" <> int.to_string(y) <> ";" <> int.to_string(x) <> "H"
-  io.print(seq <> text)
+  seq <> chars
+}
+
+pub fn print(chars: String) -> Nil {
+  io.print(chars)
 }
 
 pub fn hide_cursor() -> Nil {

src/musicplayer/ui/layout.gleam

@@ -1,12 +1,7 @@
 import gleam/dict
-import gleam/erlang/process.{type Subject}
-import gleam/float
-import gleam/int
 import gleam/list
-import gleam/string
+import gleam/string_tree.{type StringTree}
 
-import musicplayer/logging/control as logging_control
-import musicplayer/logging/logging
 import musicplayer/ui/internal
 
 pub type Layout {
@@ -20,14 +15,8 @@ pub type Section {
   PlaybackTime
 }
 
-/// A Nodes width and height is in percentage (of the available width/height of its parent Node)
 pub type Node {
-  Node(
+  Node(content: String, x: Int, y: Int, children: List(Section))
-    content: String,
-    width_percent: Int,
-    height_percent: Int,
-    children: List(Section),
-  )
 }
 
 pub fn new() -> Layout {
@@ -35,26 +24,15 @@ pub fn new() -> Layout {
     dict.from_list([
       #(
         Root,
-        Node(content: "", width_percent: 100, height_percent: 100, children: [
+        Node(content: "", x: 0, y: 0, children: [
-          // Header,
+          Header,
-          // Search,
+          Search,
           PlaybackTime,
         ]),
       ),
-      // #(
+      #(Header, Node(content: "Music Player", x: 1, y: 1, children: [])),
-      //   Header,
+      #(Search, Node(content: "", x: 30, y: 1, children: [])),
-      //   Node(content: "Music Player", width: 50, height: 10, children: []),
+      #(PlaybackTime, Node(content: "00:00", x: 1, y: 2, children: [])),
-      // ),
-      // #(Search, Node(content: "", width: 50, height: 10, children: [])),
-      #(
-        PlaybackTime,
-        Node(
-          content: "00:00",
-          width_percent: 50,
-          height_percent: 100,
-          children: [],
-        ),
-      ),
     ])
 
   Layout(0, 0, nodes: nodes)
@@ -83,110 +61,30 @@ pub fn update_dimensions(layout: Layout, width: Int, height: Int) -> Layout {
   Layout(..layout, width:, height:)
 }
 
-pub fn render(logger: Subject(logging_control.Control), layout: Layout) -> Nil {
+pub fn render(layout: Layout, from: Section) -> Nil {
-  internal.clear_screen()
+  string_tree.new()
-  [layout.width, layout.height]
+  |> render_loop(layout, from, _)
-  |> list.map(int.to_string)
+  |> string_tree.to_string
-  |> string.join(" ")
+  |> internal.print
-  |> string.append("layout - render: ", _)
-  |> logging.log(logger, _)
-
-  let container_width = int.to_float(layout.width)
-  let container_height = int.to_float(layout.height)
-  let container_top_left_x = 1
-  let container_top_left_y = 1
-
-  render_loop(
-    layout,
-    container_width,
-    container_height,
-    container_top_left_x,
-    container_top_left_y,
-    Root,
-    logger,
-  )
 }
 
 pub fn render_loop(
   layout: Layout,
-  container_width: Float,
-  container_height: Float,
-  container_top_left_x: Int,
-  container_top_left_y: Int,
   from: Section,
-  logger: Subject(logging_control.Control),
+  into: StringTree,
-) -> Nil {
+) -> StringTree {
-  let margin = 2.0
-
   case dict.get(layout.nodes, from) {
-    Error(_) -> Nil
+    Error(_) -> into
     Ok(node) -> {
-      list.each(node.children, fn(child) {
+      let parent =
-        let cw =
+        string_tree.append(
-          container_width
+          into,
-          *. { int.to_float(node.width_percent) /. 100.0 }
+          internal.chars_at(node.content, node.x, node.y),
-          -. margin
+        )
-          |> float.floor
 
-        let ch =
+      list.fold(node.children, parent, fn(into_acc, child) {
-          container_height
+        render_loop(layout, child, into_acc)
-          *. { int.to_float(node.height_percent) /. 100.0 }
-          -. margin
-          |> float.floor
-
-        let cx = container_top_left_x + 1
-        let cy = container_top_left_y + 1
-
-        render_loop(layout, cw, ch, cx, cy, child, logger)
       })
-
-      logging.log(logger, "section: " <> string.inspect(from))
-      logging.log(
-        logger,
-        "container width: " <> float.to_string(container_width),
-      )
-      logging.log(
-        logger,
-        "container height: " <> float.to_string(container_height),
-      )
-
-      let width =
-        container_width
-        *. { int.to_float(node.width_percent) /. int.to_float(100) }
-        |> float.floor
-        |> float.truncate
-
-      let height =
-        container_height
-        *. { int.to_float(node.height_percent) /. int.to_float(100) }
-        |> float.floor
-        |> float.truncate
-
-      logging.log(logger, "width: " <> int.to_string(width))
-      logging.log(logger, "height: " <> int.to_string(height))
-
-      let cx = container_top_left_x
-      let cy = container_top_left_y
-      logging.log(logger, "cx: " <> int.to_string(cx))
-      logging.log(logger, "cy: " <> int.to_string(cy))
-
-      draw_box(cx, cy, width, height)
-      // Box heading
-      internal.print_at(node.content, cx, cy)
     }
   }
 }
-
-fn draw_box(x: Int, y: Int, width: Int, height: Int) -> Nil {
-  let box_chars = #("┌", "┐", "└", "┘", "─", "│")
-  let #(tl, tr, bl, br, h, v) = box_chars
-  internal.print_at(tl <> string.repeat(h, width - 2) <> tr, x, y)
-
-  list.range(1, height - 2)
-  |> list.each(fn(row) {
-    internal.print_at(v, x, y + row)
-    internal.print_at(v, x + width - 1, y + row)
-  })
-
-  internal.print_at(bl <> string.repeat(h, width - 2) <> br, x, y + height - 1)
-}

src/musicplayer/ui/ui.gleam

@@ -4,30 +4,23 @@ import gleam/list
 import gleam/otp/actor
 import gleam/string
 
-import musicplayer/logging/control as logging_control
 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(
+  State(redraw: Subject(Layout), layout: Layout)
-    logger: Subject(logging_control.Control),
-    redraw: Subject(Layout),
-    layout: Layout,
-  )
 }
 
-pub fn new(
+pub fn new() -> Result(Subject(Control), String) {
-  logger: Subject(logging_control.Control),
-) -> 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(logger, redraw, layout))
+    actor.new(State(redraw, layout))
     |> actor.on_message(handle_message)
     |> actor.start
   {
@@ -36,7 +29,7 @@ pub fn new(
     Ok(actor.Started(data: ui, ..)) -> {
       process.spawn(fn() {
         let update_dimensions_interval_ms = 300
-        update_dimensions_on_interval(logger, ui, update_dimensions_interval_ms)
+        update_dimensions_on_interval(ui, update_dimensions_interval_ms)
       })
 
       process.spawn(fn() {
@@ -45,7 +38,7 @@ pub fn new(
         internal.clear_screen()
         internal.hide_cursor()
 
-        redraw_loop(logger, redraw)
+        redraw_on_update_loop(redraw)
       })
 
       Ok(ui)
@@ -68,20 +61,23 @@ fn handle_message(
           |> list.map(int.to_string)
           |> string.join(" ")
           |> string.append("ui - updating dimensions: ", _)
-          |> logging.log(state.logger, _)
+          |> logging.log
 
-          let layout = layout.update_dimensions(state.layout, width, height)
+          actor.continue(
-
+            State(
-          process.send(state.redraw, layout)
+              ..state,
-          actor.continue(State(..state, layout:))
+              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(..state, layout:))
+      actor.continue(state)
     }
 
     control.Exit(reply_to) -> {
@@ -92,28 +88,23 @@ fn handle_message(
   }
 }
 
-fn redraw_loop(
+fn redraw_on_update_loop(redraw: Subject(Layout)) -> Nil {
-  logger: Subject(logging_control.Control),
+  let layout = process.receive_forever(redraw)
-  redraw: Subject(Layout),
-) -> Nil {
-  process.receive_forever(redraw)
-  |> layout.render(logger, _)
 
-  redraw_loop(logger, redraw)
+  internal.clear_screen()
+  layout.render(layout, layout.Root)
+
+  redraw_on_update_loop(redraw)
 }
 
-fn update_dimensions_on_interval(
+fn update_dimensions_on_interval(ui: Subject(Control), interval_ms: Int) {
-  logger: Subject(logging_control.Control),
-  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(logger, "ui - failed to update dimensions")
+    _, _ -> logging.log("ui - failed to update dimensions")
   }
 
   process.sleep(interval_ms)
-  update_dimensions_on_interval(logger, ui, interval_ms)
+  update_dimensions_on_interval(ui, interval_ms)
 }