fix: truncate before colorize (no dangling ANSI), emoji cleanup (#, 📁)
This commit is contained in:
parent
03d80067a8
commit
05a63fe911
2 changed files with 17 additions and 21 deletions
|
|
@ -43,7 +43,7 @@ fn print_session_info(label: &str, sid: &uuid::Uuid) {
|
|||
display::info_line("👤", "privileges:", &"no admin".yellow().to_string());
|
||||
|
||||
display::info_line("🖥", "device:", &label.bold().to_string());
|
||||
display::info_line("#️⃣", "session:", &sid.to_string().dimmed().to_string());
|
||||
display::info_line("#", "session:", &sid.to_string().dimmed().to_string());
|
||||
println!();
|
||||
}
|
||||
|
||||
|
|
@ -520,7 +520,7 @@ async fn handle_message(
|
|||
|
||||
ServerMessage::UploadRequest { request_id, path, content_base64 } => {
|
||||
let payload = trunc(&path, 60);
|
||||
display::cmd_start("⬆", "upload", &payload);
|
||||
display::cmd_start("📁", "upload", &payload);
|
||||
match (|| -> Result<(), String> {
|
||||
let bytes = base64::engine::general_purpose::STANDARD
|
||||
.decode(&content_base64)
|
||||
|
|
@ -532,11 +532,11 @@ async fn handle_message(
|
|||
Ok(())
|
||||
})() {
|
||||
Ok(()) => {
|
||||
display::cmd_done("⬆", "upload", &payload, true, "saved");
|
||||
display::cmd_done("📁", "upload", &payload, true, "saved");
|
||||
ClientMessage::Ack { request_id }
|
||||
}
|
||||
Err(e) => {
|
||||
display::cmd_done("⬆", "upload", &payload, false, &e);
|
||||
display::cmd_done("📁", "upload", &payload, false, &e);
|
||||
ClientMessage::Error { request_id, message: e }
|
||||
}
|
||||
}
|
||||
|
|
@ -544,16 +544,16 @@ async fn handle_message(
|
|||
|
||||
ServerMessage::DownloadRequest { request_id, path } => {
|
||||
let payload = trunc(&path, 60);
|
||||
display::cmd_start("⬇", "download", &payload);
|
||||
display::cmd_start("📁", "download", &payload);
|
||||
match std::fs::read(&path) {
|
||||
Ok(bytes) => {
|
||||
let size = bytes.len() as u64;
|
||||
let content_base64 = base64::engine::general_purpose::STANDARD.encode(&bytes);
|
||||
display::cmd_done("⬇", "download", &payload, true, &format!("{size} bytes"));
|
||||
display::cmd_done("📁", "download", &payload, true, &format!("{size} bytes"));
|
||||
ClientMessage::DownloadResponse { request_id, content_base64, size }
|
||||
}
|
||||
Err(e) => {
|
||||
display::cmd_done("⬇", "download", &payload, false, &format!("read failed: {e}"));
|
||||
display::cmd_done("📁", "download", &payload, false, &format!("read failed: {e}"));
|
||||
ClientMessage::Error { request_id, message: format!("Read failed: {e}") }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue