From 34ff51881f23d3de94dd5d23f93fdab960d0421e Mon Sep 17 00:00:00 2001 From: Alexander Heldt Date: Tue, 25 Nov 2025 20:50:13 +0100 Subject: [PATCH] Add `Search` section --- src/musicplayer/control.gleam | 7 +++++-- src/musicplayer/input/input.gleam | 2 +- src/musicplayer/musicplayer.gleam | 34 +++++++++++++++++++++++++------ src/musicplayer/ui/layout.gleam | 3 +++ 4 files changed, 37 insertions(+), 9 deletions(-) diff --git a/src/musicplayer/control.gleam b/src/musicplayer/control.gleam index b7f96d1..c352494 100644 --- a/src/musicplayer/control.gleam +++ b/src/musicplayer/control.gleam @@ -2,13 +2,16 @@ import musicplayer/input/key.{type Key} pub type Control { TogglePlayPause - Search + + Input(String) + Search(List(String)) Exit } pub fn from_key(key: Key) -> Result(Control, Nil) { case key { + key.Input(content) -> Ok(Input(content)) key.Char(char) -> char_control(char) _ -> Error(Nil) } @@ -17,7 +20,7 @@ pub fn from_key(key: Key) -> Result(Control, Nil) { fn char_control(char: String) -> Result(Control, Nil) { case char { " " -> Ok(TogglePlayPause) - "/" -> Ok(Search) + "/" -> Ok(Search([])) "q" -> Ok(Exit) _ -> Error(Nil) } diff --git a/src/musicplayer/input/input.gleam b/src/musicplayer/input/input.gleam index 34de426..8f82502 100644 --- a/src/musicplayer/input/input.gleam +++ b/src/musicplayer/input/input.gleam @@ -1,4 +1,4 @@ -import gleam/erlang/process.{type Name, type Subject} +import gleam/erlang/process.{type Name} import musicplayer/input/key.{type Key} diff --git a/src/musicplayer/musicplayer.gleam b/src/musicplayer/musicplayer.gleam index adf3ec1..51d91ee 100644 --- a/src/musicplayer/musicplayer.gleam +++ b/src/musicplayer/musicplayer.gleam @@ -54,11 +54,20 @@ fn handle_message( control: Control, ) -> actor.Next(State(ui, mpv, input_inject, exit), Control) { case control { - control.Search -> { + control.Search([]) -> { process.send(state.input_inject, key.Continue([key.input_introducer])) - + update_search(state.ui, "searching: ") actor.continue(state) } + control.Search(content) -> { + update_search(state.ui, "searching: " <> string.join(content, "")) + actor.continue(state) + } + control.Input(_) -> { + update_search(state.ui, "") + actor.continue(state) + } + control.TogglePlayPause -> { echo "toggling play/pause" @@ -120,13 +129,26 @@ fn update_playback_time( } } +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 /// 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.receive_forever(input_keys) - |> control.from_key - |> result.map(process.send(musicplayer, _)) + let _ = case + process.new_selector() + |> process.select(input_keys) + |> process.selector_receive_forever + { + key.Continue(buffer:) -> + Ok(process.send(musicplayer, control.Search(buffer))) + + key -> + key + |> control.from_key + |> result.map(process.send(musicplayer, _)) + } handle_key(musicplayer, input_keys) } diff --git a/src/musicplayer/ui/layout.gleam b/src/musicplayer/ui/layout.gleam index 9c1f500..5de31b7 100644 --- a/src/musicplayer/ui/layout.gleam +++ b/src/musicplayer/ui/layout.gleam @@ -7,6 +7,7 @@ pub type Layout { pub type Section { Root Header + Search PlaybackTime } @@ -21,10 +22,12 @@ pub fn new() -> Layout { Root, Node(content: "", x: 0, y: 0, children: [ Header, + Search, PlaybackTime, ]), ), #(Header, Node(content: "Music Player", x: 1, y: 1, children: [])), + #(Search, Node(content: "", x: 30, y: 1, children: [])), #(PlaybackTime, Node(content: "00:00", x: 1, y: 2, children: [])), ])