Skip to content

abort on disconnected #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 23, 2023
Merged

abort on disconnected #143

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use std::time::{Duration, SystemTime};
use chrono::{DateTime, Utc};
use clap::{ArgGroup, Parser};
use curl::easy::{Easy, HttpVersion, List, ReadError};
use flume::TryRecvError;

type Result<T> = std::result::Result<T, Box<dyn std::error::Error + Send + Sync>>;

Expand Down Expand Up @@ -339,8 +340,10 @@ fn main() -> Result<()> {
})?;

transfer.borrow_mut().read_function(|mut data: &mut [u8]| {
let Ok(mut bytes) = rx.try_recv() else {
return Err(ReadError::Pause);
let mut bytes = match rx.try_recv() {
Ok(bytes) => bytes,
Err(TryRecvError::Empty) => return Err(ReadError::Pause),
Err(TryRecvError::Disconnected) => return Err(ReadError::Abort),
};
bytes.extend_from_slice(b"\r\n");
if let Err(e) = data.write_all(&bytes) {
Expand Down