feat: improve API of LiteralData to provide more flexibility

DoumanAsh · web-flow · commit 34728e09c81f · 2024-08-01T13:41:26.000+02:00
diff --git a/src/errors.rs b/src/errors.rs
@@ -6,7 +6,7 @@ use nom::{
     ErrorConvert,
 };
 
-pub type Result<T> = ::std::result::Result<T, Error>;
+pub type Result<T, E = Error> = ::std::result::Result<T, E>;
 
 // custom nom error types
 pub const MPI_TOO_LONG: u32 = 1000;
diff --git a/src/packet/literal_data.rs b/src/packet/literal_data.rs
@@ -84,6 +84,24 @@ impl LiteralData {
         &self.data
     }
 
+    #[inline]
+    /// Extracts data in to raw data
+    pub fn into_bytes(self) -> Vec<u8> {
+        self.data
+    }
+
+    #[inline]
+    /// Extracts data as string, returning raw bytes as Err if not valid utf-8 string
+    pub fn try_into_string(self) -> Result<String, Vec<u8>> {
+        match self.mode {
+            DataMode::Binary => Err(self.data),
+            _ => match String::from_utf8(self.data) {
+                Ok(data) => Ok(data),
+                Err(error) => Err(error.into_bytes()),
+            },
+        }
+    }
+
     /// Convert the data to a UTF-8 string, if appropriate for the type.
     /// Returns `None` if `mode` is `Binary`, or the data is not valid UTF-8.
     pub fn to_string(&self) -> Option<String> {
@@ -94,6 +112,13 @@ impl LiteralData {
     }
 }
 
+impl AsRef<[u8]> for LiteralData {
+    #[inline]
+    fn as_ref(&self) -> &[u8] {
+        &self.data
+    }
+}
+
 impl Serialize for LiteralData {
     fn to_writer<W: io::Write>(&self, writer: &mut W) -> Result<()> {
         let name = &self.file_name;
