YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-03-31 17:55:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

aquatic handle_announce_requests: reorder code, remove branch

Browse source
This commit is contained in:
Joakim Frostegård 2020-05-06 00:44:23 +02:00
parent f9428801bf
commit e0526ac828
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
aquatic/src/lib/handlers.rs
View file

@ -219,28 +219,23 @@ pub fn handle_announce_requests(
.entry(request.info_hash) .entry(request.info_hash)
.or_default(); .or_default();
let opt_removed_peer_status = if peer_status == PeerStatus::Stopped { let opt_removed_peer = match peer_status {
torrent_data.peers.remove(&peer_key).map(|peer| peer.status)
} else {
torrent_data.peers.insert(peer_key, peer).map(|peer| peer.status)
};
let max_num_peers_to_take = calc_max_num_peers_to_take(
config,
request.peers_wanted.0
);
match peer_status {
PeerStatus::Leeching => { PeerStatus::Leeching => {
torrent_data.num_leechers += 1; torrent_data.num_leechers += 1;
torrent_data.peers.insert(peer_key, peer)
}, },
PeerStatus::Seeding => { PeerStatus::Seeding => {
torrent_data.num_seeders += 1; torrent_data.num_seeders += 1;
torrent_data.peers.insert(peer_key, peer)
}, },
PeerStatus::Stopped => {} PeerStatus::Stopped => {
torrent_data.peers.remove(&peer_key)
}
}; };
match opt_removed_peer_status { match opt_removed_peer.map(|peer| peer.status){
Some(PeerStatus::Leeching) => { Some(PeerStatus::Leeching) => {
torrent_data.num_leechers -= 1; torrent_data.num_leechers -= 1;
}, },
@ -250,6 +245,11 @@ pub fn handle_announce_requests(
_ => {} _ => {}
} }
let max_num_peers_to_take = calc_max_num_peers_to_take(
config,
request.peers_wanted.0
);
let response_peers = extract_response_peers( let response_peers = extract_response_peers(
rng, rng,
&torrent_data.peers, &torrent_data.peers,