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

Tiny refactor: simplify a few methods by removing initial_peers propagated too deep down

Browse source
This commit is contained in:
Igor Katson 2024-03-02 10:57:32 +00:00
parent 8f711ed2e7
commit 3a1d0c3ac9
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
2 changed files with 20 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -941,7 +941,6 @@ impl Session {
Ok::<_, anyhow::Error>(Some(PathBuf::from(longest)))
}
#[allow(clippy::too_many_arguments)]
async fn main_torrent_info(
&self,
info_hash: Id20,
@ -1017,17 +1016,26 @@ impl Session {
(managed_torrent, id)
};
// Merge "initial_peers" and "peer_rx" into one stream.
let peer_rx: Option<PeerStream> = if !initial_peers.is_empty() || peer_rx.is_some() {
use futures::future::Either;
Some(Box::new(
futures::stream::iter(initial_peers).chain(
peer_rx
.map(Either::Left)
.unwrap_or(Either::Right(futures::stream::empty())),
),
))
} else {
peer_rx
};
{
let span = managed_torrent.info.span.clone();
let _ = span.enter();
managed_torrent
.start(
initial_peers,
peer_rx,
opts.paused,
self.cancellation_token.child_token(),
)
.start(peer_rx, opts.paused, self.cancellation_token.child_token())
.context("error starting torrent")?;
}
@ -1119,12 +1127,7 @@ impl Session {
self.tcp_listen_port,
handle.info().options.force_tracker_interval,
)?;
handle.start(
Default::default(),
peer_rx,
false,
self.cancellation_token.child_token(),
)?;
handle.start(peer_rx, false, self.cancellation_token.child_token())?;
Ok(())
}
}