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

Fix merging DHT and tracker streams

Browse source
This commit is contained in:
Igor Katson 2024-04-29 13:57:29 +01:00
parent 9f806d7adb
commit 7c83240a1a
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
4 changed files with 80 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,7 @@ use std::{
use crate::{
dht_utils::{read_metainfo_from_peer_receiver, ReadMetainfoResult},
merge_streams::merge_streams,
peer_connection::PeerConnectionOptions,
read_buf::ReadBuf,
spawn_utils::BlockingSpawner,
@ -254,13 +255,13 @@ fn compute_only_files(
}
fn merge_two_optional_streams<T>(
s1: Option<impl Stream<Item = T> + Send + 'static>,
s2: Option<impl Stream<Item = T> + Send + 'static>,
s1: Option<impl Stream<Item = T> + Unpin + Send + 'static>,
s2: Option<impl Stream<Item = T> + Unpin + Send + 'static>,
) -> Option<BoxStream<'static, T>> {
match (s1, s2) {
(Some(s1), None) => Some(Box::pin(s1)),
(None, Some(s2)) => Some(Box::pin(s2)),
(Some(s1), Some(s2)) => Some(Box::pin(s1.chain(s2))),
(Some(s1), Some(s2)) => Some(Box::pin(merge_streams(s1, s2))),
(None, None) => None,
}
}