Add and use logger
#8
@@ -2,17 +2,21 @@ import gleam/erlang/process.{type Name}
|
|||||||
|
|
||||||
import musicplayer/input/input
|
import musicplayer/input/input
|
||||||
import musicplayer/input/key.{type Key}
|
import musicplayer/input/key.{type Key}
|
||||||
|
import musicplayer/logging/logging
|
||||||
import musicplayer/mpv/mpv
|
import musicplayer/mpv/mpv
|
||||||
import musicplayer/musicplayer
|
import musicplayer/musicplayer
|
||||||
import musicplayer/ui/ui
|
import musicplayer/ui/ui
|
||||||
|
|
||||||
pub fn main() -> Nil {
|
pub fn main() -> Nil {
|
||||||
|
let assert Ok(logger) = logging.new("/tmp/musicplayer.log")
|
||||||
|
|
||||||
let input_keys_name: Name(Key) = process.new_name("input_keys")
|
let input_keys_name: Name(Key) = process.new_name("input_keys")
|
||||||
input.new(input_keys_name)
|
input.new(input_keys_name)
|
||||||
|
|
||||||
let assert Ok(ui) = ui.new()
|
let assert Ok(ui) = ui.new()
|
||||||
let assert Ok(mpv) = mpv.new()
|
let assert Ok(mpv) = mpv.new()
|
||||||
let assert Ok(musicplayer_pid) = musicplayer.new(ui, mpv, input_keys_name)
|
let assert Ok(musicplayer_pid) =
|
||||||
|
musicplayer.new(logger, ui, mpv, input_keys_name)
|
||||||
|
|
||||||
let monitor = process.monitor(musicplayer_pid)
|
let monitor = process.monitor(musicplayer_pid)
|
||||||
process.new_selector()
|
process.new_selector()
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ pub fn new() -> Result(Subject(Control), String) {
|
|||||||
|> actor.start
|
|> actor.start
|
||||||
{
|
{
|
||||||
Error(start_error) ->
|
Error(start_error) ->
|
||||||
Error("Could not start actor: " <> string.inspect(start_error))
|
Error("Could not start mpv: " <> string.inspect(start_error))
|
||||||
Ok(actor.Started(data: mpv, ..)) -> Ok(mpv)
|
Ok(actor.Started(data: mpv, ..)) -> Ok(mpv)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,11 +2,13 @@ import gleam/erlang/process.{type Name, type Pid, type Subject}
|
|||||||
import gleam/otp/actor
|
import gleam/otp/actor
|
||||||
import gleam/result
|
import gleam/result
|
||||||
import gleam/string
|
import gleam/string
|
||||||
import musicplayer/time/time
|
|
||||||
|
|
||||||
import musicplayer/control.{type Control}
|
import musicplayer/control.{type Control}
|
||||||
import musicplayer/input/key.{type Key}
|
import musicplayer/input/key.{type Key}
|
||||||
|
import musicplayer/logging/control as logging_control
|
||||||
|
import musicplayer/logging/logging
|
||||||
import musicplayer/mpv/control as mpv_control
|
import musicplayer/mpv/control as mpv_control
|
||||||
|
import musicplayer/time/time
|
||||||
import musicplayer/ui/control as ui_control
|
import musicplayer/ui/control as ui_control
|
||||||
import musicplayer/ui/layout
|
import musicplayer/ui/layout
|
||||||
|
|
||||||
@@ -23,12 +25,14 @@ type State {
|
|||||||
State(
|
State(
|
||||||
mode: Mode,
|
mode: Mode,
|
||||||
input: Input,
|
input: Input,
|
||||||
|
logger: Subject(logging_control.Control),
|
||||||
ui: Subject(ui_control.Control),
|
ui: Subject(ui_control.Control),
|
||||||
mpv: Subject(mpv_control.Control),
|
mpv: Subject(mpv_control.Control),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn new(
|
pub fn new(
|
||||||
|
logger: Subject(logging_control.Control),
|
||||||
ui: Subject(ui_control.Control),
|
ui: Subject(ui_control.Control),
|
||||||
mpv: Subject(mpv_control.Control),
|
mpv: Subject(mpv_control.Control),
|
||||||
input_keys_name: Name(Key),
|
input_keys_name: Name(Key),
|
||||||
@@ -38,13 +42,14 @@ pub fn new(
|
|||||||
let input = Input(False, "")
|
let input = Input(False, "")
|
||||||
|
|
||||||
case
|
case
|
||||||
actor.new(State(Idle, input, ui, mpv))
|
actor.new(State(Idle, input, logger, ui, mpv))
|
||||||
|> actor.on_message(handle_message)
|
|> actor.on_message(handle_message)
|
||||||
|> actor.start
|
|> actor.start
|
||||||
{
|
{
|
||||||
Error(start_error) ->
|
Error(start_error) ->
|
||||||
Error("Could not start actor: " <> string.inspect(start_error))
|
Error("Could not start actor: " <> string.inspect(start_error))
|
||||||
Ok(actor.Started(pid:, data: musicplayer)) -> {
|
Ok(actor.Started(pid:, data: musicplayer)) -> {
|
||||||
|
logging.log(logger, "musicplayer - started")
|
||||||
process.spawn(fn() {
|
process.spawn(fn() {
|
||||||
let assert Ok(_) = process.register(process.self(), input_keys_name)
|
let assert Ok(_) = process.register(process.self(), input_keys_name)
|
||||||
handle_key(musicplayer, input_keys)
|
handle_key(musicplayer, input_keys)
|
||||||
@@ -60,6 +65,8 @@ pub fn new(
|
|||||||
fn handle_message(state: State, control: Control) -> actor.Next(State, Control) {
|
fn handle_message(state: State, control: Control) -> actor.Next(State, Control) {
|
||||||
case control {
|
case control {
|
||||||
control.Search -> {
|
control.Search -> {
|
||||||
|
logging.log(state.logger, "musicplayer - initiating search")
|
||||||
|
|
||||||
update_search(state.ui, "searching: ")
|
update_search(state.ui, "searching: ")
|
||||||
|
|
||||||
actor.continue(
|
actor.continue(
|
||||||
@@ -72,6 +79,8 @@ fn handle_message(state: State, control: Control) -> actor.Next(State, Control)
|
|||||||
}
|
}
|
||||||
|
|
||||||
control.Raw(content) -> {
|
control.Raw(content) -> {
|
||||||
|
logging.log(state.logger, "musicplayer - recieved raw input: " <> content)
|
||||||
|
|
||||||
let content = case state.mode {
|
let content = case state.mode {
|
||||||
Idle -> state.input.content
|
Idle -> state.input.content
|
||||||
Searching -> {
|
Searching -> {
|
||||||
@@ -84,6 +93,8 @@ fn handle_message(state: State, control: Control) -> actor.Next(State, Control)
|
|||||||
actor.continue(State(..state, input: Input(..state.input, content:)))
|
actor.continue(State(..state, input: Input(..state.input, content:)))
|
||||||
}
|
}
|
||||||
control.Backspace -> {
|
control.Backspace -> {
|
||||||
|
logging.log(state.logger, "musicplayer - recieved backspace")
|
||||||
|
|
||||||
let content = case state.mode {
|
let content = case state.mode {
|
||||||
Idle -> state.input.content
|
Idle -> state.input.content
|
||||||
Searching -> string.drop_end(state.input.content, 1)
|
Searching -> string.drop_end(state.input.content, 1)
|
||||||
@@ -91,6 +102,14 @@ fn handle_message(state: State, control: Control) -> actor.Next(State, Control)
|
|||||||
actor.continue(State(..state, input: Input(..state.input, content:)))
|
actor.continue(State(..state, input: Input(..state.input, content:)))
|
||||||
}
|
}
|
||||||
control.Return -> {
|
control.Return -> {
|
||||||
|
logging.log(
|
||||||
|
state.logger,
|
||||||
|
"musicplayer - recieved return. `input.capture`: "
|
||||||
|
<> "'"
|
||||||
|
<> state.input.content
|
||||||
|
<> "'",
|
||||||
|
)
|
||||||
|
|
||||||
// Note: state.input.content is now the final input, use it
|
// Note: state.input.content is now the final input, use it
|
||||||
// before it is reset
|
// before it is reset
|
||||||
case state.mode {
|
case state.mode {
|
||||||
@@ -104,17 +123,27 @@ fn handle_message(state: State, control: Control) -> actor.Next(State, Control)
|
|||||||
}
|
}
|
||||||
|
|
||||||
control.TogglePlayPause -> {
|
control.TogglePlayPause -> {
|
||||||
|
logging.log(state.logger, "musicplayer - toggling play/pause")
|
||||||
|
|
||||||
process.send(state.mpv, mpv_control.TogglePlayPause)
|
process.send(state.mpv, mpv_control.TogglePlayPause)
|
||||||
update_playback_time(state.mpv, state.ui)
|
update_playback_time(state.mpv, state.ui)
|
||||||
actor.continue(state)
|
actor.continue(state)
|
||||||
}
|
}
|
||||||
control.Exit -> {
|
control.Exit -> {
|
||||||
|
logging.log(state.logger, "musicplayer - initiating musicplayer shutdown")
|
||||||
// Close `mpv` socket
|
// Close `mpv` socket
|
||||||
process.call(state.mpv, 1000, fn(reply_to) { mpv_control.Exit(reply_to) })
|
process.call(state.mpv, 1000, fn(reply_to) { mpv_control.Exit(reply_to) })
|
||||||
|
|
||||||
// Reset terminal state (show cursor etc.)
|
// Reset terminal state (show cursor etc.)
|
||||||
process.call(state.ui, 1000, fn(reply_to) { ui_control.Exit(reply_to) })
|
process.call(state.ui, 1000, fn(reply_to) { ui_control.Exit(reply_to) })
|
||||||
|
|
||||||
|
logging.log(state.logger, "musicplayer - stopped")
|
||||||
|
|
||||||
|
// Close logger (NOOP)
|
||||||
|
process.call(state.logger, 1000, fn(reply_to) {
|
||||||
|
logging_control.Exit(reply_to)
|
||||||
|
})
|
||||||
|
|
||||||
actor.stop()
|
actor.stop()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user