diff options
| author | salmon <salmonik@tuta.io> | 2026-08-09 23:20:23 +0200 |
|---|---|---|
| committer | salmon <salmonik@tuta.io> | 2026-08-09 23:20:23 +0200 |
| commit | b9ff96f24e59ba781f252e0de2f2136b19b4f0da (patch) | |
| tree | 69c7fa54609f376ba5676f684862ff9f3445e316 | |
| parent | Relative volume via prefixing/suffixing with +/- (diff) | |
| download | rsplayer-b9ff96f24e59ba781f252e0de2f2136b19b4f0da.tar.gz rsplayer-b9ff96f24e59ba781f252e0de2f2136b19b4f0da.zip | |
Actual message when daemon could not be found
| -rw-r--r-- | src/daemon.rs | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/src/daemon.rs b/src/daemon.rs index ddd3b77..279620d 100644 --- a/src/daemon.rs +++ b/src/daemon.rs | |||
| @@ -464,7 +464,28 @@ pub fn send_command(cmd: String) -> Result<(), Box<dyn std::error::Error>> { | |||
| 464 | fn send_command_raw(cmd: String) -> Result<(), Box<dyn std::error::Error>> { | 464 | fn send_command_raw(cmd: String) -> Result<(), Box<dyn std::error::Error>> { |
| 465 | let socket_path = Config::get_socket_path(); | 465 | let socket_path = Config::get_socket_path(); |
| 466 | 466 | ||
| 467 | let mut stream = UnixStream::connect(socket_path)?; | 467 | let mut stream = match UnixStream::connect(&socket_path) { |
| 468 | Ok(s) => s, | ||
| 469 | Err(e) => { | ||
| 470 | if e.kind() == std::io::ErrorKind::NotFound { | ||
| 471 | return Err(format!( | ||
| 472 | "RSPlayer daemon is not running (no socket at {}).\n\ | ||
| 473 | Start it with `rsp start-daemon` or `rsp restart`.", | ||
| 474 | socket_path.display() | ||
| 475 | ) | ||
| 476 | .into()); | ||
| 477 | } | ||
| 478 | if e.kind() == std::io::ErrorKind::ConnectionRefused { | ||
| 479 | return Err(format!( | ||
| 480 | "RSPlayer daemon is not responding (stale socket at {}).\n\ | ||
| 481 | Run `rsp restart` to clean up and start a fresh daemon.", | ||
| 482 | socket_path.display() | ||
| 483 | ) | ||
| 484 | .into()); | ||
| 485 | } | ||
| 486 | return Err(e.into()); | ||
| 487 | } | ||
| 488 | }; | ||
| 468 | stream.write_all(cmd.as_bytes())?; | 489 | stream.write_all(cmd.as_bytes())?; |
| 469 | 490 | ||
| 470 | let mut buf = [0u8; 4096]; | 491 | let mut buf = [0u8; 4096]; |
