Add ability to ???

This commit is contained in:
Alexander Heldt
2025-11-18 21:25:35 +01:00
parent efc0604c1d
commit 53f877f03d
4 changed files with 57 additions and 20 deletions

View File

@@ -1,5 +1,6 @@
import gleam/erlang/atom
import gleam/list
import gleam/string
import input/internal as internal_input
@@ -22,7 +23,7 @@ pub const esc = "\u{001B}"
pub const csi = "["
// input introducer
const input_introducer = "$"
pub const input_introducer = "::"
pub fn from_list(l: List(String)) -> Key {
case l {
@@ -35,9 +36,10 @@ pub fn from_list(l: List(String)) -> Key {
[ci] | [ci, _] if ci == input_introducer -> Continue(l)
[ii, cmd, tail] if ii == input_introducer -> {
case tail == "\r" {
True -> Input(cmd)
False -> Continue([ii, cmd <> tail])
case tail {
"\r" -> Input(cmd)
"\u{007F}" -> Continue([ii, string.drop_end(cmd, 1)])
_ -> Continue([ii, cmd <> tail])
}
}

View File

@@ -10,6 +10,8 @@ import tcp/tcp.{type Socket}
pub type Control {
TogglePlayPause
Search
Exit
}
@@ -17,7 +19,12 @@ pub type ControlError {
ControlError(details: String)
}
// TODO this should also have a context:
// `/` in "artist list" "context will should be`control.Search`
// `<some char>` in "create new playlist" context should be `control.Input`
// `q` in most contexts should be `Exit`, but in a popup it should be `Close`
pub fn from_key(key: Key) -> Result(Control, Nil) {
echo key
case key {
key.Char(char) -> char_control(char)
_ -> Error(Nil)
@@ -28,6 +35,7 @@ fn char_control(char: String) -> Result(Control, Nil) {
case char {
" " -> Ok(TogglePlayPause)
"q" -> Ok(Exit)
"/" -> Ok(Search)
_ -> Error(Nil)
}
}

View File

@@ -4,13 +4,13 @@ import gleam/otp/actor
import gleam/result
import gleam/string
import input/key
import input/key.{type Key}
import mpv/control.{type Control}
import tcp/reason
import tcp/tcp.{type Socket}
type State(socket, exit) {
State(socket: Socket, exit: Subject(Nil))
type State(socket, inject_input, exit) {
State(socket: Socket, inject_input: Subject(Key), exit: Subject(Nil))
}
pub fn new(exit: Subject(Nil)) -> Result(Nil, String) {
@@ -20,8 +20,14 @@ pub fn new(exit: Subject(Nil)) -> Result(Nil, String) {
case tcp.connect(socket_path) {
Error(r) -> Error("Could not connect to mpv: " <> reason.to_string(r))
Ok(socket) -> {
// `inject_input` is created by name to allow the process that
// owns `read_input` to be able to register it, while the agent
// also have a reference to it to be able to inject input
let inject_input_name = process.new_name("inject_input")
let inject_input = process.named_subject(inject_input_name)
case
actor.new(State(socket, exit))
actor.new(State(socket, inject_input, exit))
|> actor.on_message(handle_message)
|> actor.start
{
@@ -30,7 +36,14 @@ pub fn new(exit: Subject(Nil)) -> Result(Nil, String) {
Ok(actor.Started(data:, ..)) -> {
echo "waiting for input"
key.start_raw_shell()
process.spawn(fn() { read_input(data) })
process.spawn(fn() {
let assert Ok(_) =
process.register(process.self(), inject_input_name)
read_input(data, inject_input)
})
Ok(Nil)
}
}
@@ -39,10 +52,14 @@ pub fn new(exit: Subject(Nil)) -> Result(Nil, String) {
}
fn handle_message(
state: State(socket, exit),
state: State(socket, inject, exit),
control: Control,
) -> actor.Next(State(socket, exit), Control) {
) -> actor.Next(State(socket, inject, exit), Control) {
case control {
control.Search -> {
process.send(state.inject_input, key.Continue([key.input_introducer]))
actor.continue(state)
}
control.TogglePlayPause -> {
echo "toggling play/pause"
@@ -65,14 +82,24 @@ fn handle_message(
}
}
fn read_input(subject: Subject(Control)) -> Nil {
/// `read_input` operates by reading from input until a `Key` can be created.
/// It is possible to create a `Key` without the users input by sending
/// messages to `inject_input` which will initialize the "input to key" sequence.
/// This is useful to ultimately create a `Control` without the user having to
/// input all of the character(s) needed.
fn read_input(agent: Subject(Control), inject_input: Subject(Key)) -> Nil {
let buffer = case process.receive(inject_input, 1) {
Ok(key.Continue(buffer)) -> buffer
Ok(_) | Error(_) -> []
}
case
key.read_input_until_key([])
key.read_input_until_key(buffer)
|> control.from_key
{
Error(_) -> Nil
Ok(control) -> process.send(subject, control)
Ok(control) -> process.send(agent, control)
}
read_input(subject)
read_input(agent, inject_input)
}

View File

@@ -1,7 +1,7 @@
import gleam/list
import gleeunit
import input/key.{type Key, Char, csi, esc}
import input/key.{type Key, Char, csi, esc, input_introducer as ii}
pub fn main() -> Nil {
gleeunit.main()
@@ -27,10 +27,10 @@ pub fn key_from_list_test() {
]
let input_tests = [
TestCase(["$"], key.Continue(["$"])),
TestCase(["$", "a"], key.Continue(["$", "a"])),
TestCase(["$", "a", "b"], key.Continue(["$", "ab"])),
TestCase(["$", "ab", "\r"], key.Input("ab")),
TestCase([ii], key.Continue([ii])),
TestCase([ii, "a"], key.Continue([ii, "a"])),
TestCase([ii, "a", "b"], key.Continue([ii, "ab"])),
TestCase([ii, "ab", "\r"], key.Input("ab")),
]
let test_cases = [base_tests, char_tests, escape_tests, input_tests]