diff --git a/src/musicplayer.gleam b/src/musicplayer.gleam index 98151d8..de7d965 100644 --- a/src/musicplayer.gleam +++ b/src/musicplayer.gleam @@ -1,8 +1,8 @@ import gleam/erlang/process.{type Name} -import input/input.{type Listener} -import input/key.{type Key} -import mpv/mpv +import musicplayer/input/input.{type Listener} +import musicplayer/input/key.{type Key} +import musicplayer/mpv/mpv pub fn main() -> Nil { let exit = process.new_subject() diff --git a/src/input/input.gleam b/src/musicplayer/input/input.gleam similarity index 97% rename from src/input/input.gleam rename to src/musicplayer/input/input.gleam index 3e8cace..d39fdd1 100644 --- a/src/input/input.gleam +++ b/src/musicplayer/input/input.gleam @@ -2,7 +2,7 @@ import gleam/erlang/process.{type Name, type Subject} import gleam/list import gleam/option.{type Option, None, Some} -import input/key.{type Key} +import musicplayer/input/key.{type Key} pub type Listener { InputListener(final: Subject(Key), tap: Option(Subject(List(String)))) diff --git a/src/input/internal.gleam b/src/musicplayer/input/internal.gleam similarity index 100% rename from src/input/internal.gleam rename to src/musicplayer/input/internal.gleam diff --git a/src/input/key.gleam b/src/musicplayer/input/key.gleam similarity index 96% rename from src/input/key.gleam rename to src/musicplayer/input/key.gleam index ebb7c2f..efe94b6 100644 --- a/src/input/key.gleam +++ b/src/musicplayer/input/key.gleam @@ -3,7 +3,7 @@ import gleam/erlang/process.{type Subject} import gleam/list import gleam/string -import input/internal as internal_input +import musicplayer/input/internal as internal_input pub type Key { Char(String) diff --git a/src/mpv/control.gleam b/src/musicplayer/mpv/control.gleam similarity index 90% rename from src/mpv/control.gleam rename to src/musicplayer/mpv/control.gleam index c33e03a..0e0b935 100644 --- a/src/mpv/control.gleam +++ b/src/musicplayer/mpv/control.gleam @@ -2,10 +2,10 @@ import gleam/json import gleam/result import gleam/string -import input/key.{type Key} -import mpv/internal as internal_control -import tcp/reason.{type Reason} -import tcp/tcp.{type Socket} +import musicplayer/input/key.{type Key} +import musicplayer/mpv/internal as internal_control +import musicplayer/tcp/reason.{type Reason} +import musicplayer/tcp/tcp.{type Socket} pub type Control { TogglePlayPause diff --git a/src/mpv/internal.gleam b/src/musicplayer/mpv/internal.gleam similarity index 100% rename from src/mpv/internal.gleam rename to src/musicplayer/mpv/internal.gleam diff --git a/src/mpv/mpv.gleam b/src/musicplayer/mpv/mpv.gleam similarity index 91% rename from src/mpv/mpv.gleam rename to src/musicplayer/mpv/mpv.gleam index 5b256a9..6f4732f 100644 --- a/src/mpv/mpv.gleam +++ b/src/musicplayer/mpv/mpv.gleam @@ -5,11 +5,11 @@ import gleam/otp/actor import gleam/result import gleam/string -import input/input.{type Listener, InputListener} -import input/key.{type Key} -import mpv/control.{type Control} -import tcp/reason -import tcp/tcp.{type Socket} +import musicplayer/input/input.{type Listener, InputListener} +import musicplayer/input/key.{type Key} +import musicplayer/mpv/control.{type Control} +import musicplayer/tcp/reason +import musicplayer/tcp/tcp.{type Socket} type State(socket, exit) { State(socket: Socket, exit: Subject(Nil)) diff --git a/src/tcp/reason.gleam b/src/musicplayer/tcp/reason.gleam similarity index 100% rename from src/tcp/reason.gleam rename to src/musicplayer/tcp/reason.gleam diff --git a/src/tcp/tcp.gleam b/src/musicplayer/tcp/tcp.gleam similarity index 98% rename from src/tcp/tcp.gleam rename to src/musicplayer/tcp/tcp.gleam index 77c2053..14fe309 100644 --- a/src/tcp/tcp.gleam +++ b/src/musicplayer/tcp/tcp.gleam @@ -2,7 +2,7 @@ import gleam/bit_array import gleam/erlang/atom import gleam/result -import tcp/reason.{type Reason} +import musicplayer/tcp/reason.{type Reason} pub type Socket diff --git a/src/tcp/tcp_ffi.erl b/src/musicplayer/tcp/tcp_ffi.erl similarity index 100% rename from src/tcp/tcp_ffi.erl rename to src/musicplayer/tcp/tcp_ffi.erl diff --git a/test/echo_server.gleam b/test/echo_server.gleam index 9e24c9f..ea0cd5e 100644 --- a/test/echo_server.gleam +++ b/test/echo_server.gleam @@ -4,8 +4,8 @@ import gleam/otp/actor import gleam/result import gleam/string -import tcp/reason.{type Reason} -import tcp/tcp +import musicplayer/tcp/reason.{type Reason} +import musicplayer/tcp/tcp pub type Message { Shutdown diff --git a/test/input/input_test.gleam b/test/musicplayer/input/input_test.gleam similarity index 92% rename from test/input/input_test.gleam rename to test/musicplayer/input/input_test.gleam index 204f094..bd1e947 100644 --- a/test/input/input_test.gleam +++ b/test/musicplayer/input/input_test.gleam @@ -1,7 +1,7 @@ import gleam/list import gleeunit -import input/key.{type Key, Char, csi, esc, input_introducer as ii} +import musicplayer/input/key.{type Key, Char, csi, esc, input_introducer as ii} pub fn main() -> Nil { gleeunit.main() diff --git a/test/mpv/control_test.gleam b/test/musicplayer/mpv/control_test.gleam similarity index 81% rename from test/mpv/control_test.gleam rename to test/musicplayer/mpv/control_test.gleam index 67b03a4..d46f403 100644 --- a/test/mpv/control_test.gleam +++ b/test/musicplayer/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 as control_internal +import musicplayer/input/key.{type Key, Char} +import musicplayer/mpv/control.{type Control} +import musicplayer/mpv/internal as control_internal pub fn main() -> Nil { gleeunit.main() diff --git a/test/tcp/tcp_test.gleam b/test/musicplayer/tcp/tcp_test.gleam similarity index 96% rename from test/tcp/tcp_test.gleam rename to test/musicplayer/tcp/tcp_test.gleam index 364277c..38ad961 100644 --- a/test/tcp/tcp_test.gleam +++ b/test/musicplayer/tcp/tcp_test.gleam @@ -3,7 +3,7 @@ import gleeunit import simplifile import echo_server -import tcp/tcp +import musicplayer/tcp/tcp pub fn main() -> Nil { gleeunit.main()