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

ws protocol: simplify code for AnnounceAction and ScrapeAction

Browse source
This commit is contained in:
Joakim Frostegård 2023-10-30 19:49:45 +01:00
parent d94936a50b
commit 577161e540
6 changed files with 35 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ws/src/workers/socket.rs
View file

@ -775,7 +775,7 @@ impl<S: futures::AsyncRead + futures::AsyncWrite + Unpin> ConnectionReader<S> {
for (consumer_index, info_hashes) in info_hashes_by_worker {
let in_message = InMessage::ScrapeRequest(ScrapeRequest {
action: ScrapeAction,
action: ScrapeAction::Scrape,
info_hashes: Some(ScrapeRequestInfoHashes::Multiple(info_hashes)),
});
@ -877,7 +877,7 @@ impl<S: futures::AsyncRead + futures::AsyncWrite + Unpin> ConnectionWriter<S> {
slab.shrink_to_fit();
OutMessage::ScrapeResponse(ScrapeResponse {
action: ScrapeAction,
action: ScrapeAction::Scrape,
files: pending.stats,
})
};

8
crates/ws/src/workers/swarm.rs
View file

@ -444,7 +444,7 @@ fn handle_announce_request(
for (offer, offer_receiver) in offers.into_iter().zip(offer_receivers) {
let offer_out_message = OfferOutMessage {
action: AnnounceAction,
action: AnnounceAction::Announce,
info_hash: request.info_hash,
peer_id: request.peer_id,
offer: offer.offer,
@ -470,7 +470,7 @@ fn handle_announce_request(
) {
if let Some(answer_receiver) = torrent_data.peers.get(&answer_receiver_id) {
let answer_out_message = AnswerOutMessage {
action: AnnounceAction,
action: AnnounceAction::Announce,
peer_id: request.peer_id,
info_hash: request.info_hash,
answer,
@ -489,7 +489,7 @@ fn handle_announce_request(
}
let out_message = OutMessage::AnnounceResponse(AnnounceResponse {
action: AnnounceAction,
action: AnnounceAction::Announce,
info_hash: request.info_hash,
complete: torrent_data.num_seeders,
incomplete: torrent_data.num_leechers(),
@ -515,7 +515,7 @@ fn handle_scrape_request(
let num_to_take = info_hashes.len().min(config.protocol.max_scrape_torrents);
let mut out_message = ScrapeResponse {
action: ScrapeAction,
action: ScrapeAction::Scrape,
files: HashMap::with_capacity(num_to_take),
};