leyoda/rqbit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

👌 Improved error handling

Browse source
This commit is contained in:
Alexander WB 2025-02-25 03:27:59 +01:00
parent 8f019882d0
commit c19ea3979a
2 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/librqbit/src/blocklist.rs
View file

@ -1,4 +1,4 @@
use anyhow::Result; use anyhow::{Context, Result};
use async_compression::tokio::bufread::GzipDecoder; use async_compression::tokio::bufread::GzipDecoder;
use futures::TryStreamExt; use futures::TryStreamExt;
use intervaltree::IntervalTree; use intervaltree::IntervalTree;
@ -28,12 +28,11 @@ impl Blocklist {
} }
pub async fn load_from_url(url: &str) -> Result<Self> { pub async fn load_from_url(url: &str) -> Result<Self> {
let response = reqwest::get(url).await.map_err(|e| anyhow::anyhow!(e))?; let response = reqwest::get(url)
.await
.context("Failed to send request for blocklist")?;
if response.status() != 200 { if response.status() != 200 {
return Err(anyhow::anyhow!( anyhow::bail!("Failed to fetch blocklist: HTTP {}", response.status());
"Failed to fetch blocklist: HTTP {}",
response.status()
));
} }
let content_length = response let content_length = response
@ -41,9 +40,7 @@ impl Blocklist {
.ok_or_else(|| anyhow::anyhow!("Failed to get content length"))?; .ok_or_else(|| anyhow::anyhow!("Failed to get content length"))?;
if content_length < 2 { if content_length < 2 {
return Err(anyhow::anyhow!( anyhow::bail!("Content too short: not enough data to determine compression");
"Content too short: not enough data to determine compression"
));
} }
let reader = StreamReader::new( let reader = StreamReader::new(
@ -72,9 +69,7 @@ impl Blocklist {
if buffer.len() >= 2 { if buffer.len() >= 2 {
peek_bytes.copy_from_slice(&buffer[0..2]); peek_bytes.copy_from_slice(&buffer[0..2]);
} else { } else {
return Err(anyhow::anyhow!( anyhow::bail!("Content too short: not enough data to determine compression");
"Content too short: not enough data to determine compression"
));
} }
// Check for Gzip magic bytes (1F 8B) // Check for Gzip magic bytes (1F 8B)

1
crates/librqbit/src/session.rs
View file

@ -615,6 +615,7 @@ impl Session {
let blocklist: blocklist::Blocklist = if let Some(blocklist_url) = opts.blocklist_url { let blocklist: blocklist::Blocklist = if let Some(blocklist_url) = opts.blocklist_url {
blocklist::Blocklist::load_from_url(&blocklist_url) blocklist::Blocklist::load_from_url(&blocklist_url)
.await .await
.inspect_err(|e| warn!("failed to read blocklist: {e}"))
.unwrap() .unwrap()
} else { } else {
blocklist::Blocklist::empty() blocklist::Blocklist::empty()