core: ByteStream::read_buf should be a best-effort read.

secretfader · Apr 19, 2020 · c6bad6a · c6bad6a
1 parent 2d8ba46
commit c6bad6a
Showing 1 changed file with 21 additions and 1 deletion.
diff --git a/sonata-core/src/io/media_source_stream.rs b/sonata-core/src/io/media_source_stream.rs
@@ -374,7 +374,27 @@ impl ByteStream for MediaSourceStream {
 
     #[inline(always)]
     fn read_buf(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        self.read(buf)
+        let mut rem = buf;
+        let mut read = 0;
+
+        while !rem.is_empty() {
+            match self.read(rem) {
+                Ok(0) => break,
+                Ok(n) => {
+                    rem = &mut rem[n..];
+                    read += n;
+                }
+                Err(ref e) if e.kind() == io::ErrorKind::Interrupted => {}
+                Err(e) => return Err(e),
+            }
+        }
+
+        if read == 0 {
+            Err(io::Error::new(io::ErrorKind::UnexpectedEof, "Reached end of stream."))
+        }
+        else {
+            Ok(read)
+        }
     }
 
     #[inline(always)]