13 Commits

Author SHA1 Message Date
Alexander Heldt
68bf808635 Move styling to style and add Border type 2025-12-26 12:13:11 +01:00
Alexander Heldt
4329625cf4 Add margin to box headings 2025-12-26 11:56:24 +01:00
Alexander Heldt
dc7af935ec Replaced Node.content with Node.heading 2025-12-26 11:53:08 +01:00
Alexander Heldt
0c4c085dd0 Add ability to switch View 2025-12-25 19:50:05 +01:00
Alexander Heldt
a3c5c203f1 wip set view 2025-12-25 17:51:32 +01:00
Alexander Heldt
0ef94d7c89 Key handling is state aware
By forwarding all `Key`s to the agent and allow it to decide what should
be done, instead of converting the `Key` to a `Control` and then decide
what should be done
2025-12-25 17:49:34 +01:00
Alexander Heldt
9d54495a4b Update search when Backspace is received 2025-12-21 17:11:36 +01:00
Alexander Heldt
95eaeb60f4 Layout consist of multiple Views 2025-12-21 13:21:14 +01:00
Alexander Heldt
ed69566f6f Plot layout on a grid
Redraw all x,y coordinates on screen Instead of using ANSI codes,
to be avoid clearing the screen which introduces flickering in TMUX
2025-12-20 14:05:25 +01:00
Alexander Heldt
b5965360eb Rework Layout
To be a based on a dictionary, where each node child is just a key in
the dictionary and the value is the node itself
2025-12-11 20:42:49 +01:00
Alexander Heldt
4752ce418b Move render_layout to layout module 2025-11-30 11:53:27 +01:00
Alexander Heldt
df9160b932 Don't prefix internal modules 2025-11-30 11:53:25 +01:00
Alexander Heldt
f9d7b573ac Simplify logging
To avoid having to pass around a `Subject`
2025-11-30 11:50:46 +01:00
15 changed files with 808 additions and 372 deletions

View File

@@ -8,15 +8,14 @@ import musicplayer/musicplayer
import musicplayer/ui/ui import musicplayer/ui/ui
pub fn main() -> Nil { 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") let input_keys_name: Name(Key) = process.new_name("input_keys")
input.new(input_keys_name) 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(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) let monitor = process.monitor(musicplayer_pid)
process.new_selector() process.new_selector()

View File

@@ -1,30 +1,58 @@
import gleam/string
import musicplayer/ui/layout
import musicplayer/input/key.{type Key} import musicplayer/input/key.{type Key}
pub type Mode {
Idle
Searching(input: String)
}
pub type Control { pub type Control {
TogglePlayPause TogglePlayPause
Search Search(input: String, capturing: Bool)
Raw(String) SetView(view_idx: layout.ViewIdx)
Return
Backspace
Exit Exit
} }
pub fn from_key(key: Key) -> Result(Control, Nil) { pub fn from_key(key: Key, mode: Mode) -> Result(Control, Nil) {
case mode {
Idle -> idle_from_key(key)
Searching(input) -> searching_from_key(key, input)
}
}
pub fn idle_from_key(key: Key) -> Result(Control, Nil) {
case key { case key {
key.Return -> Ok(Return) key.Char(char) -> {
key.Backspace -> Ok(Backspace) case char {
key.Char(char) -> Ok(char_control(char)) // Views are zero indexed
"1" -> Ok(SetView(0))
"2" -> Ok(SetView(1))
" " -> Ok(TogglePlayPause)
"/" -> Ok(Search(input: "", capturing: True))
"q" -> Ok(Exit)
// NOOP
_ -> Error(Nil)
}
}
// NOOP
_ -> Error(Nil) _ -> Error(Nil)
} }
} }
fn char_control(char: String) -> Control { pub fn searching_from_key(key: Key, input: String) -> Result(Control, Nil) {
case char { case key {
" " -> TogglePlayPause key.Char(char) -> Ok(Search(input <> char, True))
"/" -> Search key.Backspace -> Ok(Search(string.drop_end(input, 1), True))
"q" -> Exit key.Return -> Ok(Search(input, False))
_ -> Raw(char)
// NOOP
_ -> Error(Nil)
} }
} }

View File

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

View File

@@ -1,58 +1,30 @@
import gleam/erlang/process.{type Subject}
import gleam/otp/actor
import gleam/result import gleam/result
import gleam/string import gleam/string
import gleam/time/calendar import gleam/time/calendar
import gleam/time/timestamp import gleam/time/timestamp
import simplifile 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
} }

View File

@@ -1,151 +1,112 @@
import gleam/erlang/process.{type Name, type Pid, type Subject} import gleam/erlang/process.{type Name, type Pid, type Subject}
import gleam/otp/actor import gleam/otp/actor
import gleam/result
import gleam/string import gleam/string
import musicplayer/control.{type Control} import musicplayer/control.{type Mode}
import musicplayer/input/key.{type Key} import musicplayer/input/key.{type Key}
import musicplayer/logging/control as logging_control
import musicplayer/logging/logging import musicplayer/logging/logging
import musicplayer/mpv/control as mpv_control import musicplayer/mpv/control as mpv_control
import musicplayer/time/time import musicplayer/time/time
import musicplayer/ui/control as ui_control import musicplayer/ui/control as ui_control
import musicplayer/ui/layout import musicplayer/ui/layout
type Mode {
Idle
Searching
}
type Input {
Input(capturing: Bool, content: String)
}
type State { type State {
State( State(
mode: Mode, mode: Mode,
input: Input,
logger: Subject(logging_control.Control),
ui: Subject(ui_control.Control), ui: Subject(ui_control.Control),
mpv: Subject(mpv_control.Control), mpv: Subject(mpv_control.Control),
) )
} }
pub fn new( pub fn new(
logger: Subject(logging_control.Control),
ui: Subject(ui_control.Control), ui: Subject(ui_control.Control),
mpv: Subject(mpv_control.Control), mpv: Subject(mpv_control.Control),
input_keys_name: Name(Key), input_keys_name: Name(Key),
) -> Result(Pid, String) { ) -> Result(Pid, String) {
let input_keys = process.named_subject(input_keys_name) let input_keys = process.named_subject(input_keys_name)
let input = Input(False, "")
case case
actor.new(State(Idle, input, logger, ui, mpv)) actor.new(State(control.Idle, ui, mpv))
|> actor.on_message(handle_message) |> actor.on_message(handle_message)
|> actor.start |> actor.start
{ {
Error(start_error) -> Error(start_error) ->
Error("Could not start actor: " <> string.inspect(start_error)) Error("Could not start actor: " <> string.inspect(start_error))
Ok(actor.Started(pid:, data: musicplayer)) -> { Ok(actor.Started(pid:, data: musicplayer)) -> {
logging.log(logger, "musicplayer - started") logging.log("musicplayer - started")
process.spawn(fn() { process.spawn(fn() {
let assert Ok(_) = process.register(process.self(), input_keys_name) let assert Ok(_) = process.register(process.self(), input_keys_name)
handle_key(musicplayer, input_keys) forward_key(musicplayer, input_keys)
}) })
process.spawn(fn() { update_playback_time_loop(mpv, ui, 1000) }) process.spawn(fn() { update_playback_time_loop(mpv, ui, 250) })
Ok(pid) Ok(pid)
} }
} }
} }
fn handle_message(state: State, control: Control) -> actor.Next(State, Control) { fn handle_message(state: State, key: Key) -> actor.Next(State, Key) {
case control { case control.from_key(key, state.mode) {
control.Search -> { Error(_) -> actor.continue(state)
logging.log(state.logger, "musicplayer - initiating search") Ok(c) ->
case c {
control.SetView(view_idx) -> {
logging.log(
"musicplayer - setting current view to: "
<> string.inspect(view_idx),
)
update_search(state.ui, "searching: ") update_current_view(state.ui, view_idx)
actor.continue(state)
}
control.Search(input, capturing) -> {
case capturing {
True -> {
logging.log("musicplayer - searching: " <> input)
actor.continue( update_search(state.ui, "searching: " <> input)
State(
..state,
mode: Searching,
input: Input(..state.input, capturing: True),
),
)
}
control.Raw(content) -> { actor.continue(State(..state, mode: control.Searching(input)))
logging.log(state.logger, "musicplayer - recieved raw input: " <> content) }
False -> {
logging.log(
"musicplayer - recieved return. `input`: "
<> "'"
<> input
<> "'",
)
let content = case state.mode { update_search(state.ui, "")
Idle -> state.input.content
Searching -> { actor.continue(State(..state, mode: control.Idle))
let updated = state.input.content <> content }
update_search(state.ui, "searching: " <> updated) }
updated }
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()
} }
} }
actor.continue(State(..state, input: Input(..state.input, content:)))
}
control.Backspace -> {
logging.log(state.logger, "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(
state.logger,
"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(state.logger, "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")
// 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")
// Close logger (NOOP)
process.call(state.logger, 1000, fn(reply_to) {
logging_control.Exit(reply_to)
})
actor.stop()
}
} }
} }
@@ -173,7 +134,7 @@ fn update_playback_time(
Error(err) -> Error(err) ->
process.send( process.send(
ui, ui,
ui_control.UpdateState( ui_control.UpdateHeading(
layout.PlaybackTime, layout.PlaybackTime,
"playback time: N/A (err: " <> err.details <> ")", "playback time: N/A (err: " <> err.details <> ")",
), ),
@@ -182,7 +143,7 @@ fn update_playback_time(
Ok(mpv_control.PlaybackTime(data: playback_time)) -> Ok(mpv_control.PlaybackTime(data: playback_time)) ->
process.send( process.send(
ui, ui,
ui_control.UpdateState( ui_control.UpdateHeading(
layout.PlaybackTime, layout.PlaybackTime,
"playback time: " <> time.to_duration_string(playback_time), "playback time: " <> time.to_duration_string(playback_time),
), ),
@@ -191,17 +152,24 @@ fn update_playback_time(
} }
fn update_search(ui: Subject(ui_control.Control), content: String) -> Nil { fn update_search(ui: Subject(ui_control.Control), content: String) -> Nil {
process.send(ui, ui_control.UpdateState(layout.Search, content)) process.send(ui, ui_control.UpdateHeading(layout.Search, content))
} }
/// `handle_key` listens to a subject onto which `input` will send messages with `Key`s fn update_current_view(
fn handle_key(musicplayer: Subject(Control), input_keys: Subject(Key)) -> Nil { ui: Subject(ui_control.Control),
view_idx: layout.ViewIdx,
) {
process.send(ui, ui_control.SetView(view_idx))
}
/// `forward_key` listens to a subject onto which `input` will send messages with `Key`s
/// that is then forwarded to the `musicplayer` agent to handle
fn forward_key(musicplayer: Subject(Key), input_keys: Subject(Key)) -> Nil {
let _ = let _ =
process.new_selector() process.new_selector()
|> process.select(input_keys) |> process.select(input_keys)
|> process.selector_receive_forever |> process.selector_receive_forever
|> control.from_key |> process.send(musicplayer, _)
|> result.map(process.send(musicplayer, _))
handle_key(musicplayer, input_keys) forward_key(musicplayer, input_keys)
} }

View File

@@ -1,10 +1,11 @@
import gleam/erlang/process.{type Subject} import gleam/erlang/process.{type Subject}
import musicplayer/ui/layout.{type Section} import musicplayer/ui/layout.{type Section, type ViewIdx}
pub type Control { pub type Control {
UpdateDimensions(width: Int, height: Int) UpdateDimensions(columns: Int, rows: Int)
UpdateState(section: Section, content: String) UpdateHeading(section: Section, heading: String)
SetView(view_idx: ViewIdx)
Exit(reply_to: Subject(Nil)) Exit(reply_to: Subject(Nil))
} }

View File

@@ -3,13 +3,23 @@ import gleam/io
// https://en.wikipedia.org/wiki/ANSI_escape_code#Control_Sequence_Introducer_commands // 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 { pub fn clear_screen() -> Nil {
io.print("\u{001B}[2J\u{001B}[H") 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" let seq = "\u{001B}[" <> int.to_string(y) <> ";" <> int.to_string(x) <> "H"
io.print(seq <> text) seq <> chars
} }
pub fn hide_cursor() -> Nil { pub fn hide_cursor() -> Nil {

View File

@@ -1,192 +1,251 @@
import gleam/dict import gleam/dict
import gleam/erlang/process.{type Subject}
import gleam/float
import gleam/int import gleam/int
import gleam/list import gleam/list
import gleam/option.{type Option, None, Some}
import gleam/pair
import gleam/set
import gleam/string import gleam/string
import musicplayer/logging/control as logging_control
import musicplayer/logging/logging
import musicplayer/ui/internal import musicplayer/ui/internal
import musicplayer/ui/plot.{type Buffer}
import musicplayer/ui/style.{type Style, Percent, Style}
pub type Layout { pub const root_section = "reserved_root_section"
Layout(width: Int, height: Int, nodes: dict.Dict(Section, Node))
}
pub type Section { pub type Section {
Root Section(String)
Header Header
Search Search
PlaybackTime PlaybackTime
} }
/// A Nodes width and height is in percentage (of the available width/height of its parent Node)
pub type Node { pub type Node {
Node( Row(heading: Option(String), style: Style, children: List(Section))
content: String, Cell(heading: Option(String), style: Style)
width_percent: Int, }
height_percent: Int,
children: List(Section), 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() -> Layout { pub fn new(
let nodes = columns: Int,
dict.from_list([ rows: Int,
#( views: List(List(#(Section, Node))),
Root, ) -> Layout {
Node(content: "", width_percent: 100, height_percent: 100, children: [ let views =
// Header, list.index_map(views, fn(view_nodes, i) { #(i, view_nodes) })
// Search, |> list.fold(dict.new(), fn(view_acc, iv) {
PlaybackTime, let #(i, view_nodes) = iv
]),
),
// #(
// Header,
// Node(content: "Music Player", width: 50, height: 10, 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) dict.insert(view_acc, i, view_loop(i, view_nodes))
})
Layout(columns:, rows:, current_view: 0, views:)
} }
pub fn update_section( 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(
view_index_section(i),
Row(
heading: None,
style: Style(dimensions: Percent(width: 100, height: 100), border: None),
children: orphans,
),
)
}
/// Takes a ViewIndex and create a Section key from it
fn view_index_section(view_idx: ViewIdx) -> Section {
Section(string.append("view_", int.to_string(view_idx)))
}
pub fn update_section_heading(
layout: Layout, layout: Layout,
section: Section, section: Section,
content: String, heading: String,
) -> Layout { ) -> Layout {
case dict.get(layout.nodes, section) { case dict.get(layout.views, layout.current_view) {
Error(_) -> layout Error(_) -> layout
Ok(node) -> Ok(view) ->
Layout( case dict.get(view, section) {
..layout, Error(_) -> layout
nodes: dict.insert( Ok(node) -> {
layout.nodes, let updated_node = case node {
section, Cell(..) -> Cell(..node, heading: Some(heading))
Node(..node, content: content), Row(..) -> Row(..node, heading: Some(heading))
), }
)
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, width: Int, height: Int) -> Layout { pub fn update_dimensions(layout: Layout, columns: Int, rows: Int) -> Layout {
Layout(..layout, width:, height:) Layout(..layout, columns:, rows:)
} }
pub fn render(logger: Subject(logging_control.Control), layout: Layout) -> Nil { pub fn update_current_view(layout: Layout, view_idx: ViewIdx) -> Layout {
internal.clear_screen() Layout(..layout, current_view: view_idx)
[layout.width, layout.height]
|> list.map(int.to_string)
|> string.join(" ")
|> 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( pub fn render(layout: Layout) -> Nil {
layout: Layout, let context =
container_width: Float, RenderContext(
container_height: Float, parent_width: layout.columns,
container_top_left_x: Int, parent_height: layout.rows,
container_top_left_y: Int, parent_top_left_x: 1,
from: Section, parent_top_left_y: 1,
logger: Subject(logging_control.Control), position_index: 0,
) -> Nil { )
let margin = 2.0
case dict.get(layout.nodes, from) { case dict.get(layout.views, layout.current_view) {
Error(_) -> Nil Error(_) -> Nil
Ok(node) -> { Ok(view) -> {
list.each(node.children, fn(child) { let buffer: Buffer = dict.new()
let cw =
container_width
*. { int.to_float(node.width_percent) /. 100.0 }
-. margin
|> float.floor
let ch = render_loop(
container_height view,
*. { int.to_float(node.height_percent) /. 100.0 } context,
-. margin view_index_section(layout.current_view),
|> float.floor buffer,
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( |> plot.flush_buffer(layout.columns, layout.rows)
logger, |> internal.update
"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 { pub type RenderContext {
let box_chars = #("", "", "", "", "", "") RenderContext(
let #(tl, tr, bl, br, h, v) = box_chars parent_width: Int,
internal.print_at(tl <> string.repeat(h, width - 2) <> tr, x, y) parent_height: Int,
parent_top_left_x: Int,
list.range(1, height - 2) parent_top_left_y: Int,
|> list.each(fn(row) { position_index: Int,
internal.print_at(v, x, y + row) )
internal.print_at(v, x + width - 1, y + row) }
})
pub fn render_loop(
internal.print_at(bl <> string.repeat(h, width - 2) <> br, x, y + height - 1) 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 = case node.heading {
None ->
plot.box(
buffer,
node_top_left_x,
node_top_left_y,
node_width,
node_height,
)
option.Some(heading) ->
plot.box_with_heading(
buffer,
node_top_left_x,
node_top_left_y,
node_width,
node_height,
heading,
)
}
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)
})
}
}
}
}
} }

View File

@@ -0,0 +1,73 @@
import gleam/option.{Some}
import musicplayer/ui/internal
import musicplayer/ui/layout.{Section}
import musicplayer/ui/layout_examples/wait_for_input.{wait_for_input}
import musicplayer/ui/style.{Percent, Style}
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(
heading: Some("row 1"),
style: Style(
dimensions: Percent(width: 100, height: 50),
border: Some(style.BorderSingle),
),
children: [
Section("A"),
Section("B"),
],
),
),
#(
Section("A"),
layout.Cell(
heading: Some("cell 1"),
style: Style(
dimensions: Percent(width: 50, height: 50),
border: Some(style.BorderSingle),
),
),
),
#(
Section("B"),
layout.Cell(
heading: Some("cell 2"),
style: Style(
dimensions: Percent(width: 50, height: 50),
border: Some(style.BorderSingle),
),
),
),
#(
Section("Row2"),
layout.Row(
heading: Some("row 2"),
style: Style(
dimensions: Percent(width: 50, height: 50),
border: Some(style.BorderSingle),
),
children: [],
),
),
],
]
layout.new(columns, rows, views)
}

View File

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

View File

@@ -0,0 +1,85 @@
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 {
// TODO move box style to `layout.Style`
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)
}
}
}
pub fn box_with_heading(
buffer: Buffer,
x: Int,
y: Int,
width: Int,
height: Int,
heading: String,
) -> Buffer {
let heading_margin = 1
box(buffer, x, y, width, height)
|> text(heading, x + heading_margin, y)
}
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) })
}

View File

@@ -0,0 +1,34 @@
import gleam/option.{type Option}
pub type Dimension {
Percent(width: Int, height: Int)
// TODO add Flex that flows
}
pub type Border {
BorderNone
BorderSingle
}
pub type Style {
Style(dimensions: Dimension, border: Option(Border))
}
pub type BorderChars {
BorderChars(
top_left: String,
top_right: String,
bottom_left: String,
bottom_right: String,
horisontal: String,
vertical: String,
)
}
// https://en.wikipedia.org/wiki/Box-drawing_characters
pub fn border_chars(border: Border) -> BorderChars {
case border {
BorderNone -> BorderChars("", "", "", "", "", "")
BorderSingle -> BorderChars("", "", "", "", "", "")
}
}

View File

@@ -1,33 +1,90 @@
import gleam/erlang/process.{type Subject} import gleam/erlang/process.{type Subject}
import gleam/int import gleam/int
import gleam/list import gleam/list
import gleam/option.{None, Some}
import gleam/otp/actor import gleam/otp/actor
import gleam/string import gleam/string
import musicplayer/logging/control as logging_control
import musicplayer/logging/logging import musicplayer/logging/logging
import musicplayer/ui/control.{type Control} import musicplayer/ui/control.{type Control}
import musicplayer/ui/internal import musicplayer/ui/internal
import musicplayer/ui/layout.{type Layout} import musicplayer/ui/layout.{type Layout}
import musicplayer/ui/style
pub type State(redraw, content) { 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_name = process.new_name("redraw")
let redraw: Subject(Layout) = process.named_subject(redraw_name) let redraw: Subject(Layout) = process.named_subject(redraw_name)
let layout = layout.new() let layout =
[
[
#(
layout.Header,
layout.Row(
heading: Some("Foo <1> | Bar (2)"),
style: style.Style(
dimensions: style.Percent(width: 100, height: 50),
border: Some(style.BorderSingle),
),
children: [],
),
),
#(
layout.PlaybackTime,
layout.Row(
heading: None,
style: style.Style(
dimensions: style.Percent(width: 100, height: 50),
border: Some(style.BorderSingle),
),
children: [],
),
),
],
[
#(
layout.Header,
layout.Row(
heading: Some("Foo (1) | Bar <2>"),
style: style.Style(
dimensions: style.Percent(width: 100, height: 33),
border: Some(style.BorderSingle),
),
children: [],
),
),
#(
layout.Search,
layout.Row(
heading: None,
style: style.Style(
dimensions: style.Percent(width: 100, height: 33),
border: Some(style.BorderSingle),
),
children: [],
),
),
#(
layout.PlaybackTime,
layout.Row(
heading: None,
style: style.Style(
dimensions: style.Percent(width: 100, height: 33),
border: Some(style.BorderSingle),
),
children: [],
),
),
],
]
|> layout.new(0, 0, _)
case case
actor.new(State(logger, redraw, layout)) actor.new(State(redraw, layout))
|> actor.on_message(handle_message) |> actor.on_message(handle_message)
|> actor.start |> actor.start
{ {
@@ -36,7 +93,7 @@ pub fn new(
Ok(actor.Started(data: ui, ..)) -> { Ok(actor.Started(data: ui, ..)) -> {
process.spawn(fn() { process.spawn(fn() {
let update_dimensions_interval_ms = 300 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() { process.spawn(fn() {
@@ -45,7 +102,7 @@ pub fn new(
internal.clear_screen() internal.clear_screen()
internal.hide_cursor() internal.hide_cursor()
redraw_loop(logger, redraw) redraw_loop(redraw)
}) })
Ok(ui) Ok(ui)
@@ -58,27 +115,27 @@ fn handle_message(
control: Control, control: Control,
) -> actor.Next(State(redraw, layout), Control) { ) -> actor.Next(State(redraw, layout), Control) {
case control { case control {
control.UpdateDimensions(width, height) -> { control.UpdateDimensions(columns, rows) -> {
let current_dimensions = #(state.layout.width, state.layout.height) let current_dimensions = #(state.layout.columns, state.layout.rows)
case #(width, height) == current_dimensions { case #(columns, rows) == current_dimensions {
True -> actor.continue(state) True -> actor.continue(state)
False -> { False -> {
[width, height] [columns, rows]
|> list.map(int.to_string) |> list.map(int.to_string)
|> string.join(" ") |> string.join(" ")
|> string.append("ui - updating dimensions: ", _) |> string.append("ui - updating dimensions: ", _)
|> logging.log(state.logger, _) |> logging.log
let layout = layout.update_dimensions(state.layout, width, height) let layout = layout.update_dimensions(state.layout, columns, rows)
process.send(state.redraw, layout) process.send(state.redraw, layout)
actor.continue(State(..state, layout:)) actor.continue(State(..state, layout:))
} }
} }
} }
control.UpdateState(section, content) -> { control.UpdateHeading(section, heading) -> {
let layout = layout.update_section(state.layout, section, content) let layout = layout.update_section_heading(state.layout, section, heading)
actor.send(state.redraw, layout) actor.send(state.redraw, layout)
actor.continue(State(..state, layout:)) actor.continue(State(..state, layout:))
@@ -89,31 +146,30 @@ fn handle_message(
process.send(reply_to, Nil) process.send(reply_to, Nil)
actor.stop() actor.stop()
} }
control.SetView(view_idx) -> {
let layout = layout.update_current_view(state.layout, view_idx)
actor.send(state.redraw, layout)
actor.continue(State(..state, layout:))
}
} }
} }
fn redraw_loop( fn redraw_loop(redraw: Subject(Layout)) -> Nil {
logger: Subject(logging_control.Control),
redraw: Subject(Layout),
) -> Nil {
process.receive_forever(redraw) 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() { case internal.io_get_columns(), internal.io_get_rows() {
Ok(width), Ok(height) -> { Ok(width), Ok(height) -> {
process.send(ui, control.UpdateDimensions(width, 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) process.sleep(interval_ms)
update_dimensions_on_interval(logger, ui, interval_ms) update_dimensions_on_interval(ui, interval_ms)
} }

View File

@@ -1,7 +1,7 @@
import gleam/list import gleam/list
import gleeunit import gleeunit
import musicplayer/control.{type Control} import musicplayer/control.{type Control, type Mode}
import musicplayer/input/key.{type Key, Char} import musicplayer/input/key.{type Key, Char}
pub fn main() -> Nil { pub fn main() -> Nil {
@@ -9,16 +9,24 @@ pub fn main() -> Nil {
} }
type TestCase { type TestCase {
TestCase(key: Key, expected: Result(Control, Nil)) TestCase(key: Key, mode: Mode, expected: Result(Control, Nil))
} }
pub fn control_from_key_test() { pub fn control_from_key_test() {
let test_cases = [ let idle_tests = [
TestCase(Char(" "), Ok(control.TogglePlayPause)), TestCase(Char(" "), control.Idle, Ok(control.TogglePlayPause)),
TestCase(Char("q"), Ok(control.Exit)), TestCase(Char("/"), control.Idle, Ok(control.Search("", True))),
TestCase(Char("q"), control.Idle, Ok(control.Exit)),
] ]
list.each(test_cases, fn(tc) { let search_tests = [
assert tc.expected == control.from_key(tc.key) TestCase(Char("a"), control.Searching(""), Ok(control.Search("a", True))),
TestCase(Char("b"), control.Searching("a"), Ok(control.Search("ab", True))),
]
let test_cases = [idle_tests, search_tests]
list.each(list.flatten(test_cases), fn(tc) {
assert tc.expected == control.from_key(tc.key, tc.mode)
}) })
} }

View File

@@ -0,0 +1,130 @@
import gleam/dict
import gleam/io
import gleam/option.{Some}
import gleam/string
import gleeunit
import gleeunit/should
import musicplayer/ui/layout.{RenderContext, Section}
import musicplayer/ui/plot
import musicplayer/ui/style.{Percent, Style}
pub fn main() -> Nil {
gleeunit.main()
}
pub fn percent_layout_test() {
let views = [
[
#(
Section("Row1"),
layout.Row(
heading: Some("row 1"),
style: Style(
dimensions: Percent(width: 100, height: 50),
border: Some(style.BorderSingle),
),
children: [
Section("A"),
Section("B"),
],
),
),
#(
Section("A"),
layout.Cell(
heading: Some("cell 1"),
style: Style(
dimensions: Percent(width: 50, height: 100),
border: Some(style.BorderSingle),
),
),
),
#(
Section("B"),
layout.Cell(
heading: Some("cell 2"),
style: Style(
dimensions: Percent(width: 50, height: 100),
border: Some(style.BorderSingle),
),
),
),
#(
Section("Row2"),
layout.Row(
heading: Some("row 1"),
style: Style(
dimensions: Percent(width: 100, height: 50),
border: Some(style.BorderSingle),
),
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)
}
}
}