wip

src/mpv/control.gleam

@@ -1,17 +1,16 @@
+import gleam/io
 import gleam/json
 import gleam/result
 import gleam/string
 
-import input/key.{type Key}
 import mpv/internal/control as internal_control
+import mpv/key.{type Key}
 import tcp/reason.{type Reason}
 import tcp/tcp.{type Socket}
 
 pub type Control {
   TogglePlayPause
 
-  Search
-
   Exit
 }
 
@@ -29,7 +28,6 @@ pub fn from_key(key: Key) -> Result(Control, Nil) {
 fn char_control(char: String) -> Result(Control, Nil) {
   case char {
     " " -> Ok(TogglePlayPause)
-    "/" -> Ok(Search)
     "q" -> Ok(Exit)
     _ -> Error(Nil)
   }
@@ -69,6 +67,10 @@ pub fn get_playback_time(socket: Socket) -> Result(PlaybackTime, ControlError) {
   }
 }
 
+pub fn clear_screen() -> Nil {
+  io.print("\u{001B}[2J\u{001B}[H")
+}
+
 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

src/mpv/key.gleam

@@ -1,9 +1,6 @@
 import gleam/erlang/atom
-import gleam/erlang/process.{type Subject}
 import gleam/list
-import gleam/string
+import mpv/internal/key as internal_key
-
-import input/internal as internal_input
 
 pub type Key {
   Char(String)
@@ -24,7 +21,7 @@ pub const esc = "\u{001B}"
 pub const csi = "["
 
 // input introducer
-pub const input_introducer = "::"
+const input_introducer = "$"
 
 pub fn from_list(l: List(String)) -> Key {
   case l {
@@ -37,12 +34,9 @@ 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 {
+      case tail == "\r" {
-        // Return
+        True -> Input(cmd)
-        "\r" -> Input(cmd)
+        False -> Continue([ii, cmd <> tail])
-        // Backspace
-        "\u{007F}" -> Continue([ii, string.drop_end(cmd, 1)])
-        _ -> Continue([ii, cmd <> tail])
       }
     }
 
@@ -57,27 +51,17 @@ pub fn from_list(l: List(String)) -> Key {
 pub fn start_raw_shell() {
   let no_shell = atom.create("noshell")
   let raw = atom.create("raw")
-  internal_input.shell_start_interactive(#(no_shell, raw))
+  internal_key.shell_start_interactive(#(no_shell, raw))
 }
 
-pub fn read_input_until_key(
+pub fn read_input_until_key(l: List(String)) -> Key {
-  l: List(String),
-  input_sink: Subject(List(String)),
-) -> Key {
   case
-    internal_input.read_input()
+    internal_key.read_input()
     |> list.wrap
     |> list.append(l, _)
     |> from_list
   {
-    Continue(l) -> {
+    Continue(l) -> read_input_until_key(l)
-      echo "key:read_input_until_key continue: " <> string.inspect(l)
+    k -> k
-      process.send(input_sink, l)
-      read_input_until_key(l, input_sink)
-    }
-    k -> {
-      echo "key:read_input_until_key k: " <> string.inspect(k)
-      k
-    }
   }
 }

src/mpv/mpv.gleam

@@ -4,40 +4,24 @@ import gleam/otp/actor
 import gleam/result
 import gleam/string
 
-import input/key.{type Key}
 import mpv/control.{type Control}
+import mpv/key
 import tcp/reason
 import tcp/tcp.{type Socket}
-import ui/ui.{type Event}
 
-type State(socket, inject_input, ui, exit) {
+type State(socket, exit) {
-  State(
+  State(socket: Socket, exit: Subject(Nil))
-    socket: Socket,
-    inject_input: Subject(Key),
-    ui: Subject(Event),
-    exit: Subject(Nil),
-  )
 }
 
-pub fn new(
+pub fn new(exit: Subject(Nil)) -> Result(Nil, String) {
-  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
   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) -> {
-      // `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, inject_input, ui, exit))
+        actor.new(State(socket, exit))
         |> actor.on_message(handle_message)
         |> actor.start
       {
@@ -46,14 +30,7 @@ pub fn new(
         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, input_sink)
-          })
-
           Ok(Nil)
         }
       }
@@ -62,16 +39,10 @@ pub fn new(
 }
 
 fn handle_message(
-  state: State(socket, inject, ui, exit),
+  state: State(socket, exit),
   control: Control,
-) -> actor.Next(State(socket, inject, ui, exit), Control) {
+) -> actor.Next(State(socket, exit), 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 -> {
       echo "toggling play/pause"
 
@@ -94,25 +65,14 @@ fn handle_message(
   }
 }
 
-/// `read_input` operates by reading from input until a `Key` can be created.
+fn read_input(subject: Subject(Control)) -> Nil {
-/// It is possible to create a `Key` without the users input by sending
+  case
-/// messages to `inject_input` which will initialize the "input to key" sequence.
+    key.read_input_until_key([])
-/// This is useful to ultimately create a `Control` without the user having to
+    |> control.from_key
-/// input all of the character(s) needed.
+  {
-fn read_input(
+    Error(_) -> Nil
-  subject: Subject(Control),
+    Ok(control) -> process.send(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(_) -> []
   }
 
-  let _ =
+  read_input(subject)
-    key.read_input_until_key(buffer, input_sink)
-    |> control.from_key
-    |> result.map(process.send(subject, _))
-
-  read_input(subject, inject_input, input_sink)
 }

src/musicplayer.gleam

@@ -1,30 +1,8 @@
 import gleam/erlang/process
-
 import mpv/mpv
-import ui/ui
 
 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 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)
 }

src/ui/ui.gleam

@@ -1,62 +0,0 @@
-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)
-}

test/input/input_test.gleam

@@ -1,42 +0,0 @@
-import gleam/list
-import gleeunit
-
-import 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)
-  })
-}

test/mpv/control_test.gleam

@@ -1,9 +1,9 @@
 import gleam/list
 import gleeunit
 
-import input/key.{type Key, Char}
 import mpv/control.{type Control}
 import mpv/internal/control as control_internal
+import mpv/key.{type Key, Char}
 
 pub fn main() -> Nil {
   gleeunit.main()

test/mpv/key_test.gleam

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