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

Rename a couple methods

Browse source
This commit is contained in:
Igor Katson 2024-12-04 10:08:51 +00:00
parent fa3e8d949b
commit 85b65dcef5
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/librqbit/src/torrent_state/live/mod.rs
View file

@ -674,7 +674,7 @@ impl TorrentStateLive {
.peers .peers
.states .states
.iter() .iter()
.filter(|e| filter.state.matches(e.value().state.get())) .filter(|e| filter.state.matches(e.value().state.get_state()))
.map(|e| (e.key().to_string(), e.value().into())) .map(|e| (e.key().to_string(), e.value().into()))
.collect(), .collect(),
} }
@ -809,7 +809,7 @@ impl TorrentStateLive {
fn disconnect_all_peers_that_have_full_torrent(&self) { fn disconnect_all_peers_that_have_full_torrent(&self) {
for mut pe in self.peers.states.iter_mut() { for mut pe in self.peers.states.iter_mut() {
if let PeerState::Live(l) = pe.value().state.get() { if let PeerState::Live(l) = pe.value().state.get_state() {
if l.has_full_torrent(self.lengths.total_pieces() as usize) { if l.has_full_torrent(self.lengths.total_pieces() as usize) {
let prev = pe.value_mut().state.set_not_needed(&self.peers); let prev = pe.value_mut().state.set_not_needed(&self.peers);
let _ = prev let _ = prev
@ -1122,7 +1122,7 @@ impl PeerHandler {
return Ok(()); return Ok(());
} }
}; };
let prev = pe.value_mut().state.take(pstats); let prev = pe.value_mut().state.take_state(pstats);
match prev { match prev {
PeerState::Connecting(_) => {} PeerState::Connecting(_) => {}
@ -1201,7 +1201,7 @@ impl PeerHandler {
self.state self.state
.peers .peers
.with_peer_mut(handle, "dead_to_queued", |peer| { .with_peer_mut(handle, "dead_to_queued", |peer| {
match peer.state.get() { match peer.state.get_state() {
PeerState::Dead => { PeerState::Dead => {
peer.state.set(PeerState::Queued, &self.state.peers) peer.state.set(PeerState::Queued, &self.state.peers)
} }

10
crates/librqbit/src/torrent_state/live/peer/mod.rs
View file

@ -59,7 +59,7 @@ impl Peer {
known_address: SocketAddr, known_address: SocketAddr,
counters: &PeerStates, counters: &PeerStates,
) -> Option<SocketAddr> { ) -> Option<SocketAddr> {
if let PeerState::NotNeeded = self.state.get() { if let PeerState::NotNeeded = self.state.get_state() {
match self.outgoing_address { match self.outgoing_address {
None => None, None => None,
Some(socket_addr) => { Some(socket_addr) => {
@ -125,11 +125,11 @@ impl PeerState {
pub(crate) struct PeerStateNoMut(PeerState); pub(crate) struct PeerStateNoMut(PeerState);
impl PeerStateNoMut { impl PeerStateNoMut {
pub fn get(&self) -> &PeerState { pub fn get_state(&self) -> &PeerState {
&self.0 &self.0
} }
pub fn take(&mut self, counters: &PeerStates) -> PeerState { pub fn take_state(&mut self, counters: &PeerStates) -> PeerState {
self.set(Default::default(), counters) self.set(Default::default(), counters)
} }
@ -185,7 +185,7 @@ impl PeerStateNoMut {
if matches!(&self.0, PeerState::Connecting(..) | PeerState::Live(..)) { if matches!(&self.0, PeerState::Connecting(..) | PeerState::Live(..)) {
anyhow::bail!("peer already active"); anyhow::bail!("peer already active");
} }
match self.take(counters) { match self.take_state(counters) {
PeerState::Queued | PeerState::Dead | PeerState::NotNeeded => { PeerState::Queued | PeerState::Dead | PeerState::NotNeeded => {
self.set( self.set(
PeerState::Live(LivePeerState::new(peer_id, tx, true)), PeerState::Live(LivePeerState::new(peer_id, tx, true)),
@ -203,7 +203,7 @@ impl PeerStateNoMut {
counters: &PeerStates, counters: &PeerStates,
) -> Option<&mut LivePeerState> { ) -> Option<&mut LivePeerState> {
if let PeerState::Connecting(_) = &self.0 { if let PeerState::Connecting(_) = &self.0 {
let tx = match self.take(counters) { let tx = match self.take_state(counters) {
PeerState::Connecting(tx) => tx, PeerState::Connecting(tx) => tx,
_ => unreachable!(), _ => unreachable!(),
}; };

2
crates/librqbit/src/torrent_state/live/peer/stats/snapshot.rs
View file

@ -51,7 +51,7 @@ impl From<&Peer> for PeerStats {
fn from(peer: &Peer) -> Self { fn from(peer: &Peer) -> Self {
Self { Self {
counters: peer.stats.counters.as_ref().into(), counters: peer.stats.counters.as_ref().into(),
state: peer.state.get().name(), state: peer.state.get_state().name(),
} }
} }
} }

2
crates/librqbit/src/torrent_state/live/peers/mod.rs
View file

@ -87,7 +87,7 @@ impl PeerStates {
pub fn drop_peer(&self, handle: PeerHandle) -> Option<Peer> { pub fn drop_peer(&self, handle: PeerHandle) -> Option<Peer> {
let p = self.states.remove(&handle).map(|r| r.1)?; let p = self.states.remove(&handle).map(|r| r.1)?;
let s = p.state.get(); let s = p.state.get_state();
self.stats.dec(s); self.stats.dec(s);
self.session_stats.peers.dec(s); self.session_stats.peers.dec(s);