From 867785422ca4ae568abc2101aebdb327ce232dd6 Mon Sep 17 00:00:00 2001 From: Igor Katson Date: Mon, 29 Apr 2024 17:40:44 +0100 Subject: [PATCH] update a cuople error messages --- crates/librqbit/src/torrent_state/mod.rs | 10 ++++++++++ crates/librqbit/src/torrent_state/streaming.rs | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/crates/librqbit/src/torrent_state/mod.rs b/crates/librqbit/src/torrent_state/mod.rs index 752beb4..95259fe 100644 --- a/crates/librqbit/src/torrent_state/mod.rs +++ b/crates/librqbit/src/torrent_state/mod.rs @@ -55,6 +55,16 @@ pub enum ManagedTorrentState { } impl ManagedTorrentState { + pub fn name(&self) -> &'static str { + match self { + ManagedTorrentState::Initializing(_) => "initializing", + ManagedTorrentState::Paused(_) => "paused", + ManagedTorrentState::Live(_) => "live", + ManagedTorrentState::Error(_) => "error", + ManagedTorrentState::None => "", + } + } + fn assert_paused(self) -> TorrentStatePaused { match self { Self::Paused(paused) => paused, diff --git a/crates/librqbit/src/torrent_state/streaming.rs b/crates/librqbit/src/torrent_state/streaming.rs index ec98835..f53d288 100644 --- a/crates/librqbit/src/torrent_state/streaming.rs +++ b/crates/librqbit/src/torrent_state/streaming.rs @@ -300,9 +300,9 @@ impl ManagedTorrent { let files = match s { crate::ManagedTorrentState::Paused(p) => &p.files, crate::ManagedTorrentState::Live(l) => &l.files, - _ => anyhow::bail!("invalid state"), + s => anyhow::bail!("with_opened_file: invalid state {}", s.name()), }; - let fd = files.get(file_id).context("invalid file")?; + let fd = files.get(file_id).context("invalid file id")?; Ok(f(fd)) }) } @@ -311,7 +311,7 @@ impl ManagedTorrent { self.with_state(|s| match s { crate::ManagedTorrentState::Paused(p) => Ok(p.streams.clone()), crate::ManagedTorrentState::Live(l) => Ok(l.streams.clone()), - _ => anyhow::bail!("invalid state"), + s => anyhow::bail!("streams: invalid state {}", s.name()), }) }