From 62380e745ea66b6abc59d753ba7e8cbc25c98d09 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Tue, 1 Nov 2022 02:01:31 -0600
Subject: [PATCH] Move music player protocol into music player crate

---
 Cargo.toml                                        |  1 -
 apps/music-player/Cargo.toml                      | 15 ++++++++++++---
 .../music-player}/src/lib.rs                      |  3 +++
 apps/music-player/src/main.rs                     |  2 +-
 crates/music-player-protocol/Cargo.toml           |  7 -------
 scripts/music-player/Cargo.toml                   |  3 +--
 scripts/music-player/src/lib.rs                   |  2 +-
 7 files changed, 18 insertions(+), 15 deletions(-)
 rename {crates/music-player-protocol => apps/music-player}/src/lib.rs (98%)
 delete mode 100644 crates/music-player-protocol/Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index cb8e758..3d04ea3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,6 @@ members = [
   "apps/magpie",
   "apps/music-player",
   "apps/sandbox",
-  "crates/music-player-protocol",
   "crates/script",
   "crates/types",
   "scripts/music-player",
diff --git a/apps/music-player/Cargo.toml b/apps/music-player/Cargo.toml
index e8d43fc..bc71b4a 100644
--- a/apps/music-player/Cargo.toml
+++ b/apps/music-player/Cargo.toml
@@ -3,7 +3,16 @@ name = "canary-music-player"
 version = "0.1.0"
 edition = "2021"
 
+[[bin]]
+name = "canary-music-player"
+path = "src/main.rs"
+required-features = ["bin"]
+
 [dependencies]
-canary-music-player-protocol = { path = "../../crates/music-player-protocol" }
-canary-magpie = { path = "../magpie" }
-mpris = "2.0.0-rc3"
+canary-magpie = { path = "../magpie", optional = true }
+mpris = { version = "2.0.0-rc3", optional = true }
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+
+[features]
+bin = ["dep:canary-magpie", "dep:mpris"]
diff --git a/crates/music-player-protocol/src/lib.rs b/apps/music-player/src/lib.rs
similarity index 98%
rename from crates/music-player-protocol/src/lib.rs
rename to apps/music-player/src/lib.rs
index c88e356..2c04850 100644
--- a/crates/music-player-protocol/src/lib.rs
+++ b/apps/music-player/src/lib.rs
@@ -1,5 +1,8 @@
 use serde::{Deserialize, Serialize};
 
+pub use serde;
+pub use serde_json;
+
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub enum PlaybackStatus {
     /// A track is currently playing.
diff --git a/apps/music-player/src/main.rs b/apps/music-player/src/main.rs
index 93b5366..d142d49 100644
--- a/apps/music-player/src/main.rs
+++ b/apps/music-player/src/main.rs
@@ -1,4 +1,4 @@
-use canary_music_player_protocol::*;
+use canary_music_player::*;
 use canary_magpie::client::MagpieClient;
 use canary_magpie::protocol::{CreatePanel, MagpieServerMsg};
 use mpris::PlayerFinder;
diff --git a/crates/music-player-protocol/Cargo.toml b/crates/music-player-protocol/Cargo.toml
deleted file mode 100644
index 83c8930..0000000
--- a/crates/music-player-protocol/Cargo.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[package]
-name = "canary-music-player-protocol"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-serde = { version = "1", features = ["derive"] }
diff --git a/scripts/music-player/Cargo.toml b/scripts/music-player/Cargo.toml
index 98fd0c9..14105da 100644
--- a/scripts/music-player/Cargo.toml
+++ b/scripts/music-player/Cargo.toml
@@ -8,6 +8,5 @@ crate-type = ["cdylib"]
 
 [dependencies]
 canary_script = { path = "../../crates/script" }
-canary-music-player-protocol = { path = "../../crates/music-player-protocol" }
-serde_json = "1"
+canary-music-player = { path = "../../apps/music-player" }
 wee_alloc = "^0.4"
diff --git a/scripts/music-player/src/lib.rs b/scripts/music-player/src/lib.rs
index 56d2bc9..e0b367f 100644
--- a/scripts/music-player/src/lib.rs
+++ b/scripts/music-player/src/lib.rs
@@ -44,7 +44,7 @@ impl PanelImpl for MusicPlayerPanel {
     fn on_cursor_event(&mut self, kind: CursorEventKind, at: Vec2) {}
 
     fn on_message(&mut self, msg: Message) {
-        use canary_music_player_protocol::InMsg;
+        use canary_music_player::{InMsg, serde_json};
         let msg = msg.to_vec();
         let msg = serde_json::from_slice::<InMsg>(&msg);
         self.label.set_text(format!("{:#?}", msg));