wip

To separate the concern from `mpv`

src/input/key.gleam

@@ -1,6 +1,7 @@
 import gleam/erlang/atom
 import gleam/list
-import mpv/internal/key as internal_key
+
+import input/internal as internal_input
 
 pub type Key {
   Char(String)
@@ -51,12 +52,12 @@ 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_key.shell_start_interactive(#(no_shell, raw))
+  internal_input.shell_start_interactive(#(no_shell, raw))
 }
 
 pub fn read_input_until_key(l: List(String)) -> Key {
   case
-    internal_key.read_input()
+    internal_input.read_input()
     |> list.wrap
     |> list.append(l, _)
     |> from_list

src/mpv/control.gleam

@@ -1,16 +1,17 @@
-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
 }
 
@@ -19,6 +20,7 @@ pub type ControlError {
 }
 
 pub fn from_key(key: Key) -> Result(Control, Nil) {
+  echo key
   case key {
     key.Char(char) -> char_control(char)
     _ -> Error(Nil)
@@ -29,6 +31,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,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

@@ -1,7 +1,7 @@
 import gleam/list
 import gleeunit
 
-import mpv/key.{type Key, Char, csi, esc}
+import input/key.{type Key, Char, csi, esc}
 
 pub fn main() -> Nil {
   gleeunit.main()

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()