wip

To separate the concern from `mpv`

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

@@ -0,0 +1,68 @@
+import gleam/erlang/atom
+import gleam/list
+
+import 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
+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 == "\r" {
+        True -> Input(cmd)
+        False -> 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)) -> Key {
+  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}
 import mpv/internal/control as internal_control
-import mpv/key.{type Key, Char}
 import tcp/reason.{type Reason}
 import tcp/tcp.{type Socket}
 
 pub type Control {
   TogglePlayPause
+
+  Search
+
   Exit
 }
 
@@ -17,8 +20,9 @@ pub type ControlError {
 }
 
 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 +31,7 @@ fn char_control(char: String) -> Result(Control, Nil) {
   case char {
     " " -> Ok(TogglePlayPause)
     "q" -> Ok(Exit)
+    "/" -> Ok(Search)
     _ -> Error(Nil)
   }
 }

src/mpv/key.gleam

@@ -1,53 +0,0 @@
-import gleam/erlang/atom
-import gleam/list
-
-import mpv/internal/key as internal_key
-
-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")
-  internal_key.shell_start_interactive(#(no_shell, raw))
-}
-
-pub fn read_input_until_key(l: List(String)) -> Key {
-  let l = internal_key.read_input() |> list.wrap |> list.append(l, _)
-
-  case from_list(l) {
-    Continue -> read_input_until_key(l)
-    k -> k
-  }
-}

src/mpv/mpv.gleam

@@ -4,8 +4,8 @@ import gleam/otp/actor
 import gleam/result
 import gleam/string
 
+import input/key
 import mpv/control.{type Control}
-import mpv/key
 import tcp/reason
 import tcp/tcp.{type Socket}
 
@@ -30,6 +30,11 @@ pub fn new(exit: Subject(Nil)) -> Result(Nil, String) {
         Ok(actor.Started(data:, ..)) -> {
           echo "waiting for input"
           key.start_raw_shell()
+          let input = process.new_subject()
+          process.self()
+          process.receive
+
+          process.spawn(fn() { input_handler(input, data) })
           process.spawn(fn() { read_input(data) })
           Ok(Nil)
         }
@@ -43,6 +48,7 @@ fn handle_message(
   control: Control,
 ) -> actor.Next(State(socket, exit), Control) {
   case control {
+    control.Search -> todo
     control.TogglePlayPause -> {
       echo "toggling play/pause"
 
@@ -65,14 +71,32 @@ fn handle_message(
   }
 }
 
-fn read_input(subject: Subject(Control)) -> Nil {
+// TODO create new input_handler_loop that recieves on a subject and 
+// TODO read_input reads until a key is found, and then sends it to
+
+// TODO a function that can recieve on a subject, and it can receive two types of messages:
+// 1. a Control message from read_input
+// 2. an injected controlMessage with pre-defined buffer
+// it then forwards the message to the actor subject
+
+fn read_input(input_handler: Subject(Control)) -> Nil {
   case
     key.read_input_until_key([])
     |> control.from_key
   {
     Error(_) -> Nil
-    Ok(control) -> process.send(subject, control)
+    Ok(control) -> process.send(input_handler, control)
   }
 
-  read_input(subject)
+  read_input(input_handler)
+}
+
+fn input_handler(
+  input: Subject(Control),
+  actor_subject: Subject(Control),
+) -> Nil {
+  case process.receive(input, 1000) {
+    Error(_) -> Nil
+    Ok(control) -> process.send(actor_subject, control)
+  }
 }

test/input/input_test.gleam

@@ -0,0 +1,41 @@
+import gleam/list
+import gleeunit
+
+import input/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 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(["$"], 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)
+  })
+}

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

@@ -1,29 +0,0 @@
-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),
-    TestCase([esc], key.Continue),
-    TestCase([], key.Continue),
-  ]
-
-  list.each(test_cases, fn(tc) {
-    assert tc.expected == key.from_list(tc.input)
-  })
-}