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

Fix magnet links

Browse source
This commit is contained in:
Igor Katson 2024-05-17 23:57:25 +01:00
parent b687a1882c
commit f63e729da1
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
3 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/librqbit/src/dht_utils.rs
View file

@ -4,7 +4,7 @@ use anyhow::Context;
use buffers::ByteBufOwned; use buffers::ByteBufOwned;
use futures::{stream::FuturesUnordered, Stream, StreamExt}; use futures::{stream::FuturesUnordered, Stream, StreamExt};
use librqbit_core::torrent_metainfo::TorrentMetaV1Info; use librqbit_core::torrent_metainfo::TorrentMetaV1Info;
use tracing::debug; use tracing::{debug, error_span, Instrument};
use crate::{ use crate::{
peer_connection::PeerConnectionOptions, peer_info_reader, spawn_utils::BlockingSpawner, peer_connection::PeerConnectionOptions, peer_info_reader, spawn_utils::BlockingSpawner,
@ -46,6 +46,7 @@ pub async fn read_metainfo_from_peer_receiver<A: Stream<Item = SocketAddr> + Unp
peer_connection_options, peer_connection_options,
BlockingSpawner::new(true), BlockingSpawner::new(true),
) )
.instrument(error_span!("read_metainfo_from_peer", ?addr))
.await .await
.with_context(|| format!("error reading metainfo from {addr}")); .with_context(|| format!("error reading metainfo from {addr}"));
drop(token); drop(token);

16
crates/librqbit/src/peer_connection.rs
View file

@ -19,7 +19,7 @@ use peer_binary_protocol::{
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_with::serde_as; use serde_with::serde_as;
use tokio::time::timeout; use tokio::time::timeout;
use tracing::trace; use tracing::{debug, trace};
use crate::{read_buf::ReadBuf, spawn_utils::BlockingSpawner}; use crate::{read_buf::ReadBuf, spawn_utils::BlockingSpawner};
@ -262,10 +262,12 @@ impl<H: PeerConnectionHandler> PeerConnection<H> {
trace!("sent bitfield"); trace!("sent bitfield");
} }
let mut broadcast_closed = false;
loop { loop {
let req = loop { let req = loop {
break tokio::select! { break tokio::select! {
r = have_broadcast.recv() => match r { r = have_broadcast.recv(), if !broadcast_closed => match r {
Ok(id) => { Ok(id) => {
if self.handler.should_transmit_have(id) { if self.handler.should_transmit_have(id) {
WriterRequest::Message(MessageOwned::Have(id.get())) WriterRequest::Message(MessageOwned::Have(id.get()))
@ -273,7 +275,11 @@ impl<H: PeerConnectionHandler> PeerConnection<H> {
continue continue
} }
}, },
Err(tokio::sync::broadcast::error::RecvError::Closed) => anyhow::bail!("closing writer, broadcast channel closed"), Err(tokio::sync::broadcast::error::RecvError::Closed) => {
broadcast_closed = true;
debug!("broadcast channel closed, will not poll it anymore");
continue
},
_ => continue _ => continue
}, },
r = timeout(keep_alive_interval, outgoing_chan.recv()) => match r { r = timeout(keep_alive_interval, outgoing_chan.recv()) => match r {
@ -389,11 +395,11 @@ impl<H: PeerConnectionHandler> PeerConnection<H> {
tokio::select! { tokio::select! {
r = reader => { r = reader => {
trace!("reader is done, exiting"); trace!(result=?r, "reader is done, exiting");
r r
} }
r = writer => { r = writer => {
trace!("writer is done, exiting"); trace!(result=?r, "writer is done, exiting");
r r
} }
} }

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

@ -1239,7 +1239,7 @@ impl tracker_comms::TorrentStatsProvider for PeerRxTorrentInfo {
let mt = match mt { let mt = match mt {
Some(mt) => mt, Some(mt) => mt,
None => { None => {
warn!(info_hash=?self.info_hash, "can't find torrent in the session"); trace!(info_hash=?self.info_hash, "can't find torrent in the session, using default stats");
return Default::default(); return Default::default();
} }
}; };