12 Commits

Author SHA1 Message Date
Alexander Heldt
d311eedadb Add musicplayer module that wraps all logic 2025-11-22 21:06:41 +01:00
Alexander Heldt
d01b6d3f18 Move all code into musicplayer module 2025-11-22 19:03:49 +01:00
Alexander Heldt
249b0671e4 Extract reading of input i/o to input
And add the ability of other modules to listen to either
the final result (a `Key`) or tap into the input as it is read
2025-11-21 20:06:39 +01:00
Alexander Heldt
b69852f7ba Add ability to listen (tap) the input
By doing something like
```
fn input_output_loop(input_output: Subject(List(String))) -> Nil {
  let output = process.receive_forever(input_output)

  echo output

  input_output_loop(input_output)
}
```
2025-11-19 18:27:30 +01:00
Alexander Heldt
3f86b881c3 Add ability to inject characters into the input 2025-11-19 18:27:30 +01:00
Alexander Heldt
fee776b352 Add ability to create character sequences as Input 2025-11-19 18:27:30 +01:00
Alexander Heldt
78cc3647c7 Correct io_get_chars comment/documentation 2025-11-19 17:46:58 +01:00
Alexander Heldt
1c47a84750 Extract mpv/key to input
To separate the concern from `mpv`
2025-11-18 18:39:20 +01:00
Alexander Heldt
417b5a2559 Add ability to get playback-time 2025-11-16 16:23:16 +01:00
Alexander Heldt
94212996d2 Map Key to Control 2025-11-16 16:21:54 +01:00
Alexander Heldt
702313eac2 Restructure mpv/internal package 2025-11-16 16:04:06 +01:00
Alexander Heldt
ebdba09bc2 Remove unused Reason.Overflow 2025-11-16 10:40:03 +01:00
22 changed files with 536 additions and 171 deletions

View File

@@ -17,6 +17,7 @@ gleam_stdlib = ">= 0.44.0 and < 2.0.0"
gleam_otp = ">= 1.2.0 and < 2.0.0"
gleam_erlang = ">= 1.3.0 and < 2.0.0"
simplifile = ">= 2.3.1 and < 3.0.0"
gleam_json = ">= 3.1.0 and < 4.0.0"
[dev-dependencies]
gleeunit = ">= 1.0.0 and < 2.0.0"

View File

@@ -4,6 +4,7 @@
packages = [
{ name = "filepath", version = "1.1.2", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "filepath", source = "hex", outer_checksum = "B06A9AF0BF10E51401D64B98E4B627F1D2E48C154967DA7AF4D0914780A6D40A" },
{ name = "gleam_erlang", version = "1.3.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_erlang", source = "hex", outer_checksum = "1124AD3AA21143E5AF0FC5CF3D9529F6DB8CA03E43A55711B60B6B7B3874375C" },
{ name = "gleam_json", version = "3.1.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_json", source = "hex", outer_checksum = "44FDAA8847BE8FC48CA7A1C089706BD54BADCC4C45B237A992EDDF9F2CDB2836" },
{ name = "gleam_otp", version = "1.2.0", build_tools = ["gleam"], requirements = ["gleam_erlang", "gleam_stdlib"], otp_app = "gleam_otp", source = "hex", outer_checksum = "BA6A294E295E428EC1562DC1C11EA7530DCB981E8359134BEABC8493B7B2258E" },
{ name = "gleam_stdlib", version = "0.65.0", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "7C69C71D8C493AE11A5184828A77110EB05A7786EBF8B25B36A72F879C3EE107" },
{ name = "gleeunit", version = "1.9.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "DA9553CE58B67924B3C631F96FE3370C49EB6D6DC6B384EC4862CC4AAA718F3C" },
@@ -12,6 +13,7 @@ packages = [
[requirements]
gleam_erlang = { version = ">= 1.3.0 and < 2.0.0" }
gleam_json = { version = ">= 3.1.0 and < 4.0.0" }
gleam_otp = { version = ">= 1.2.0 and < 2.0.0" }
gleam_stdlib = { version = ">= 0.44.0 and < 2.0.0" }
gleeunit = { version = ">= 1.0.0 and < 2.0.0" }

View File

@@ -1,66 +0,0 @@
import gleam/erlang/atom
import gleam/list
pub type Key {
Char(String)
Left
Right
Up
Down
Continue
Unknown
}
pub const esc = "\u{001B}"
// control sequence introducer
pub const csi = "["
pub fn from_list(l: List(String)) -> Key {
case l {
[e, c, "D"] if e == esc && c == csi -> Left
[e, c, "C"] if e == esc && c == csi -> Right
[e, c, "A"] if e == esc && c == csi -> Up
[e, c, "B"] if e == esc && c == csi -> Down
[e, c] if e == esc && c == csi -> Continue
[e] if e == esc -> Continue
[char] -> Char(char)
[] -> Continue
_ -> Unknown
}
}
pub fn start_raw_shell() {
let no_shell = atom.create("noshell")
let raw = atom.create("raw")
shell_start_interactive(#(no_shell, raw))
}
// TODO map key to something like Control, to not leak `Continue` etc.
pub fn read_input_until_key(l: List(String)) -> Key {
let l = read_input() |> list.wrap |> list.append(l, _)
case from_list(l) {
Continue -> read_input_until_key(l)
k -> k
}
}
fn read_input() -> String {
io_get_chars("", 1)
}
pub type NotUsed
// https://www.erlang.org/doc/apps/stdlib/shell.html#start_interactive/1
@external(erlang, "shell", "start_interactive")
fn shell_start_interactive(options: #(atom.Atom, atom.Atom)) -> NotUsed
// https://www.erlang.org/doc/apps/stdlib/io.html#get_line/1
@external(erlang, "io", "get_chars")
fn io_get_chars(prompt: String, count: Int) -> String

View File

@@ -1,66 +0,0 @@
import gleam/erlang/process.{type Subject}
import gleam/otp/actor
import gleam/string
import mpv/internal.{type Key, Char}
import tcp/reason.{type Reason}
import tcp/tcp.{type Socket}
pub type Message {
KeyPress(Key)
}
type State(socket, exit) {
State(socket: Socket, exit: Subject(Nil))
}
pub fn new(exit: Subject(Nil)) -> Result(Nil, String) {
// TODO start up mvp here, currently hi-jacking `naviterm`s socket
let socket_path = "/tmp/naviterm_mpv"
case tcp.connect(socket_path) {
Error(r) -> Error("Could not connect to mpv: " <> reason.to_string(r))
Ok(socket) -> {
case
actor.new(State(socket, exit))
|> actor.on_message(handle_message)
|> actor.start
{
Error(start_error) ->
Error("Could not start actor: " <> string.inspect(start_error))
Ok(actor.Started(data:, ..)) -> {
echo "waiting for input"
internal.start_raw_shell()
process.spawn(fn() { read_input(data) })
Ok(Nil)
}
}
}
}
}
pub fn toggle_play_pause(socket: Socket) -> Result(Nil, Reason) {
tcp.send(socket, "{\"command\":[\"cycle\",\"pause\"]}\n")
}
fn handle_message(
state: State(socket, exit),
message: Message,
) -> actor.Next(State(socket, exit), Message) {
case message {
KeyPress(Char("q")) -> {
process.send(state.exit, Nil)
actor.stop()
}
KeyPress(key) -> {
echo "key: " <> string.inspect(key)
actor.continue(state)
}
}
}
fn read_input(subject: Subject(Message)) -> Nil {
internal.read_input_until_key([]) |> KeyPress |> process.send(subject, _)
read_input(subject)
}

View File

@@ -1,8 +1,32 @@
import gleam/erlang/process
import mpv/mpv
import gleam/erlang/process.{type Name}
import musicplayer/input/input
import musicplayer/input/key.{type Key}
import musicplayer/mpv/mpv
import musicplayer/musicplayer
pub fn main() -> Nil {
let input_keys_name: Name(Key) = process.new_name("input_keys")
let input_stream_name: Name(List(String)) = process.new_name("input_stream")
// `input_inject` is created by name to allow the `input` process that
// owns `read_input` to be able to register and receive from it,
// while the any other processes can use the name reference to
// inject input
let input_inject_name: Name(Key) = process.new_name("input_inject_keys")
input.new(input_keys_name, input_stream_name, input_inject_name)
let assert Ok(mpv) = mpv.new()
let exit = process.new_subject()
let assert Ok(_) = mpv.new(exit)
let assert Ok(_) =
musicplayer.new(
mpv,
input_keys_name,
input_stream_name,
input_inject_name,
exit,
)
process.receive_forever(exit)
}

View File

@@ -0,0 +1,25 @@
import musicplayer/input/key.{type Key}
pub type Control {
TogglePlayPause
Search
Exit
}
pub fn from_key(key: Key) -> Result(Control, Nil) {
case key {
key.Char(char) -> char_control(char)
_ -> Error(Nil)
}
}
fn char_control(char: String) -> Result(Control, Nil) {
case char {
" " -> Ok(TogglePlayPause)
"q" -> Ok(Exit)
"/" -> Ok(Search)
_ -> Error(Nil)
}
}

View File

@@ -0,0 +1,48 @@
import gleam/erlang/process.{type Name, type Subject}
import musicplayer/input/key.{type Key}
// TODO REWRITE below
/// `new` accepts a list of listeners that are composed of two subjects;
/// - one to get the final `Key` and
/// - one to tap the input as it is read from i/o
/// and
/// - a subject name that is used to create a `Subject` that other processes
/// know they can inject a `Key` into the input with
pub fn new(
input_keys_name: Name(Key),
input_stream_name: Name(List(String)),
input_inject_name: Name(Key),
) -> Nil {
let _ =
process.spawn(fn() {
let input_keys = process.named_subject(input_keys_name)
let input_stream = process.named_subject(input_stream_name)
let input_inject = process.named_subject(input_inject_name)
let assert Ok(_) = process.register(process.self(), input_inject_name)
read_input(input_keys, input_stream, input_inject)
})
echo "waiting for input"
key.start_raw_shell()
Nil
}
fn read_input(
input_keys: Subject(Key),
input_stream: Subject(List(String)),
input_inject: Subject(Key),
) -> Nil {
let buffer = case process.receive(input_inject, 1) {
Ok(key.Continue(buffer)) -> buffer
Ok(_) | Error(_) -> []
}
key.read_input_until_key(buffer, input_stream)
|> process.send(input_keys, _)
read_input(input_keys, input_stream, input_inject)
}

View File

@@ -0,0 +1,15 @@
import gleam/erlang/atom
pub fn read_input() -> String {
io_get_chars("", 1)
}
pub type NotUsed
// https://www.erlang.org/doc/apps/stdlib/shell.html#start_interactive/1
@external(erlang, "shell", "start_interactive")
pub fn shell_start_interactive(options: #(atom.Atom, atom.Atom)) -> NotUsed
// https://www.erlang.org/doc/apps/stdlib/io.html#get_chars/2
@external(erlang, "io", "get_chars")
fn io_get_chars(prompt: String, count: Int) -> String

View File

@@ -0,0 +1,79 @@
import gleam/erlang/atom
import gleam/erlang/process.{type Subject}
import gleam/list
import gleam/string
import musicplayer/input/internal as internal_input
pub type Key {
Char(String)
Input(String)
Left
Right
Up
Down
Continue(buffer: List(String))
Unknown
}
pub const esc = "\u{001B}"
// control sequence introducer
pub const csi = "["
// input introducer
pub const input_introducer = "::"
pub fn from_list(l: List(String)) -> Key {
case l {
[e, c, "D"] if e == esc && c == csi -> Left
[e, c, "C"] if e == esc && c == csi -> Right
[e, c, "A"] if e == esc && c == csi -> Up
[e, c, "B"] if e == esc && c == csi -> Down
[e, c] if e == esc && c == csi -> Continue(l)
[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)
[] -> Continue([])
_ -> Unknown
}
}
pub fn start_raw_shell() {
let no_shell = atom.create("noshell")
let raw = atom.create("raw")
internal_input.shell_start_interactive(#(no_shell, raw))
}
pub fn read_input_until_key(
l: List(String),
input_stream: Subject(List(String)),
) -> Key {
case
internal_input.read_input()
|> list.wrap
|> list.append(l, _)
|> from_list
{
Continue(l) -> {
process.send(input_stream, l)
read_input_until_key(l, input_stream)
}
k -> k
}
}

View File

@@ -0,0 +1,61 @@
import gleam/erlang/process.{type Subject}
import gleam/json
import gleam/result
import gleam/string
import musicplayer/mpv/internal as internal_control
import musicplayer/tcp/reason.{type Reason}
import musicplayer/tcp/tcp.{type Socket}
pub type Control {
TogglePlayPause
GetPlaybackTime(reply_to: Subject(Result(PlaybackTime, ControlError)))
Exit(reply_to: Subject(Nil))
}
pub type ControlError {
ControlError(details: String)
}
pub fn toggle_play_pause(socket: Socket) -> Result(Nil, ControlError) {
let command =
json.object([#("command", json.array(["cycle", "pause"], of: json.string))])
case send_command(socket, command) {
Error(r) -> Error(ControlError(reason.to_string(r)))
Ok(_) -> Ok(Nil)
}
}
// https://mpv.io/manual/master/#command-interface-playback-time
pub type PlaybackTime {
PlaybackTime(data: Float)
}
pub fn get_playback_time(socket: Socket) -> Result(PlaybackTime, ControlError) {
let command =
json.object([
#(
"command",
json.array(["get_property_string", "playback-time"], of: json.string),
),
])
case send_command(socket, command) {
Error(r) -> Error(ControlError(reason.to_string(r)))
Ok(json_string) ->
case internal_control.parse_playback_time(json_string) {
Error(e) -> Error(ControlError(string.inspect(e)))
Ok(data) -> Ok(PlaybackTime(data))
}
}
}
fn send_command(socket: Socket, command: json.Json) -> Result(String, Reason) {
result.try(tcp.send(socket, json.to_string(command) <> "\n"), fn(_) {
let timeout_ms = 10_000
tcp.receive(socket, timeout_ms)
})
}

View File

@@ -0,0 +1,25 @@
import gleam/dynamic/decode
import gleam/float
import gleam/json
import gleam/string
pub fn parse_playback_time(
json_string: String,
) -> Result(Float, json.DecodeError) {
let decoder = {
let float_dececoder = fn(data_string) {
case float.parse(data_string) {
Error(_) -> decode.failure(0.0, "data")
Ok(float_value) -> decode.success(float_value)
}
}
use data <- decode.field(
"data",
decode.then(decode.string, float_dececoder),
)
decode.success(data)
}
json.parse(from: string.trim(json_string), using: decoder)
}

View File

@@ -0,0 +1,62 @@
import gleam/erlang/process.{type Subject}
import gleam/otp/actor
import gleam/result
import gleam/string
import musicplayer/mpv/control
import musicplayer/tcp/reason
import musicplayer/tcp/tcp.{type Socket}
type State(socket) {
State(socket: Socket)
}
pub fn new() -> Result(Subject(control.Control), String) {
// TODO start up mvp here, currently hi-jacking `naviterm`s socket
let socket_path = "/tmp/naviterm_mpv"
case tcp.connect(socket_path) {
Error(r) -> Error("Could not connect to mpv: " <> reason.to_string(r))
Ok(socket) -> {
case
actor.new(State(socket))
|> actor.on_message(handle_message)
|> actor.start
{
Error(start_error) ->
Error("Could not start actor: " <> string.inspect(start_error))
Ok(actor.Started(data: mpv, ..)) -> Ok(mpv)
}
}
}
}
fn handle_message(
state: State(socket),
control: control.Control,
) -> actor.Next(State(socket), control.Control) {
case control {
control.TogglePlayPause -> {
echo "mpv: toggling play/pause"
let _ =
result.map_error(control.toggle_play_pause(state.socket), fn(err) {
echo "Could not toggle play/pause: " <> err.details
})
actor.continue(state)
}
control.GetPlaybackTime(reply_to) -> {
let res = control.get_playback_time(state.socket)
process.send(reply_to, res)
actor.continue(state)
}
control.Exit(reply_to) -> {
tcp.close(state.socket)
process.send(reply_to, Nil)
actor.stop()
}
}
}

View File

@@ -0,0 +1,106 @@
import gleam/erlang/process.{type Name, type Subject}
import gleam/float
import gleam/otp/actor
import gleam/result
import gleam/string
import musicplayer/control.{type Control}
import musicplayer/input/key.{type Key}
import musicplayer/mpv/control as mpv_control
type State(mpv, input_inject, exit) {
State(
mpv: Subject(mpv_control.Control),
input_inject: Subject(Key),
exit: Subject(Nil),
)
}
pub fn new(
mpv: Subject(mpv_control.Control),
input_keys_name: Name(Key),
input_stream_name: Name(List(String)),
input_inject_name: Name(Key),
exit: Subject(Nil),
) -> Result(Nil, String) {
let input_keys = process.named_subject(input_keys_name)
let input_stream = process.named_subject(input_stream_name)
let input_inject = process.named_subject(input_inject_name)
case
actor.new(State(mpv, input_inject, exit))
|> actor.on_message(handle_message)
|> actor.start
{
Error(start_error) ->
Error("Could not start actor: " <> string.inspect(start_error))
Ok(actor.Started(data: musicplayer, ..)) -> {
process.spawn(fn() {
let assert Ok(_) = process.register(process.self(), input_keys_name)
handle_key(musicplayer, input_keys)
})
process.spawn(fn() {
let assert Ok(_) = process.register(process.self(), input_stream_name)
temp_input_stream(input_stream)
})
Ok(Nil)
}
}
}
fn handle_message(
state: State(mpv, input_inject, exit),
control: Control,
) -> actor.Next(State(mpv, input_inject, exit), Control) {
case control {
control.Search -> {
process.send(state.input_inject, key.Continue([key.input_introducer]))
actor.continue(state)
}
control.TogglePlayPause -> {
echo "toggling play/pause"
process.send(state.mpv, mpv_control.TogglePlayPause)
case
process.call(state.mpv, 1000, fn(reply_to) {
mpv_control.GetPlaybackTime(reply_to)
})
{
Error(err) -> echo "! could not get playbackTime: " <> err.details
Ok(mpv_control.PlaybackTime(data: playback_time)) ->
echo "playbacktime from mpv: " <> float.to_string(playback_time)
}
actor.continue(state)
}
control.Exit -> {
// Close socket to `mpv`
process.call(state.mpv, 1000, fn(reply_to) { mpv_control.Exit(reply_to) })
// End main process
process.send(state.exit, Nil)
actor.stop()
}
}
}
/// `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, _))
handle_key(musicplayer, input_keys)
}
fn temp_input_stream(input_stream: Subject(List(String))) -> Nil {
let stream = process.receive_forever(input_stream)
echo "input stream: " <> string.inspect(stream)
temp_input_stream(input_stream)
}

View File

@@ -4,8 +4,6 @@ pub type Reason {
/// from `send`
Closed
Overflow
/// Address already in use
Eaddrinuse
/// Cannot assign requested address
@@ -160,7 +158,6 @@ pub type Reason {
pub fn to_string(reason: Reason) -> String {
case reason {
Overflow -> "overflow"
Closed -> "Connection closed (closed)"
Eacces -> "Permission denied (eacces)"
Eaddrinuse -> "Address already in use (eaddrinuse)"

View File

@@ -2,7 +2,7 @@ import gleam/bit_array
import gleam/erlang/atom
import gleam/result
import tcp/reason.{type Reason}
import musicplayer/tcp/reason.{type Reason}
pub type Socket

View File

@@ -4,8 +4,8 @@ import gleam/otp/actor
import gleam/result
import gleam/string
import tcp/reason.{type Reason}
import tcp/tcp
import musicplayer/tcp/reason.{type Reason}
import musicplayer/tcp/tcp
pub type Message {
Shutdown

View File

@@ -1,29 +0,0 @@
import gleam/list
import gleeunit
import mpv/internal.{Char, csi, esc}
pub fn main() -> Nil {
gleeunit.main()
}
type TestCase {
TestCase(input: List(String), expected: internal.Key)
}
pub fn mpv_key_from_list_test() {
let test_cases = [
TestCase(["c"], Char("c")),
TestCase([esc, csi, "D"], internal.Left),
TestCase([esc, csi, "C"], internal.Right),
TestCase([esc, csi, "A"], internal.Up),
TestCase([esc, csi, "B"], internal.Down),
TestCase([esc, csi], internal.Continue),
TestCase([esc], internal.Continue),
TestCase([], internal.Continue),
]
list.each(test_cases, fn(tc) {
assert tc.expected == internal.from_list(tc.input)
})
}

View File

@@ -0,0 +1,24 @@
import gleam/list
import gleeunit
import musicplayer/control.{type Control}
import musicplayer/input/key.{type Key, Char}
pub fn main() -> Nil {
gleeunit.main()
}
type TestCase {
TestCase(key: Key, expected: Result(Control, Nil))
}
pub fn control_from_key_test() {
let test_cases = [
TestCase(Char(" "), Ok(control.TogglePlayPause)),
TestCase(Char("q"), Ok(control.Exit)),
]
list.each(test_cases, fn(tc) {
assert tc.expected == control.from_key(tc.key)
})
}

View File

@@ -0,0 +1,42 @@
import gleam/list
import gleeunit
import musicplayer/input/key.{type Key, Char, csi, esc, input_introducer as ii}
pub fn main() -> Nil {
gleeunit.main()
}
type TestCase {
TestCase(input: List(String), expected: Key)
}
pub fn key_from_list_test() {
let base_tests = [TestCase([], key.Continue([]))]
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, "C"], key.Right),
TestCase([esc, csi, "A"], key.Up),
TestCase([esc, csi, "B"], key.Down),
]
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)
})
}

View File

@@ -0,0 +1,15 @@
import gleeunit
import musicplayer/mpv/internal as control_internal
pub fn main() -> Nil {
gleeunit.main()
}
pub fn parse_playback_time_test() {
let json_string =
"{\"data\":\"123.456789\",\"request_id\":0,\"error\":\"success\"}\n"
let assert Ok(data) = control_internal.parse_playback_time(json_string)
assert data == 123.456789
}

View File

@@ -3,7 +3,7 @@ import gleeunit
import simplifile
import echo_server
import tcp/tcp
import musicplayer/tcp/tcp
pub fn main() -> Nil {
gleeunit.main()