more multipart progress...

Fishrock123 · Fishrock123 · commit 515228708f15 · 2020-11-03T17:35:19.000-08:00
diff --git a/src/body.rs b/src/body.rs
@@ -422,7 +422,7 @@ impl Body {
 
     /// Get the file name of the `Body`, if it's set.
     pub fn file_name(&self) -> Option<&str> {
-        self.file_name.as_ref().map(|s| s.as_str())
+        self.file_name.as_deref()
     }
 
     /// Set the file name of the `Body`.
diff --git a/src/multipart/entry.rs b/src/multipart/entry.rs
@@ -1,6 +1,5 @@
-use crate::{Body, Error, Mime};
+use crate::{Body, Mime};
 
-use std::convert::TryFrom;
 use std::fmt::{self, Debug};
 // use std::path::Path;
 use std::pin::Pin;
@@ -139,16 +138,14 @@ impl Into<Body> for Entry {
     }
 }
 
-impl TryFrom<Body> for Entry {
-    type Error = Error;
-
-    fn try_from(body: Body) -> Result<Self, Self::Error> {
+impl From<Body> for Entry {
+    fn from(body: Body) -> Self {
         match body.file_name.clone() {
-            Some(name) => Ok(Self { body, name }),
-            None => Err(Error::from_str(
-                500,
-                "Missing file_name on Body to convert to Multipart Entry",
-            )),
+            Some(name) => Self { body, name },
+            None => Self {
+                body,
+                name: String::new(),
+            },
         }
     }
 }
diff --git a/src/multipart/mod.rs b/src/multipart/mod.rs
@@ -188,19 +188,28 @@ impl Stream for Multipart {
 //     }
 // }
 
-struct BufReader<R: AsyncRead> {
+// We need AsRef<[u8]> on BufReader for TryStreamExt (into_async_read) so... wrap and patch it in ourselves, for now.
+#[doc(hidden)]
+#[derive(Debug)]
+pub struct BufReader<R: AsyncRead> {
     inner: io::BufReader<R>,
 }
 
+#[doc(hidden)]
 impl<R: AsyncRead> BufReader<R> {
+    #[allow(missing_doc_code_examples)]
+    #[doc(hidden)]
     pub fn new(inner: R) -> Self {
         Self {
             inner: io::BufReader::new(inner),
         }
     }
 }
 
+#[doc(hidden)]
 impl<R: AsyncRead> AsRef<[u8]> for BufReader<R> {
+    #[allow(missing_doc_code_examples)]
+    #[doc(hidden)]
     fn as_ref(&self) -> &[u8] {
         self.inner.buffer()
     }
@@ -210,11 +219,13 @@ impl From<Multipart> for Body {
     fn from(multipart: Multipart) -> Self {
         let stream = multipart.map(|maybe_entry| {
             maybe_entry
-                .map(|entry| BufReader::new(entry))
+                .map(BufReader::new)
                 .map_err(|err| {
-                    std::io::Error::new(std::io::ErrorKind::Other, err.to_string().to_owned())
+                    std::io::Error::new(std::io::ErrorKind::Other, err.to_string())
                 })
         });
-        Body::from_reader(io::BufReader::new(stream.into_async_read()), None)
+        let mut body = Body::from_reader(io::BufReader::new(stream.into_async_read()), None);
+        body.set_mime(mime::MULTIPART_FORM);
+        body
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -422,7 +422,7 @@ impl Body {`
`422`	`422`
`423`	`423`	/// Get the file name of the `Body`, if it's set.
`424`	`424`	`pub fn file_name(&self) -> Option<&str> {`
`425`		`- self.file_name.as_ref().map(\|s\| s.as_str())`
	`425`	`+ self.file_name.as_deref()`
`426`	`426`	`}`
`427`	`427`
`428`	`428`	/// Set the file name of the `Body`.
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`		`-use crate::{Body, Error, Mime};`
	`1`	`+use crate::{Body, Mime};`
`2`	`2`
`3`		`-use std::convert::TryFrom;`
`4`	`3`	`use std::fmt::{self, Debug};`
`5`	`4`	`// use std::path::Path;`
`6`	`5`	`use std::pin::Pin;`
`@@ -139,16 +138,14 @@ impl Into<Body> for Entry {`
`139`	`138`	`}`
`140`	`139`	`}`
`141`	`140`
`142`		`-impl TryFrom<Body> for Entry {`
`143`		`- type Error = Error;`
`144`		`-`
`145`		`- fn try_from(body: Body) -> Result<Self, Self::Error> {`
	`141`	`+impl From<Body> for Entry {`
	`142`	`+ fn from(body: Body) -> Self {`
`146`	`143`	`match body.file_name.clone() {`
`147`		`- Some(name) => Ok(Self { body, name }),`
`148`		`- None => Err(Error::from_str(`
`149`		`- 500,`
`150`		`- "Missing file_name on Body to convert to Multipart Entry",`
`151`		`- )),`
	`144`	`+ Some(name) => Self { body, name },`
	`145`	`+ None => Self {`
	`146`	`+ body,`
	`147`	`+ name: String::new(),`
	`148`	`+ },`
`152`	`149`	`}`
`153`	`150`	`}`
`154`	`151`	`}`