From a9ca06b5f0c069d4746ab881a33dbb5d25030b1c Mon Sep 17 00:00:00 2001 From: jika Date: Sat, 5 Aug 2023 00:02:19 +0200 Subject: [PATCH] some renaming + fix spedy loop in server --- Cargo.lock | 44 +++++++++--------- Cargo.toml | 4 +- {deckapp => app}/Cargo.toml | 2 +- {deckapp => app}/src/main.rs | 2 +- buildui.sh | 2 - lib/src/tcp/mod.rs | 1 + {deckui => remote}/Cargo.toml | 7 +-- {deckui => remote}/build.rs | 0 {deckui => remote}/icons/back.png | Bin {deckui => remote}/icons/loop.png | Bin {deckui => remote}/icons/pause.png | Bin {deckui => remote}/icons/play-pause.png | Bin {deckui => remote}/icons/play.png | Bin {deckui => remote}/icons/rec.png | Bin {deckui => remote}/icons/shuffle.png | Bin {deckui => remote}/icons/skip.png | Bin {deckui => remote}/icons/stop.png | Bin {deckui => remote}/src/main.rs | 2 +- {deckui => remote}/ui/appwindow.slint | 0 {deckui => remote}/ui/widgets/clickable.slint | 0 .../ui/widgets/mediacontrols.slint | 0 rock64.sh | 2 + rock64.yml | 8 ++++ runcc.yml | 8 ++-- 24 files changed, 44 insertions(+), 38 deletions(-) rename {deckapp => app}/Cargo.toml (93%) rename {deckapp => app}/src/main.rs (99%) delete mode 100644 buildui.sh rename {deckui => remote}/Cargo.toml (75%) rename {deckui => remote}/build.rs (100%) rename {deckui => remote}/icons/back.png (100%) rename {deckui => remote}/icons/loop.png (100%) rename {deckui => remote}/icons/pause.png (100%) rename {deckui => remote}/icons/play-pause.png (100%) rename {deckui => remote}/icons/play.png (100%) rename {deckui => remote}/icons/rec.png (100%) rename {deckui => remote}/icons/shuffle.png (100%) rename {deckui => remote}/icons/skip.png (100%) rename {deckui => remote}/icons/stop.png (100%) rename {deckui => remote}/src/main.rs (96%) rename {deckui => remote}/ui/appwindow.slint (100%) rename {deckui => remote}/ui/widgets/clickable.slint (100%) rename {deckui => remote}/ui/widgets/mediacontrols.slint (100%) create mode 100644 rock64.sh create mode 100644 rock64.yml diff --git a/Cargo.lock b/Cargo.lock index cbfeabc..4fcaab2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -152,6 +152,16 @@ version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +[[package]] +name = "app" +version = "0.1.0" +dependencies = [ + "anyhow", + "env_logger", + "lib", + "log", +] + [[package]] name = "arrayref" version = "0.3.7" @@ -880,28 +890,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" -[[package]] -name = "deckapp" -version = "0.1.0" -dependencies = [ - "anyhow", - "env_logger", - "lib", - "log", -] - -[[package]] -name = "deckui" -version = "0.1.0" -dependencies = [ - "anyhow", - "env_logger", - "lib", - "log", - "slint", - "slint-build", -] - [[package]] name = "derivative" version = "2.2.0" @@ -2704,6 +2692,18 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +[[package]] +name = "remote" +version = "0.1.0" +dependencies = [ + "anyhow", + "env_logger", + "lib", + "log", + "slint", + "slint-build", +] + [[package]] name = "resvg" version = "0.34.1" diff --git a/Cargo.toml b/Cargo.toml index 1f8eeec..a9603e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [workspace] members = [ - 'deckui', - 'deckapp', + 'remote', + 'app', 'lib' ] diff --git a/deckapp/Cargo.toml b/app/Cargo.toml similarity index 93% rename from deckapp/Cargo.toml rename to app/Cargo.toml index 192443d..62fefd9 100644 --- a/deckapp/Cargo.toml +++ b/app/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "deckapp" +name = "app" version = "0.1.0" edition = "2021" diff --git a/deckapp/src/main.rs b/app/src/main.rs similarity index 99% rename from deckapp/src/main.rs rename to app/src/main.rs index b1f97a5..1fce5c7 100644 --- a/deckapp/src/main.rs +++ b/app/src/main.rs @@ -13,7 +13,7 @@ fn main() { let mut i = 0; loop { i += 1; - if i == 50 { + if i == 35 { i = 0; sender_s .send(ServerMessage::NowPlaying(get_np().unwrap())) diff --git a/buildui.sh b/buildui.sh deleted file mode 100644 index 1baf122..0000000 --- a/buildui.sh +++ /dev/null @@ -1,2 +0,0 @@ -cross build --release -p deckui --target=aarch64-unknown-linux-gnu && scp -i ~/.ssh/onekey ./target/aarch64-unknown-linux-gnu/release/deckui rockpro64:/home/jika/deckui2 && echo "Uploaded" - diff --git a/lib/src/tcp/mod.rs b/lib/src/tcp/mod.rs index ad8bd15..67ca64e 100644 --- a/lib/src/tcp/mod.rs +++ b/lib/src/tcp/mod.rs @@ -90,6 +90,7 @@ pub fn start_server() -> Result<(Sender, Receiver) thread::spawn(move || { for stream_result in server.incoming() { + thread::sleep(Duration::from_millis(500)); match stream_result { Ok(stream) => { let reciever_s = reciever_s.clone(); diff --git a/deckui/Cargo.toml b/remote/Cargo.toml similarity index 75% rename from deckui/Cargo.toml rename to remote/Cargo.toml index 00cd158..17a59b6 100644 --- a/deckui/Cargo.toml +++ b/remote/Cargo.toml @@ -1,17 +1,14 @@ [package] -name = "deckui" +name = "remote" version = "0.1.0" build = "build.rs" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -[package.metadata.cross.build] -default-target = "aarch64-unknown-linux-gnu" - [[bin]] path = "src/main.rs" -name = "deckui" +name = "remote" [dependencies] lib = {path = "../lib"} diff --git a/deckui/build.rs b/remote/build.rs similarity index 100% rename from deckui/build.rs rename to remote/build.rs diff --git a/deckui/icons/back.png b/remote/icons/back.png similarity index 100% rename from deckui/icons/back.png rename to remote/icons/back.png diff --git a/deckui/icons/loop.png b/remote/icons/loop.png similarity index 100% rename from deckui/icons/loop.png rename to remote/icons/loop.png diff --git a/deckui/icons/pause.png b/remote/icons/pause.png similarity index 100% rename from deckui/icons/pause.png rename to remote/icons/pause.png diff --git a/deckui/icons/play-pause.png b/remote/icons/play-pause.png similarity index 100% rename from deckui/icons/play-pause.png rename to remote/icons/play-pause.png diff --git a/deckui/icons/play.png b/remote/icons/play.png similarity index 100% rename from deckui/icons/play.png rename to remote/icons/play.png diff --git a/deckui/icons/rec.png b/remote/icons/rec.png similarity index 100% rename from deckui/icons/rec.png rename to remote/icons/rec.png diff --git a/deckui/icons/shuffle.png b/remote/icons/shuffle.png similarity index 100% rename from deckui/icons/shuffle.png rename to remote/icons/shuffle.png diff --git a/deckui/icons/skip.png b/remote/icons/skip.png similarity index 100% rename from deckui/icons/skip.png rename to remote/icons/skip.png diff --git a/deckui/icons/stop.png b/remote/icons/stop.png similarity index 100% rename from deckui/icons/stop.png rename to remote/icons/stop.png diff --git a/deckui/src/main.rs b/remote/src/main.rs similarity index 96% rename from deckui/src/main.rs rename to remote/src/main.rs index b4a23d3..1f42612 100644 --- a/deckui/src/main.rs +++ b/remote/src/main.rs @@ -12,7 +12,7 @@ fn main() -> Result<(), slint::PlatformError> { let mut retries = 1; let (sender_co, receiver_s) = loop { - let res = start_client(IpAddr::from_str("192.168.0.101").unwrap()); + let res = start_client(IpAddr::from_str("127.0.0.1").unwrap()); if let Ok((s, r)) = res { break (s, r); } diff --git a/deckui/ui/appwindow.slint b/remote/ui/appwindow.slint similarity index 100% rename from deckui/ui/appwindow.slint rename to remote/ui/appwindow.slint diff --git a/deckui/ui/widgets/clickable.slint b/remote/ui/widgets/clickable.slint similarity index 100% rename from deckui/ui/widgets/clickable.slint rename to remote/ui/widgets/clickable.slint diff --git a/deckui/ui/widgets/mediacontrols.slint b/remote/ui/widgets/mediacontrols.slint similarity index 100% rename from deckui/ui/widgets/mediacontrols.slint rename to remote/ui/widgets/mediacontrols.slint diff --git a/rock64.sh b/rock64.sh new file mode 100644 index 0000000..5e836d3 --- /dev/null +++ b/rock64.sh @@ -0,0 +1,2 @@ +cross build --release -p remote --target=aarch64-unknown-linux-gnu && scp -i ~/.ssh/onekey ./target/aarch64-unknown-linux-gnu/release/remote rockpro64:/home/jika/remote2 && echo "Uploaded" + diff --git a/rock64.yml b/rock64.yml new file mode 100644 index 0000000..3c8902f --- /dev/null +++ b/rock64.yml @@ -0,0 +1,8 @@ +commands: + lib: | + cargo watch -d 2 -w lib -x "build -p lib" + remote: | + cargo watch -d 2 -w remote -- sh ./buildui.sh + app: | + cargo watch -d 2 -w app -w lib -x "run --release -p app" + diff --git a/runcc.yml b/runcc.yml index bba3b50..07d33c5 100644 --- a/runcc.yml +++ b/runcc.yml @@ -1,8 +1,8 @@ commands: lib: | cargo watch -d 2 -w lib -x "build -p lib" - deckui: | - cargo watch -d 2 -w deckui -- sh ./buildui.sh - deckapp: | - cargo watch -d 2 -w deckapp -w lib -x "run --release -p deckapp" + remote: | + cargo watch -d 2 -w remote -x "run --release -p remote" + app: | + cargo watch -d 2 -w app -w lib -x "run --release -p app"