refactor

Author: Byron

git-packetline/src/lib.rs

@@ -18,9 +18,9 @@ pub enum Channel {
 pub mod borrowed;
 pub use borrowed::Borrowed as PacketLine;
 
-pub mod reader;
+pub mod provider;
 #[doc(inline)]
-pub use reader::Reader;
+pub use provider::Provider;
 
 pub mod write;
 pub use write::Writer;

git-packetline/src/reader/mod.rs renamed to git-packetline/src/provider/mod.rs

@@ -9,7 +9,7 @@ pub use read::ReadWithSidebands;
 /// Read pack lines one after another, without consuming more than needed from the underlying
 /// `Read`. `Flush` lines cause the reader to stop producing lines forever, leaving `Read` at the
 /// start of whatever comes next.
-pub struct Reader<T> {
+pub struct Provider<T> {
     inner: T,
     peek_buf: Vec<u8>,
     fail_on_err_lines: bool,
@@ -18,12 +18,12 @@ pub struct Reader<T> {
     is_done: bool,
 }
 
-impl<T> Reader<T>
+impl<T> Provider<T>
 where
     T: io::Read,
 {
     pub fn new(inner: T, delimiter: impl Into<Option<PacketLine<'static>>>) -> Self {
-        Reader {
+        Provider {
             inner,
             buf: vec![0; MAX_LINE_LEN],
             peek_buf: Vec::new(),

git-packetline/src/reader/read.rs renamed to git-packetline/src/provider/read.rs

@@ -1,14 +1,14 @@
 use crate::{
     borrowed::{Band, Text},
-    Reader, MAX_DATA_LEN,
+    Provider, MAX_DATA_LEN,
 };
 use std::io;
 
 pub struct ReadWithSidebands<'a, T, F>
 where
     T: io::Read,
 {
-    parent: &'a mut Reader<T>,
+    parent: &'a mut Provider<T>,
     handle_progress: Option<F>,
     buf: Vec<u8>,
     pos: usize,
@@ -28,7 +28,7 @@ impl<'a, T> ReadWithSidebands<'a, T, fn(bool, &[u8])>
 where
     T: io::Read,
 {
-    pub fn new(parent: &'a mut Reader<T>) -> Self {
+    pub fn new(parent: &'a mut Provider<T>) -> Self {
         ReadWithSidebands {
             parent,
             handle_progress: None,
@@ -44,7 +44,7 @@ where
     T: io::Read,
     F: FnMut(bool, &[u8]),
 {
-    pub fn with_progress_handler(parent: &'a mut Reader<T>, handle_progress: F) -> Self {
+    pub fn with_progress_handler(parent: &'a mut Provider<T>, handle_progress: F) -> Self {
         ReadWithSidebands {
             parent,
             handle_progress: Some(handle_progress),

git-packetline/tests/packet_line/reader/mod.rs

@@ -17,7 +17,7 @@ fn first_line() -> PacketLine<'static> {
 }
 #[test]
 fn peek_non_data() -> crate::Result {
-    let mut rd = git_packetline::Reader::new(&b"000000010002"[..], Some(PacketLine::ResponseEnd));
+    let mut rd = git_packetline::Provider::new(&b"000000010002"[..], Some(PacketLine::ResponseEnd));
     assert_eq!(rd.read_line().expect("line")??, PacketLine::Flush);
     assert_eq!(rd.read_line().expect("line")??, PacketLine::Delimiter);
     rd.reset_with(PacketLine::Flush);
@@ -35,15 +35,15 @@ fn peek_non_data() -> crate::Result {
 #[test]
 fn fail_on_err_lines() -> crate::Result {
     let input = b"00010009ERR e0002";
-    let mut rd = git_packetline::Reader::new(&input[..], None);
+    let mut rd = git_packetline::Provider::new(&input[..], None);
     assert_eq!(rd.read_line().expect("line")??, PacketLine::Delimiter);
     assert_eq!(
         rd.read_line().expect("line")??.as_bstr(),
         Some(b"ERR e".as_bstr()),
         "by default no special handling"
     );
 
-    let mut rd = git_packetline::Reader::new(&input[..], None);
+    let mut rd = git_packetline::Provider::new(&input[..], None);
     rd.fail_on_err_lines(true);
     assert_eq!(rd.read_line().expect("line")??, PacketLine::Delimiter);
     assert_eq!(
@@ -67,7 +67,7 @@ fn fail_on_err_lines() -> crate::Result {
 #[test]
 fn peek() -> crate::Result {
     let bytes = fixture_bytes("v1/fetch/01-many-refs.response");
-    let mut rd = git_packetline::Reader::new(&bytes[..], None);
+    let mut rd = git_packetline::Provider::new(&bytes[..], None);
     assert_eq!(rd.peek_line().expect("line")??, first_line(), "peek returns first line");
     assert_eq!(
         rd.peek_line().expect("line")??,
@@ -97,7 +97,7 @@ fn peek() -> crate::Result {
 fn read_from_file_and_reader_advancement() -> crate::Result {
     let mut bytes = fixture_bytes("v1/fetch/01-many-refs.response");
     bytes.extend(fixture_bytes("v1/fetch/01-many-refs.response").into_iter());
-    let mut rd = git_packetline::Reader::new(&bytes[..], None);
+    let mut rd = git_packetline::Provider::new(&bytes[..], None);
     assert_eq!(rd.read_line().expect("line")??, first_line());
     assert_eq!(exhaust(&mut rd) + 1, 1561, "it stops after seeing the flush byte");
     rd.reset();
@@ -117,7 +117,7 @@ fn read_from_file_and_reader_advancement() -> crate::Result {
     Ok(())
 }
 
-fn exhaust(rd: &mut git_packetline::Reader<&[u8]>) -> i32 {
+fn exhaust(rd: &mut git_packetline::Provider<&[u8]>) -> i32 {
     let mut count = 0;
     while let Some(_) = rd.read_line() {
         count += 1;

git-packetline/tests/packet_line/reader/read.rs

@@ -6,7 +6,7 @@ use std::io::{BufRead, Read};
 #[test]
 fn read_line_trait_method_reads_one_packet_line_at_a_time() -> crate::Result {
     let buf = fixture_bytes("v1/01-clone.combined-output-no-binary");
-    let mut rd = git_packetline::Reader::new(&buf[..], None);
+    let mut rd = git_packetline::Provider::new(&buf[..], None);
 
     let mut out = String::new();
     let mut r = rd.as_read();
@@ -45,7 +45,7 @@ fn read_line_trait_method_reads_one_packet_line_at_a_time() -> crate::Result {
 #[test]
 fn read_pack_with_progress_extraction() -> crate::Result {
     let buf = fixture_bytes("v1/01-clone.combined-output");
-    let mut rd = git_packetline::Reader::new(&buf[..], None);
+    let mut rd = git_packetline::Provider::new(&buf[..], None);
 
     // Read without sideband decoding
     let mut out = Vec::new();

git-transport/src/client/git/mod.rs

@@ -7,7 +7,7 @@ pub(crate) mod recv;
 
 pub struct Connection<R, W> {
     line_writer: git_packetline::Writer<W>,
-    line_reader: git_packetline::Reader<R>,
+    line_reader: git_packetline::Provider<R>,
     path: BString,
     virtual_host: Option<(String, Option<u16>)>,
     version: Protocol,
@@ -78,7 +78,7 @@ where
     ) -> Self {
         Connection {
             line_writer: git_packetline::Writer::new(write),
-            line_reader: git_packetline::Reader::new(read, None),
+            line_reader: git_packetline::Provider::new(read, None),
             path: repository_path.into(),
             virtual_host: virtual_host.map(|(h, p)| (h.into(), p)),
             version: desired_version,

git-transport/src/client/git/recv.rs

@@ -2,7 +2,7 @@ use crate::{client, client::Capabilities, Protocol};
 use std::io;
 
 pub fn capabilties_and_possibly_refs<'a, T: io::Read>(
-    rd: &'a mut git_packetline::Reader<T>,
+    rd: &'a mut git_packetline::Provider<T>,
     version: Protocol,
 ) -> Result<(Capabilities, Option<Box<dyn io::BufRead + 'a>>), client::Error> {
     rd.fail_on_err_lines(true);

git-transport/src/client/http/mod.rs

@@ -1,5 +1,4 @@
 use crate::{client, client::git, Protocol, Service};
-use git_features::pipe;
 use std::{
     borrow::Cow,
     convert::Infallible,
@@ -21,7 +20,7 @@ pub struct Transport<H: Http> {
     version: crate::Protocol,
     http: H,
     service: Option<Service>,
-    line_reader: git_packetline::Reader<H::ResponseBody>,
+    line_reader: Option<git_packetline::Provider<H::ResponseBody>>,
 }
 
 impl Transport<Impl> {
@@ -32,7 +31,7 @@ impl Transport<Impl> {
             version,
             service: None,
             http: Impl::new(),
-            line_reader: git_packetline::Reader::new(pipe::unidirectional(0).1, None),
+            line_reader: None,
         }
     }
 }
@@ -69,10 +68,12 @@ impl<H: Http> client::TransportSketch for Transport<H> {
             ))));
         }
 
-        self.line_reader.replace(body);
+        let line_reader = self
+            .line_reader
+            .get_or_insert_with(|| git_packetline::Provider::new(body, None));
 
         let mut announced_service = String::new();
-        self.line_reader.as_read().read_to_string(&mut announced_service)?;
+        line_reader.as_read().read_to_string(&mut announced_service)?;
         let expected_service_announcement = format!("# service={}", service.as_str());
         if announced_service.trim() != expected_service_announcement {
             return Err(client::Error::Http(Error::Detail(format!(
@@ -82,7 +83,7 @@ impl<H: Http> client::TransportSketch for Transport<H> {
             ))));
         }
 
-        let (capabilities, refs) = git::recv::capabilties_and_possibly_refs(&mut self.line_reader, self.version)?;
+        let (capabilities, refs) = git::recv::capabilties_and_possibly_refs(line_reader, self.version)?;
         self.service = Some(service);
         Ok(client::SetServiceResponse {
             actual_protocol: self.version,