wip
This commit is contained in:
@@ -10,6 +10,8 @@ import tcp/tcp.{type Socket}
|
|||||||
pub type Control {
|
pub type Control {
|
||||||
TogglePlayPause
|
TogglePlayPause
|
||||||
|
|
||||||
|
Search
|
||||||
|
|
||||||
Exit
|
Exit
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -18,6 +20,7 @@ pub type ControlError {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn from_key(key: Key) -> Result(Control, Nil) {
|
pub fn from_key(key: Key) -> Result(Control, Nil) {
|
||||||
|
echo key
|
||||||
case key {
|
case key {
|
||||||
key.Char(char) -> char_control(char)
|
key.Char(char) -> char_control(char)
|
||||||
_ -> Error(Nil)
|
_ -> Error(Nil)
|
||||||
@@ -28,6 +31,7 @@ fn char_control(char: String) -> Result(Control, Nil) {
|
|||||||
case char {
|
case char {
|
||||||
" " -> Ok(TogglePlayPause)
|
" " -> Ok(TogglePlayPause)
|
||||||
"q" -> Ok(Exit)
|
"q" -> Ok(Exit)
|
||||||
|
"/" -> Ok(Search)
|
||||||
_ -> Error(Nil)
|
_ -> Error(Nil)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,13 +4,13 @@ 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}
|
||||||
|
|
||||||
type State(socket, exit) {
|
type State(socket, input, exit) {
|
||||||
State(socket: Socket, exit: Subject(Nil))
|
State(socket: Socket, inject: Subject(Key), exit: Subject(Nil))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn new(exit: Subject(Nil)) -> Result(Nil, String) {
|
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) {
|
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) -> {
|
||||||
|
let input_name = process.new_name("input")
|
||||||
|
let input = process.named_subject(input_name)
|
||||||
|
|
||||||
|
let inject_name = process.new_name("inject")
|
||||||
|
let inject = process.named_subject(inject_name)
|
||||||
|
|
||||||
case
|
case
|
||||||
actor.new(State(socket, exit))
|
actor.new(State(socket, inject, exit))
|
||||||
|> actor.on_message(handle_message)
|
|> actor.on_message(handle_message)
|
||||||
|> actor.start
|
|> actor.start
|
||||||
{
|
{
|
||||||
@@ -30,7 +36,29 @@ 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) })
|
|
||||||
|
// read_input should just have access to input, for sending
|
||||||
|
|
||||||
|
// input hnadler should register both inject and input
|
||||||
|
process.spawn(fn() {
|
||||||
|
echo "registering?"
|
||||||
|
let register_input = process.register(process.self(), input_name)
|
||||||
|
let register_inject = process.register(process.self(), inject_name)
|
||||||
|
|
||||||
|
case register_input, register_inject {
|
||||||
|
Ok(_), Ok(_) -> {
|
||||||
|
echo "registered both"
|
||||||
|
input_handler(data, input, inject)
|
||||||
|
}
|
||||||
|
_, _ -> {
|
||||||
|
echo "failed to register"
|
||||||
|
Error("TODO panic?")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
process.spawn(fn() { read_input(input) })
|
||||||
|
|
||||||
Ok(Nil)
|
Ok(Nil)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -39,10 +67,14 @@ pub fn new(exit: Subject(Nil)) -> Result(Nil, String) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn handle_message(
|
fn handle_message(
|
||||||
state: State(socket, exit),
|
state: State(socket, inject, exit),
|
||||||
control: Control,
|
control: Control,
|
||||||
) -> actor.Next(State(socket, exit), Control) {
|
) -> actor.Next(State(socket, inject, exit), Control) {
|
||||||
case control {
|
case control {
|
||||||
|
control.Search -> {
|
||||||
|
process.send(state.inject, key.Continue(["$"]))
|
||||||
|
actor.continue(state)
|
||||||
|
}
|
||||||
control.TogglePlayPause -> {
|
control.TogglePlayPause -> {
|
||||||
echo "toggling play/pause"
|
echo "toggling play/pause"
|
||||||
|
|
||||||
@@ -65,14 +97,37 @@ fn handle_message(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read_input(subject: Subject(Control)) -> Nil {
|
fn read_input(input: Subject(Control)) -> Nil {
|
||||||
|
echo "### read_input"
|
||||||
case
|
case
|
||||||
key.read_input_until_key([])
|
key.read_input_until_key([])
|
||||||
|> control.from_key
|
|> control.from_key
|
||||||
{
|
{
|
||||||
Error(_) -> Nil
|
Error(_) -> Nil
|
||||||
Ok(control) -> process.send(subject, control)
|
Ok(control) -> process.send(input, control)
|
||||||
}
|
}
|
||||||
|
|
||||||
read_input(subject)
|
read_input(input)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn input_handler(
|
||||||
|
actor: Subject(Control),
|
||||||
|
input: Subject(Control),
|
||||||
|
inject: Subject(Key),
|
||||||
|
) {
|
||||||
|
echo "### input_handler"
|
||||||
|
case
|
||||||
|
process.new_selector()
|
||||||
|
|> process.select_map(input, fn(i) { Ok(i) })
|
||||||
|
|> process.select_map(inject, control.from_key)
|
||||||
|
|> process.selector_receive_forever
|
||||||
|
{
|
||||||
|
Error(_) -> Nil
|
||||||
|
Ok(c) -> {
|
||||||
|
echo "input_handler: " <> string.inspect(c)
|
||||||
|
process.send(actor, c)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
input_handler(actor, input, inject)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user