working-but-not-columnwise

To avoid having to pass around a `Subject`

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,40 +1,22 @@
-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)
-}
-
-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) {
+pub fn log(content: String) -> Nil {
-  case control {
-    control.Write(content) -> {
   let log_line =
     timestamp.system_time()
     |> timestamp.to_rfc3339(calendar.utc_offset)
@@ -43,16 +25,6 @@ fn handle_message(state: State, control: Control) -> actor.Next(State, Control)
     <> "\n"
 
   // Ignore any logging errors
-      let _ = simplifile.append(state.filepath, log_line)
+  let _ = simplifile.append(filepath, log_line)
-      actor.continue(state)
+  Nil
-    }
-    control.Exit(reply_to) -> {
-      process.send(reply_to, Nil)
-      actor.stop()
-    }
-  }
-}
-
-pub fn log(logger: Subject(Control), content: String) -> Nil {
-  process.send(logger, control.Write(content))
 }

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,7 +100,6 @@ 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
@@ -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()
     }

src/musicplayer/ui/layout.gleam

@@ -1,11 +1,9 @@
 import gleam/dict
-import gleam/erlang/process.{type Subject}
 import gleam/float
 import gleam/int
 import gleam/list
 import gleam/string
 
-import musicplayer/logging/control as logging_control
 import musicplayer/logging/logging
 import musicplayer/ui/internal
 
@@ -83,13 +81,13 @@ 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) -> Nil {
   internal.clear_screen()
   [layout.width, layout.height]
   |> list.map(int.to_string)
   |> string.join(" ")
   |> string.append("layout - render: ", _)
-  |> logging.log(logger, _)
+  |> logging.log
 
   let container_width = int.to_float(layout.width)
   let container_height = int.to_float(layout.height)
@@ -103,7 +101,6 @@ pub fn render(logger: Subject(logging_control.Control), layout: Layout) -> Nil {
     container_top_left_x,
     container_top_left_y,
     Root,
-    logger,
   )
 }
 
@@ -114,7 +111,6 @@ pub fn render_loop(
   container_top_left_x: Int,
   container_top_left_y: Int,
   from: Section,
-  logger: Subject(logging_control.Control),
 ) -> Nil {
   let margin = 2.0
 
@@ -137,38 +133,30 @@ pub fn render_loop(
         let cx = container_top_left_x + 1
         let cy = container_top_left_y + 1
 
-        render_loop(layout, cw, ch, cx, cy, child, logger)
+        render_loop(layout, cw, ch, cx, cy, child)
       })
 
-      logging.log(logger, "section: " <> string.inspect(from))
+      logging.log("section: " <> string.inspect(from))
-      logging.log(
+      logging.log("container width: " <> float.to_string(container_width))
-        logger,
+      logging.log("container height: " <> float.to_string(container_height))
-        "container width: " <> float.to_string(container_width),
-      )
-      logging.log(
-        logger,
-        "container height: " <> float.to_string(container_height),
-      )
 
       let width =
-        container_width
+        container_width *. { int.to_float(node.width_percent) /. 100.0 }
-        *. { int.to_float(node.width_percent) /. int.to_float(100) }
         |> float.floor
         |> float.truncate
 
       let height =
-        container_height
+        container_height *. { int.to_float(node.height_percent) /. 100.0 }
-        *. { int.to_float(node.height_percent) /. int.to_float(100) }
         |> float.floor
         |> float.truncate
 
-      logging.log(logger, "width: " <> int.to_string(width))
+      logging.log("width: " <> int.to_string(width))
-      logging.log(logger, "height: " <> int.to_string(height))
+      logging.log("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("cx: " <> int.to_string(cx))
-      logging.log(logger, "cy: " <> int.to_string(cy))
+      logging.log("cy: " <> int.to_string(cy))
 
       draw_box(cx, cy, width, height)
       // Box heading

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_loop(redraw)
       })
 
       Ok(ui)
@@ -68,7 +61,7 @@ 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)
 
@@ -92,28 +85,21 @@ fn handle_message(
   }
 }
 
-fn redraw_loop(
+fn redraw_loop(redraw: Subject(Layout)) -> Nil {
-  logger: Subject(logging_control.Control),
-  redraw: Subject(Layout),
-) -> Nil {
   process.receive_forever(redraw)
-  |> layout.render(logger, _)
+  |> layout.render
 
-  redraw_loop(logger, redraw)
+  redraw_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)
 }