From 59f222a0a29f769c746740301db98adc9b6e83ea Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Tue, 5 Dec 2017 23:49:35 -0800 Subject: count as an arg for recieve-some --- src/bin/geniza-net.rs | 9 +++++---- src/protocol.rs | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/bin/geniza-net.rs b/src/bin/geniza-net.rs index 11bcee8..6d38eae 100644 --- a/src/bin/geniza-net.rs +++ b/src/bin/geniza-net.rs @@ -43,7 +43,8 @@ fn run() -> Result<()> { SubCommand::with_name("receive-some") .about("Connects to a peer, pulls some metadata and content") .arg_from_usage(" 'peer host:port to connect to'") - .arg_from_usage(" 'dat key (public key) to register with'"), + .arg_from_usage(" 'dat key (public key) to register with'") + .arg_from_usage(" 'how many entries to pull'"), ) .subcommand( SubCommand::with_name("discovery-key") @@ -87,11 +88,11 @@ fn run() -> Result<()> { ("receive-some", Some(subm)) => { let host_port = subm.value_of("host_port").unwrap(); let dat_key = subm.value_of("dat_key").unwrap(); + let count: u64 = subm.value_of("count").unwrap().parse().unwrap(); let key_bytes = parse_dat_key(&dat_key)?; let mut dc = DatConnection::connect(host_port, &key_bytes, false)?; - // XXX: number here totally arbitrary - dc.receive_all(false, 10)?; - dc.receive_all(true, 10)?; + dc.receive_some(false, count)?; + dc.receive_some(true, count)?; println!("Done!"); } ("discovery-key", Some(subm)) => { diff --git a/src/protocol.rs b/src/protocol.rs index 733477d..2b23959 100644 --- a/src/protocol.rs +++ b/src/protocol.rs @@ -449,7 +449,7 @@ impl DatConnection { } } - pub fn receive_all(&mut self, is_content: bool, length: u64) -> Result<()> { + pub fn receive_some(&mut self, is_content: bool, length: u64) -> Result<()> { // Info: downloading, not uploading let mut im = Info::new(); im.set_uploading(false); -- cgit v1.2.3