iwp

src/input/internal.gleam

@@ -10,6 +10,6 @@ pub type NotUsed
 @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_line/1
+// 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

src/input/key.gleam

@@ -6,12 +6,13 @@ import input/internal as internal_input
 pub type Key {
   Char(String)
 
+  Input(String)
   Left
   Right
   Up
   Down
 
-  Continue
+  Continue(buffer: List(String))
   Unknown
 }
 
@@ -20,6 +21,9 @@ 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
@@ -27,12 +31,20 @@ pub fn from_list(l: List(String)) -> Key {
     [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, 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 == "\r" {
+        True -> Input(cmd)
+        False -> Continue([ii, cmd <> tail])
+      }
+    }
+
+    [e] if e == esc -> Continue(l)
     [char] -> Char(char)
 
-    [] -> Continue
+    [] -> Continue([])
     _ -> Unknown
   }
 }
@@ -44,10 +56,13 @@ pub fn start_raw_shell() {
 }
 
 pub fn read_input_until_key(l: List(String)) -> Key {
-  let l = internal_input.read_input() |> list.wrap |> list.append(l, _)
-
-  case from_list(l) {
-    Continue -> read_input_until_key(l)
+  case
+    internal_input.read_input()
+    |> list.wrap
+    |> list.append(l, _)
+    |> from_list
+  {
+    Continue(l) -> read_input_until_key(l)
     k -> k
   }
 }

src/mpv/control.gleam

@@ -2,13 +2,16 @@ import gleam/json
 import gleam/result
 import gleam/string
 
-import input/key.{type Key, Char}
+import input/key.{type Key}
 import mpv/internal/control as internal_control
 import tcp/reason.{type Reason}
 import tcp/tcp.{type Socket}
 
 pub type Control {
   TogglePlayPause
+
+  Search
+
   Exit
 }
 
@@ -16,9 +19,14 @@ pub type ControlError {
   ControlError(details: String)
 }
 
+// TODO this should also have a context:
+// `/` in "artist list" "context will should be`control.Search`
+// `<some char>` in "create new playlist" context should be `control.Input`
+// `q` in most contexts should be `Exit`, but in a popup it should be `Close`
 pub fn from_key(key: Key) -> Result(Control, Nil) {
+  echo key
   case key {
-    Char(char) -> char_control(char)
+    key.Char(char) -> char_control(char)
     _ -> Error(Nil)
   }
 }
@@ -27,6 +35,7 @@ fn char_control(char: String) -> Result(Control, Nil) {
   case char {
     " " -> Ok(TogglePlayPause)
     "q" -> Ok(Exit)
+    "/" -> Ok(Search)
     _ -> Error(Nil)
   }
 }

src/mpv/mpv.gleam

@@ -4,13 +4,13 @@ import gleam/otp/actor
 import gleam/result
 import gleam/string
 
-import input/key
+import input/key.{type Key}
 import mpv/control.{type Control}
 import tcp/reason
 import tcp/tcp.{type Socket}
 
-type State(socket, exit) {
-  State(socket: Socket, exit: Subject(Nil))
+type State(socket, inject_input, exit) {
+  State(socket: Socket, inject_input: Subject(Key), exit: Subject(Nil))
 }
 
 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) {
     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, exit))
+        actor.new(State(socket, inject_input, exit))
         |> actor.on_message(handle_message)
         |> actor.start
       {
@@ -30,7 +36,16 @@ pub fn new(exit: Subject(Nil)) -> Result(Nil, String) {
         Ok(actor.Started(data:, ..)) -> {
           echo "waiting for input"
           key.start_raw_shell()
-          process.spawn(fn() { read_input(data) })
+
+          process.spawn(fn() {
+            let input = process.new_subject()
+            let assert Ok(_) =
+              process.register(process.self(), inject_input_name)
+
+            process.send(input, key.Continue([]))
+            read_input(data, input, inject_input)
+          })
+
           Ok(Nil)
         }
       }
@@ -39,10 +54,14 @@ pub fn new(exit: Subject(Nil)) -> Result(Nil, String) {
 }
 
 fn handle_message(
-  state: State(socket, exit),
+  state: State(socket, inject, exit),
   control: Control,
-) -> actor.Next(State(socket, exit), Control) {
+) -> actor.Next(State(socket, inject, exit), Control) {
   case control {
+    control.Search -> {
+      process.send(state.inject_input, key.Continue([key.input_introducer]))
+      actor.continue(state)
+    }
     control.TogglePlayPause -> {
       echo "toggling play/pause"
 
@@ -65,14 +84,40 @@ fn handle_message(
   }
 }
 
-fn read_input(subject: Subject(Control)) -> Nil {
+/// read_input selects from two subjects: `input` and `inject`
+/// `inject` can be used by the agent to send back input character(s)
+/// to force the input to be something other than user input.
+///
+/// This is useful to create a `Key` without the user having to
+/// input all of the character(s), to then be able to create a
+/// `Control` from that `Key`
+fn read_input(
+  agent: Subject(Control),
+  input: Subject(Key),
+  inject_input: Subject(Key),
+) -> Nil {
+  let buffer = case
+    process.new_selector()
+    |> process.select(input)
+    |> process.select(inject_input)
+    |> process.selector_receive_forever
+  {
+    key.Continue(buffer) -> buffer
+    _ -> []
+  }
+
   case
-    key.read_input_until_key([])
+    key.read_input_until_key(buffer)
     |> control.from_key
   {
     Error(_) -> Nil
-    Ok(control) -> process.send(subject, control)
+    Ok(control) -> process.send(agent, control)
   }
 
-  read_input(subject)
+  // currently needed to allow injects to be received. not nice
+  // maybe timed out select on inject first, then normal?
+  process.sleep(100)
+
+  process.send(input, key.Continue([]))
+  read_input(agent, input, inject_input)
 }

test/input/input_test.gleam

@@ -12,18 +12,30 @@ type TestCase {
 }
 
 pub fn key_from_list_test() {
-  let test_cases = [
-    TestCase(["c"], Char("c")),
+  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),
-    TestCase([esc, csi], key.Continue),
-    TestCase([esc], key.Continue),
-    TestCase([], key.Continue),
   ]
 
-  list.each(test_cases, fn(tc) {
+  let input_tests = [
+    TestCase(["$"], key.Continue(["$"])),
+    TestCase(["$", "a"], key.Continue(["$", "a"])),
+    TestCase(["$", "a", "b"], key.Continue(["$", "ab"])),
+    TestCase(["$", "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)
   })
 }