Compare commits
5 Commits
8e15c990fa
...
ui
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d041b6b3b1 | ||
|
|
b69852f7ba | ||
|
|
3f86b881c3 | ||
|
|
fee776b352 | ||
|
|
78cc3647c7 |
@@ -10,6 +10,6 @@ pub type NotUsed
|
|||||||
@external(erlang, "shell", "start_interactive")
|
@external(erlang, "shell", "start_interactive")
|
||||||
pub fn shell_start_interactive(options: #(atom.Atom, atom.Atom)) -> NotUsed
|
pub fn shell_start_interactive(options: #(atom.Atom, atom.Atom)) -> NotUsed
|
||||||
|
|
||||||
// https://www.erlang.org/doc/apps/stdlib/io.html#get_line/1
|
// https://www.erlang.org/doc/apps/stdlib/io.html#get_chars/2
|
||||||
@external(erlang, "io", "get_chars")
|
@external(erlang, "io", "get_chars")
|
||||||
fn io_get_chars(prompt: String, count: Int) -> String
|
fn io_get_chars(prompt: String, count: Int) -> String
|
||||||
|
|||||||
@@ -1,17 +1,20 @@
|
|||||||
import gleam/erlang/atom
|
import gleam/erlang/atom
|
||||||
|
import gleam/erlang/process.{type Subject}
|
||||||
import gleam/list
|
import gleam/list
|
||||||
|
import gleam/string
|
||||||
|
|
||||||
import input/internal as internal_input
|
import input/internal as internal_input
|
||||||
|
|
||||||
pub type Key {
|
pub type Key {
|
||||||
Char(String)
|
Char(String)
|
||||||
|
|
||||||
|
Input(String)
|
||||||
Left
|
Left
|
||||||
Right
|
Right
|
||||||
Up
|
Up
|
||||||
Down
|
Down
|
||||||
|
|
||||||
Continue
|
Continue(buffer: List(String))
|
||||||
Unknown
|
Unknown
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -20,6 +23,9 @@ pub const esc = "\u{001B}"
|
|||||||
// control sequence introducer
|
// control sequence introducer
|
||||||
pub const csi = "["
|
pub const csi = "["
|
||||||
|
|
||||||
|
// input introducer
|
||||||
|
pub const input_introducer = "::"
|
||||||
|
|
||||||
pub fn from_list(l: List(String)) -> Key {
|
pub fn from_list(l: List(String)) -> Key {
|
||||||
case l {
|
case l {
|
||||||
[e, c, "D"] if e == esc && c == csi -> Left
|
[e, c, "D"] if e == esc && c == csi -> Left
|
||||||
@@ -27,12 +33,23 @@ pub fn from_list(l: List(String)) -> Key {
|
|||||||
[e, c, "A"] if e == esc && c == csi -> Up
|
[e, c, "A"] if e == esc && c == csi -> Up
|
||||||
[e, c, "B"] if e == esc && c == csi -> Down
|
[e, c, "B"] if e == esc && c == csi -> Down
|
||||||
|
|
||||||
[e, c] if e == esc && c == csi -> Continue
|
[e, c] if e == esc && c == csi -> Continue(l)
|
||||||
|
|
||||||
[e] if e == esc -> Continue
|
[ci] | [ci, _] if ci == input_introducer -> Continue(l)
|
||||||
|
[ii, cmd, tail] if ii == input_introducer -> {
|
||||||
|
case tail {
|
||||||
|
// Return
|
||||||
|
"\r" -> Input(cmd)
|
||||||
|
// Backspace
|
||||||
|
"\u{007F}" -> Continue([ii, string.drop_end(cmd, 1)])
|
||||||
|
_ -> Continue([ii, cmd <> tail])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[e] if e == esc -> Continue(l)
|
||||||
[char] -> Char(char)
|
[char] -> Char(char)
|
||||||
|
|
||||||
[] -> Continue
|
[] -> Continue([])
|
||||||
_ -> Unknown
|
_ -> Unknown
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -43,11 +60,24 @@ pub fn start_raw_shell() {
|
|||||||
internal_input.shell_start_interactive(#(no_shell, raw))
|
internal_input.shell_start_interactive(#(no_shell, raw))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn read_input_until_key(l: List(String)) -> Key {
|
pub fn read_input_until_key(
|
||||||
let l = internal_input.read_input() |> list.wrap |> list.append(l, _)
|
l: List(String),
|
||||||
|
input_sink: Subject(List(String)),
|
||||||
case from_list(l) {
|
) -> Key {
|
||||||
Continue -> read_input_until_key(l)
|
case
|
||||||
k -> k
|
internal_input.read_input()
|
||||||
|
|> list.wrap
|
||||||
|
|> list.append(l, _)
|
||||||
|
|> from_list
|
||||||
|
{
|
||||||
|
Continue(l) -> {
|
||||||
|
echo "key:read_input_until_key continue: " <> string.inspect(l)
|
||||||
|
process.send(input_sink, l)
|
||||||
|
read_input_until_key(l, input_sink)
|
||||||
|
}
|
||||||
|
k -> {
|
||||||
|
echo "key:read_input_until_key k: " <> string.inspect(k)
|
||||||
|
k
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,13 +2,16 @@ import gleam/json
|
|||||||
import gleam/result
|
import gleam/result
|
||||||
import gleam/string
|
import gleam/string
|
||||||
|
|
||||||
import input/key.{type Key, Char}
|
import input/key.{type Key}
|
||||||
import mpv/internal/control as internal_control
|
import mpv/internal/control as internal_control
|
||||||
import tcp/reason.{type Reason}
|
import tcp/reason.{type Reason}
|
||||||
import tcp/tcp.{type Socket}
|
import tcp/tcp.{type Socket}
|
||||||
|
|
||||||
pub type Control {
|
pub type Control {
|
||||||
TogglePlayPause
|
TogglePlayPause
|
||||||
|
|
||||||
|
Search
|
||||||
|
|
||||||
Exit
|
Exit
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -18,7 +21,7 @@ pub type ControlError {
|
|||||||
|
|
||||||
pub fn from_key(key: Key) -> Result(Control, Nil) {
|
pub fn from_key(key: Key) -> Result(Control, Nil) {
|
||||||
case key {
|
case key {
|
||||||
Char(char) -> char_control(char)
|
key.Char(char) -> char_control(char)
|
||||||
_ -> Error(Nil)
|
_ -> Error(Nil)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -26,6 +29,7 @@ pub fn from_key(key: Key) -> Result(Control, Nil) {
|
|||||||
fn char_control(char: String) -> Result(Control, Nil) {
|
fn char_control(char: String) -> Result(Control, Nil) {
|
||||||
case char {
|
case char {
|
||||||
" " -> Ok(TogglePlayPause)
|
" " -> Ok(TogglePlayPause)
|
||||||
|
"/" -> Ok(Search)
|
||||||
"q" -> Ok(Exit)
|
"q" -> Ok(Exit)
|
||||||
_ -> Error(Nil)
|
_ -> Error(Nil)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,24 +4,40 @@ import gleam/otp/actor
|
|||||||
import gleam/result
|
import gleam/result
|
||||||
import gleam/string
|
import gleam/string
|
||||||
|
|
||||||
import input/key
|
import input/key.{type Key}
|
||||||
import mpv/control.{type Control}
|
import mpv/control.{type Control}
|
||||||
import tcp/reason
|
import tcp/reason
|
||||||
import tcp/tcp.{type Socket}
|
import tcp/tcp.{type Socket}
|
||||||
|
import ui/ui.{type Event}
|
||||||
|
|
||||||
type State(socket, exit) {
|
type State(socket, inject_input, ui, exit) {
|
||||||
State(socket: Socket, exit: Subject(Nil))
|
State(
|
||||||
|
socket: Socket,
|
||||||
|
inject_input: Subject(Key),
|
||||||
|
ui: Subject(Event),
|
||||||
|
exit: Subject(Nil),
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn new(exit: Subject(Nil)) -> Result(Nil, String) {
|
pub fn new(
|
||||||
|
ui: Subject(Event),
|
||||||
|
input_sink: Subject(List(String)),
|
||||||
|
exit: Subject(Nil),
|
||||||
|
) -> Result(Nil, String) {
|
||||||
// TODO start up mvp here, currently hi-jacking `naviterm`s socket
|
// TODO start up mvp here, currently hi-jacking `naviterm`s socket
|
||||||
let socket_path = "/tmp/naviterm_mpv"
|
let socket_path = "/tmp/naviterm_mpv"
|
||||||
|
|
||||||
case tcp.connect(socket_path) {
|
case tcp.connect(socket_path) {
|
||||||
Error(r) -> Error("Could not connect to mpv: " <> reason.to_string(r))
|
Error(r) -> Error("Could not connect to mpv: " <> reason.to_string(r))
|
||||||
Ok(socket) -> {
|
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
|
case
|
||||||
actor.new(State(socket, exit))
|
actor.new(State(socket, inject_input, ui, exit))
|
||||||
|> actor.on_message(handle_message)
|
|> actor.on_message(handle_message)
|
||||||
|> actor.start
|
|> actor.start
|
||||||
{
|
{
|
||||||
@@ -30,7 +46,14 @@ pub fn new(exit: Subject(Nil)) -> Result(Nil, String) {
|
|||||||
Ok(actor.Started(data:, ..)) -> {
|
Ok(actor.Started(data:, ..)) -> {
|
||||||
echo "waiting for input"
|
echo "waiting for input"
|
||||||
key.start_raw_shell()
|
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, input_sink)
|
||||||
|
})
|
||||||
|
|
||||||
Ok(Nil)
|
Ok(Nil)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -39,10 +62,16 @@ pub fn new(exit: Subject(Nil)) -> Result(Nil, String) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn handle_message(
|
fn handle_message(
|
||||||
state: State(socket, exit),
|
state: State(socket, inject, ui, exit),
|
||||||
control: Control,
|
control: Control,
|
||||||
) -> actor.Next(State(socket, exit), Control) {
|
) -> actor.Next(State(socket, inject, ui, exit), Control) {
|
||||||
case control {
|
case control {
|
||||||
|
control.Search -> {
|
||||||
|
echo "mpv search"
|
||||||
|
process.send(state.inject_input, key.Continue([key.input_introducer]))
|
||||||
|
process.send(state.ui, ui.Search)
|
||||||
|
actor.continue(state)
|
||||||
|
}
|
||||||
control.TogglePlayPause -> {
|
control.TogglePlayPause -> {
|
||||||
echo "toggling play/pause"
|
echo "toggling play/pause"
|
||||||
|
|
||||||
@@ -65,14 +94,25 @@ fn handle_message(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read_input(subject: Subject(Control)) -> Nil {
|
/// `read_input` operates by reading from input until a `Key` can be created.
|
||||||
case
|
/// It is possible to create a `Key` without the users input by sending
|
||||||
key.read_input_until_key([])
|
/// messages to `inject_input` which will initialize the "input to key" sequence.
|
||||||
|> control.from_key
|
/// This is useful to ultimately create a `Control` without the user having to
|
||||||
{
|
/// input all of the character(s) needed.
|
||||||
Error(_) -> Nil
|
fn read_input(
|
||||||
Ok(control) -> process.send(subject, control)
|
subject: Subject(Control),
|
||||||
|
inject_input: Subject(Key),
|
||||||
|
input_sink: Subject(List(String)),
|
||||||
|
) -> Nil {
|
||||||
|
let buffer = case process.receive(inject_input, 1) {
|
||||||
|
Ok(key.Continue(buffer)) -> buffer
|
||||||
|
Ok(_) | Error(_) -> []
|
||||||
}
|
}
|
||||||
|
|
||||||
read_input(subject)
|
let _ =
|
||||||
|
key.read_input_until_key(buffer, input_sink)
|
||||||
|
|> control.from_key
|
||||||
|
|> result.map(process.send(subject, _))
|
||||||
|
|
||||||
|
read_input(subject, inject_input, input_sink)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,30 @@
|
|||||||
import gleam/erlang/process
|
import gleam/erlang/process
|
||||||
|
|
||||||
import mpv/mpv
|
import mpv/mpv
|
||||||
|
import ui/ui
|
||||||
|
|
||||||
pub fn main() -> Nil {
|
pub fn main() -> Nil {
|
||||||
|
// 1. user starts search
|
||||||
|
// ui should show "input: "
|
||||||
|
// user presses enter
|
||||||
|
// ui should show "input was: x"
|
||||||
|
|
||||||
|
// 1. listen for control.Search
|
||||||
|
// 2. start listening to tap_input and print io.print "input: "
|
||||||
|
// 3. simultaniously listen for control.Input
|
||||||
|
// 4. print "input was: x"
|
||||||
|
|
||||||
|
// ui need: tap_input
|
||||||
|
// input need: ui subject to send control events from
|
||||||
|
|
||||||
|
// new input process should return `Key`
|
||||||
|
// this key should be sent both to ui and mpv, and they will decide if they can act on it.
|
||||||
|
// its probably ok if both act on it, e.g. "TogglePlayPause" could stop mpv music and display |> or || in ui
|
||||||
|
|
||||||
let exit = process.new_subject()
|
let exit = process.new_subject()
|
||||||
let assert Ok(_) = mpv.new(exit)
|
|
||||||
|
let assert Ok(#(ui, input_sink)) = ui.new()
|
||||||
|
let assert Ok(_) = mpv.new(ui, input_sink, exit)
|
||||||
|
|
||||||
process.receive_forever(exit)
|
process.receive_forever(exit)
|
||||||
}
|
}
|
||||||
|
|||||||
62
src/ui/ui.gleam
Normal file
62
src/ui/ui.gleam
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
import gleam/erlang/process.{type Name, type Subject}
|
||||||
|
import gleam/otp/actor
|
||||||
|
import gleam/string
|
||||||
|
|
||||||
|
pub type Event {
|
||||||
|
Search
|
||||||
|
Input(List(String))
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO in input, split input into events and control?
|
||||||
|
|
||||||
|
pub fn new() -> Result(#(Subject(Event), Subject(List(String))), String) {
|
||||||
|
let input_sink_name: Name(List(String)) = process.new_name("input_sink")
|
||||||
|
let input_sink = process.named_subject(input_sink_name)
|
||||||
|
|
||||||
|
// let input_sink = process.new_subject()
|
||||||
|
|
||||||
|
case
|
||||||
|
actor.new(Nil)
|
||||||
|
|> actor.on_message(handle_message)
|
||||||
|
|> actor.start
|
||||||
|
{
|
||||||
|
Error(start_error) ->
|
||||||
|
Error("Could not start ui actor: " <> string.inspect(start_error))
|
||||||
|
Ok(actor.Started(data: ui, ..)) -> {
|
||||||
|
echo "ui started"
|
||||||
|
|
||||||
|
// let assert Ok(_) = process.register(process.self(), input_sink_name)
|
||||||
|
process.spawn(fn() {
|
||||||
|
let assert Ok(_) = process.register(process.self(), input_sink_name)
|
||||||
|
drain_input_sink(ui, input_sink)
|
||||||
|
})
|
||||||
|
|
||||||
|
Ok(#(ui, input_sink))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn handle_message(state: Nil, event: Event) -> actor.Next(Nil, Event) {
|
||||||
|
case event {
|
||||||
|
Search -> {
|
||||||
|
echo "ui:search"
|
||||||
|
actor.continue(state)
|
||||||
|
}
|
||||||
|
Input(content) -> {
|
||||||
|
echo "ui:input: " <> string.inspect(content)
|
||||||
|
actor.continue(state)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn drain_input_sink(
|
||||||
|
subject: Subject(Event),
|
||||||
|
input_sink: Subject(List(String)),
|
||||||
|
) -> Nil {
|
||||||
|
echo "ui:drain_input_sink"
|
||||||
|
let content = process.receive_forever(input_sink)
|
||||||
|
|
||||||
|
process.send(subject, Input(content))
|
||||||
|
|
||||||
|
drain_input_sink(subject, input_sink)
|
||||||
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import gleam/list
|
import gleam/list
|
||||||
import gleeunit
|
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 {
|
pub fn main() -> Nil {
|
||||||
gleeunit.main()
|
gleeunit.main()
|
||||||
@@ -12,18 +12,31 @@ type TestCase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn key_from_list_test() {
|
pub fn key_from_list_test() {
|
||||||
let test_cases = [
|
let base_tests = [TestCase([], key.Continue([]))]
|
||||||
TestCase(["c"], Char("c")),
|
|
||||||
|
let char_tests = [TestCase(["c"], Char("c"))]
|
||||||
|
|
||||||
|
let escape_tests = [
|
||||||
|
TestCase([esc, csi], key.Continue([esc, csi])),
|
||||||
|
TestCase([esc], key.Continue([esc])),
|
||||||
|
|
||||||
TestCase([esc, csi, "D"], key.Left),
|
TestCase([esc, csi, "D"], key.Left),
|
||||||
TestCase([esc, csi, "C"], key.Right),
|
TestCase([esc, csi, "C"], key.Right),
|
||||||
TestCase([esc, csi, "A"], key.Up),
|
TestCase([esc, csi, "A"], key.Up),
|
||||||
TestCase([esc, csi, "B"], key.Down),
|
TestCase([esc, csi, "B"], key.Down),
|
||||||
TestCase([esc, csi], key.Continue),
|
|
||||||
TestCase([esc], key.Continue),
|
|
||||||
TestCase([], key.Continue),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
list.each(test_cases, fn(tc) {
|
let input_tests = [
|
||||||
|
TestCase([ii], key.Continue([ii])),
|
||||||
|
TestCase([ii, "a"], key.Continue([ii, "a"])),
|
||||||
|
TestCase([ii, "a", "b"], key.Continue([ii, "ab"])),
|
||||||
|
TestCase([ii, "ab", "\u{007F}"], key.Continue([ii, "a"])),
|
||||||
|
TestCase([ii, "ab", "\r"], key.Input("ab")),
|
||||||
|
]
|
||||||
|
|
||||||
|
let test_cases = [base_tests, char_tests, escape_tests, input_tests]
|
||||||
|
|
||||||
|
list.each(list.flatten(test_cases), fn(tc) {
|
||||||
assert tc.expected == key.from_list(tc.input)
|
assert tc.expected == key.from_list(tc.input)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user