diff --git a/client/src/app.rs b/client/src/app.rs index ed9f361..a76c0ba 100644 --- a/client/src/app.rs +++ b/client/src/app.rs @@ -169,7 +169,7 @@ impl LesavkaClientApp { if let Err(e) = msg { warn!("⌨️ server err: {e}"); break; } } } - Err(e) => warn!("⌨️ connect failed: {e}"), + Err(e) => warn!("❌⌨️ connect failed: {e}"), } tokio::time::sleep(Duration::from_secs(1)).await; // retry } @@ -190,7 +190,7 @@ impl LesavkaClientApp { if let Err(e) = msg { warn!("🖱️ server err: {e}"); break; } } } - Err(e) => warn!("🖱️ connect failed: {e}"), + Err(e) => warn!("❌🖱️ connect failed: {e}"), } tokio::time::sleep(Duration::from_secs(1)).await; } @@ -247,7 +247,7 @@ impl LesavkaClientApp { if let Ok(pkt) = res { out.push(pkt); } } } - Err(e) => tracing::warn!("audio stream err: {e}"), + Err(e) => tracing::warn!("❌🔊 audio stream err: {e}"), } tokio::time::sleep(Duration::from_secs(1)).await; } @@ -281,7 +281,7 @@ impl LesavkaClientApp { // Drain and ignore Empty replies while resp.get_mut().message().await.transpose().is_some() {} } - Err(e) => warn!("🎤 connect failed: {e}"), + Err(e) => warn!("❌🎤 connect failed: {e}"), } let _ = stop_tx.send(()); tokio::time::sleep(Duration::from_secs(1)).await; diff --git a/client/src/input/keyboard.rs b/client/src/input/keyboard.rs index 4c92b34..6ce8fd6 100644 --- a/client/src/input/keyboard.rs +++ b/client/src/input/keyboard.rs @@ -40,11 +40,11 @@ impl KeyboardAggregator { let events: Vec = match self.dev.fetch_events() { Ok(it) => it.collect(), Err(e) if e.kind() == std::io::ErrorKind::WouldBlock => return, - Err(e) => { if self.dev_mode { error!("read error: {e}"); } return } + Err(e) => { if self.dev_mode { error!("⌨️❌ read error: {e}"); } return } }; if self.dev_mode && !events.is_empty() { - trace!("{} kbd evts from {}", events.len(), self.dev.name().unwrap_or("?")); + trace!("⌨️ {} kbd evts from {}", events.len(), self.dev.name().unwrap_or("?")); } for ev in events { diff --git a/client/src/input/mouse.rs b/client/src/input/mouse.rs index 6039615..9c2b3be 100644 --- a/client/src/input/mouse.rs +++ b/client/src/input/mouse.rs @@ -41,11 +41,11 @@ impl MouseAggregator { let evts: Vec = match self.dev.fetch_events() { Ok(it) => it.collect(), Err(e) if e.kind() == std::io::ErrorKind::WouldBlock => return, - Err(e) => { if self.dev_mode { error!("mouse read err: {e}"); } return } + Err(e) => { if self.dev_mode { error!("🖱️❌ mouse read err: {e}"); } return } }; if self.dev_mode && !evts.is_empty() { - trace!("🖱️ {} evts from {}", evts.len(), self.dev.name().unwrap_or("?")); + trace!("🖱️ {} evts from {}", evts.len(), self.dev.name().unwrap_or("?")); } for e in evts { @@ -86,9 +86,9 @@ impl MouseAggregator { if let Err(broadcast::error::SendError(_)) = self.tx.send(MouseReport { data: pkt.to_vec() }) { - if self.dev_mode { warn!("❌ no HID receiver (mouse)"); } + if self.dev_mode { warn!("❌🖱️ no HID receiver (mouse)"); } } else if self.dev_mode { - debug!("📤 mouse {:?}", pkt); + debug!("📤🖱️ mouse {:?}", pkt); } } diff --git a/scripts/install/server.sh b/scripts/install/server.sh index d6965b9..1a9f19a 100755 --- a/scripts/install/server.sh +++ b/scripts/install/server.sh @@ -122,7 +122,7 @@ After=network.target lesavka-core.service [Service] ExecStart=/usr/local/bin/lesavka-server Restart=always -Environment=RUST_LOG=lesavka_server=trace,lesavka_server::audio=trace,lesavka_server::video=info,lesavka_server::gadget=trace +Environment=RUST_LOG=lesavka_server=info,lesavka_server::audio=info,lesavka_server::video=info,lesavka_server::gadget=info Environment=RUST_BACKTRACE=1 Environment=GST_DEBUG="*:2,alsasink:6,alsasrc:6" Restart=always diff --git a/scripts/manual/audio-clip-fetch.sh b/scripts/manual/audio-clip-fetch.sh old mode 100644 new mode 100755 diff --git a/scripts/manual/audio-mic-fetch.sh b/scripts/manual/audio-mic-fetch.sh old mode 100644 new mode 100755 index 8b7e5eb..a74214d --- a/scripts/manual/audio-mic-fetch.sh +++ b/scripts/manual/audio-mic-fetch.sh @@ -4,9 +4,9 @@ PI_HOST="nikto@192.168.42.253" # adjust if needed REMOTE_DIR="/tmp" TMPDIR=$(mktemp -d) -scp -q "${PI_HOST}:${REMOTE_DIR}/mic-*.aac" "$TMPDIR/" 2>/dev/null \ +scp -q "${PI_HOST}:${REMOTE_DIR}/voice-*.aac" "$TMPDIR/" 2>/dev/null \ || { echo "❌ no mic clip files found yet"; exit 1; } -LATEST=$(ls -1t "$TMPDIR"/mic-*.aac | head -n1) +LATEST=$(ls -1t "$TMPDIR"/voice-*.aac | head -n1) echo "🎤 playing $(basename "$LATEST") ..." gst-play-1.0 --quiet "$LATEST" diff --git a/scripts/manual/vpn-open.sh b/scripts/manual/vpn-open.sh index a60015e..c029002 100755 --- a/scripts/manual/vpn-open.sh +++ b/scripts/manual/vpn-open.sh @@ -1,4 +1,7 @@ #!/usr/bin/env bash # scripts/manual/vpn-open.sh -sudo openvpn --config ~/cyberghost/openvpn.ovpn +here=$(pwd) +cd /home/brad/cyberghost +sudo openvpn --config openvpn.ovpn +cd $here