YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-01 10:15:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

udp: TorrentData: stop explicitly storing num_leechers

Browse source 
Calculate it with peers.len() - num_seeders instead
This commit is contained in:
Joakim Frostegård 2022-10-26 20:58:14 +02:00
parent 417ea68701
commit 77f5e68a9e
1 changed files with 12 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

35
aquatic_udp/src/workers/swarm/storage.rs
View file

@ -41,7 +41,6 @@ type PeerMap<I> = IndexMap<PeerId, Peer<I>>;
pub struct TorrentData<I: Ip> { pub struct TorrentData<I: Ip> {
peers: PeerMap<I>, peers: PeerMap<I>,
num_seeders: usize, num_seeders: usize,
num_leechers: usize,
} }
impl<I: Ip> TorrentData<I> { impl<I: Ip> TorrentData<I> {
@ -62,8 +61,6 @@ impl<I: Ip> TorrentData<I> {
valid_until, valid_until,
}; };
self.num_leechers += 1;
self.peers.insert(peer_id, peer) self.peers.insert(peer_id, peer)
} }
PeerStatus::Seeding => { PeerStatus::Seeding => {
@ -81,14 +78,11 @@ impl<I: Ip> TorrentData<I> {
PeerStatus::Stopped => self.peers.remove(&peer_id), PeerStatus::Stopped => self.peers.remove(&peer_id),
}; };
match opt_removed_peer.map(|peer| peer.is_seeder) { if let Some(Peer {
Some(true) => { is_seeder: true, ..
self.num_seeders -= 1; }) = opt_removed_peer
} {
Some(false) => { self.num_seeders -= 1;
self.num_leechers -= 1;
}
None => {}
} }
} }
@ -108,7 +102,7 @@ impl<I: Ip> TorrentData<I> {
} }
pub fn num_leechers(&self) -> usize { pub fn num_leechers(&self) -> usize {
self.num_leechers self.peers.len() - self.num_seeders
} }
pub fn num_seeders(&self) -> usize { pub fn num_seeders(&self) -> usize {
@ -118,24 +112,20 @@ impl<I: Ip> TorrentData<I> {
pub fn scrape_statistics(&self) -> TorrentScrapeStatistics { pub fn scrape_statistics(&self) -> TorrentScrapeStatistics {
create_torrent_scrape_statistics( create_torrent_scrape_statistics(
self.num_seeders.try_into().unwrap_or(i32::MAX), self.num_seeders.try_into().unwrap_or(i32::MAX),
self.num_leechers.try_into().unwrap_or(i32::MAX), self.num_leechers().try_into().unwrap_or(i32::MAX),
) )
} }
/// Remove inactive peers and reclaim space /// Remove inactive peers and reclaim space
fn clean(&mut self, now: SecondsSinceServerStart) { fn clean(&mut self, now: SecondsSinceServerStart) {
self.peers.retain(|_, peer| { self.peers.retain(|_, peer| {
if peer.valid_until.valid(now) { let keep = peer.valid_until.valid(now);
true
} else {
if peer.is_seeder {
self.num_seeders -= 1;
} else {
self.num_leechers -= 1;
}
false if (!keep) & peer.is_seeder {
self.num_seeders -= 1;
} }
keep
}); });
if !self.peers.is_empty() { if !self.peers.is_empty() {
@ -149,7 +139,6 @@ impl<I: Ip> Default for TorrentData<I> {
Self { Self {
peers: Default::default(), peers: Default::default(),
num_seeders: 0, num_seeders: 0,
num_leechers: 0,
} }
} }
} }