Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions serde_multipart/src/de/bincode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,32 @@ use bincode::ErrorKind;
use bincode::Options;
use serde::de::IntoDeserializer;

use crate::FragmentedPart;
use crate::part::Part;

/// Multipart deserializer for bincode. This passes through to the underlying bincode
/// deserializer, but dequeues serialized parts when they are needed by [`Part::deserialize`].
/// deserializer, but dequeues serialized parts when they are needed by
/// [`Part::deserialize`] or [`FragmentedPart::deserialize`].
pub struct Deserializer<R, O: Options> {
de: bincode::Deserializer<R, O>,
parts: VecDeque<Part>,
fragmented_parts: VecDeque<FragmentedPart>,
}

impl<R, O> Deserializer<R, O>
where
O: Options,
{
pub(crate) fn new(de: bincode::Deserializer<R, O>, parts: VecDeque<Part>) -> Self {
Self { de, parts }
pub(crate) fn new(
de: bincode::Deserializer<R, O>,
parts: VecDeque<Part>,
fragmented_parts: VecDeque<FragmentedPart>,
) -> Self {
Self {
de,
parts,
fragmented_parts,
}
}

pub(crate) fn deserialize_part(&mut self) -> Result<Part, Error> {
Expand All @@ -38,8 +49,14 @@ where
})
}

pub(crate) fn deserialize_fragmented_part(&mut self) -> Result<FragmentedPart, Error> {
self.fragmented_parts.pop_front().ok_or_else(|| {
ErrorKind::Custom("fragmented part underrun while decoding".to_string()).into()
})
}

pub(crate) fn end(self) -> Result<(), Error> {
if self.parts.is_empty() {
if self.parts.is_empty() && self.fragmented_parts.is_empty() {
Ok(())
} else {
Err(ErrorKind::Custom("multipart overrun while decoding".to_string()).into())
Expand Down
Loading