alex/musicplayer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Alexander Heldt
2025-12-06 22:46:56 +01:00
parent 73cf46eef4
commit de5c2367fa
6 changed files with 152 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/musicplayer/ui/control.gleam
View File

@@ -3,7 +3,7 @@ import gleam/erlang/process.{type Subject}
import musicplayer/ui/layout.{type Section} import musicplayer/ui/layout.{type Section}
pub type Control { pub type Control {
UpdateDimensions(width: Int, height: Int) UpdateDimensions(columns: Int, rows: Int)
UpdateState(section: Section, content: String) UpdateState(section: Section, content: String)
Exit(reply_to: Subject(Nil)) Exit(reply_to: Subject(Nil))

83
src/musicplayer/ui/layout.gleam
View File

@@ -2,6 +2,8 @@ import gleam/dict
import gleam/float import gleam/float
import gleam/int import gleam/int
import gleam/list import gleam/list
import gleam/pair
import gleam/set
import gleam/string import gleam/string
import gleam/string_tree import gleam/string_tree
@@ -9,10 +11,11 @@ import musicplayer/logging/logging
import musicplayer/ui/ansi import musicplayer/ui/ansi
import musicplayer/ui/internal import musicplayer/ui/internal
pub const root_section = "reserved_root_section"
pub type Section { pub type Section {
Section(String) Section(String)
Root
Header Header
Search Search
PlaybackTime PlaybackTime
@@ -33,48 +36,40 @@ pub type Node {
Cell(content: String, style: Style) Cell(content: String, style: Style)
} }
/// The root node must use `Root` section
pub type Layout { pub type Layout {
Layout(width: Int, height: Int, nodes: dict.Dict(Section, Node)) Layout(columns: Int, rows: Int, nodes: dict.Dict(Section, Node))
} }
pub fn new() -> Layout { pub fn new(columns: Int, rows: Int, nodes: List(#(Section, Node))) -> Layout {
let children =
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 =
nodes
|> list.map(pair.first)
|> list.filter(fn(node) { !set.contains(children, node) })
let nodes = let nodes =
dict.from_list([ dict.from_list(nodes)
#( |> dict.insert(
Root, Section(root_section),
Row( Row(
content: "Music Player", content: "",
style: Style(dimensions: Percent(width: 100, height: 100)), style: Style(dimensions: Percent(width: 100, height: 100)),
children: [Header, Search, PlaybackTime], children: orphans,
),
), ),
#( )
Header,
Row( Layout(columns:, rows:, nodes:)
content: "Foo (1) | Bar (2) | Baz (3)",
style: Style(dimensions: Percent(width: 100, height: 33)),
children: [],
),
),
#(
Search,
Row(
content: "",
style: Style(dimensions: Percent(width: 100, height: 33)),
children: [],
),
),
#(
PlaybackTime,
Row(
content: "00:00",
style: Style(dimensions: Percent(width: 100, height: 33)),
children: [],
),
),
])
Layout(width: 0, height: 0, nodes: nodes)
} }
pub fn update_section( pub fn update_section(
@@ -95,21 +90,21 @@ pub fn update_section(
} }
} }
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(layout: Layout) -> Nil { pub fn render(layout: Layout) -> Nil {
internal.clear_screen() internal.clear_screen()
[layout.width, layout.height] [layout.columns, layout.rows]
|> list.map(int.to_string) |> list.map(int.to_string)
|> string.join(" ") |> string.join(" ")
|> string.append("layout - render: ", _) |> string.append("layout - render: ", _)
|> logging.log |> logging.log
let container_width = int.to_float(layout.width) let container_width = int.to_float(layout.columns)
let container_height = int.to_float(layout.height) let container_height = int.to_float(layout.rows)
let container_top_left_x = 1 let container_top_left_x = 1
let container_top_left_y = 1 let container_top_left_y = 1
@@ -131,7 +126,7 @@ pub fn render(layout: Layout) -> Nil {
container_top_left_x, container_top_left_x,
container_top_left_y, container_top_left_y,
0, 0,
Root, Section(root_section),
_, _,
ansi_renders, ansi_renders,
) )

88
src/musicplayer/ui/layout_examples/layout_examples.gleam
View File

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

39
src/musicplayer/ui/ui.gleam
View File

@@ -17,7 +17,34 @@ pub fn new() -> 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(
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, _)
case case
actor.new(State(redraw, layout)) actor.new(State(redraw, layout))
@@ -51,19 +78,19 @@ 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 |> 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:))

91
test/musicplayer/ui/layout_test.gleam
View File

@@ -1,72 +1,59 @@
import gleam/dict
import gleam/io import gleam/io
import gleam/string import gleam/string
import gleeunit import gleeunit
import gleeunit/should import gleeunit/should
import musicplayer/ui/virtual_ansi import musicplayer/ui/virtual_ansi
import musicplayer/ui/layout.{Layout, Percent, Section, Style} import musicplayer/ui/layout.{Percent, Section, Style}
pub fn main() -> Nil { pub fn main() -> Nil {
gleeunit.main() gleeunit.main()
} }
pub fn percent_layout_test() { pub fn percent_layout_test() {
let layout = let nodes = [
Layout( #(
width: 80, Section("Row1"),
height: 20, layout.Row(
nodes: dict.from_list([ content: "row 1",
#( style: Style(dimensions: Percent(width: 100, height: 50)),
layout.Root, children: [
layout.Row(
content: "container",
style: Style(dimensions: Percent(width: 100, height: 100)),
children: [
Section("Row1"),
Section("Row2"),
],
),
),
#(
Section("Row1"),
layout.Row(
content: "row 1",
style: Style(dimensions: Percent(width: 100, height: 50)),
children: [
Section("A"),
Section("B"),
],
),
),
#(
Section("A"), Section("A"),
layout.Cell(
content: "cell 1",
style: Style(dimensions: Percent(width: 50, height: 100)),
),
),
#(
Section("B"), Section("B"),
layout.Cell( ],
content: "cell 2", ),
style: Style(dimensions: Percent(width: 50, height: 100)), ),
), #(
), Section("A"),
#( layout.Cell(
Section("Row2"), content: "cell 1",
layout.Row( style: Style(dimensions: Percent(width: 50, height: 100)),
content: "row 1", ),
style: Style(dimensions: Percent(width: 100, height: 50)), ),
children: [], #(
), 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, nodes)
let expected = let expected =
" "
container──────────────────────────────────────────────────────────────────────┐ ┌──────────────────────────────────────────────────────────────────────────────┐
│row 1────────────────────────────────────────────────────────────────────────┐│ │row 1────────────────────────────────────────────────────────────────────────┐│
││cell 1───────────────────────────────┐cell 2───────────────────────────────┐││ ││cell 1───────────────────────────────┐cell 2───────────────────────────────┐││
│││ ││ │││ │││ ││ │││

6
test/musicplayer/ui/virtual_ansi.gleam
View File

@@ -18,12 +18,12 @@ pub fn render(layout: Layout) -> String {
let screen = let screen =
layout.render_generic( layout.render_generic(
layout, layout,
int.to_float(layout.width), int.to_float(layout.columns),
int.to_float(layout.height), int.to_float(layout.rows),
1, 1,
1, 1,
0, 0,
layout.Root, layout.Section(layout.root_section),
dict.new(), dict.new(),
test_renders, test_renders,
) )