0.3.4

Author: bmatthieu3

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fitsrs"
-version = "0.3.3"
+version = "0.3.4"
 authors = ["Matthieu Baumann <[email protected]>"]
 edition = "2018"
 description = "Implementation of the FITS image parser"

README.md

@@ -166,6 +166,7 @@ while let Some(Ok(hdu)) = hdu_list.next() {
                 .get_num_bytes_data_block();
 
             let data = hdu_list.get_data(&hdu)
+                .bytes()
                 .collect::<Vec<_>>();
 
             assert_eq!(num_bytes as usize, data.len());

src/async_fits.rs

@@ -131,7 +131,7 @@ where
             let hdu = if !self.start {
                 // We must consume the bytes until the next header is found
                 // if eof then the iterator finishes
-                let mut consume_tokens_until_next_hdu = self.consume_until_next_hdu();
+                let consume_tokens_until_next_hdu = self.consume_until_next_hdu();
                 let eof = match std::pin::pin!(consume_tokens_until_next_hdu).poll(cx) {
                     Poll::Pending => return Poll::Pending,
                     // The future finished returning the eof information
@@ -143,7 +143,7 @@ where
                         if !eof {
                             // parse the extension HDU
                             let r = &mut self.reader;
-                            let mut parse_x_hdu = hdu::AsyncHDU::new_xtension(r);
+                            let parse_x_hdu = hdu::AsyncHDU::new_xtension(r);
                             match std::pin::pin!(parse_x_hdu).poll(cx) {
                                 Poll::Pending => return Poll::Pending,
                                 // the future finished, returning the parsed hdu or the error while parsing it
@@ -157,7 +157,7 @@ where
                 }
             } else {
                 // parse the primary HDU
-                let mut parse_first_hdu = hdu::AsyncHDU::new_primary(&mut self.reader);
+                let parse_first_hdu = hdu::AsyncHDU::new_primary(&mut self.reader);
                 match std::pin::pin!(parse_first_hdu).poll(cx) {
                     Poll::Pending => return Poll::Pending,
                     // the future finished, returning the parsed hdu or the error while parsing it

src/hdu/data/asciitable.rs

@@ -1,7 +1,7 @@
 use async_trait::async_trait;
 use futures::AsyncReadExt;
-use std::fmt::Debug;
 use std::io::Read;
+use std::{fmt::Debug, io::BufReader};
 
 use super::{stream::St, AsyncDataBufRead};
 
@@ -10,17 +10,17 @@ use crate::hdu::header::extension::asciitable::AsciiTable;
 use crate::hdu::header::extension::Xtension;
 use crate::hdu::header::Header;
 
-use std::io::{Bytes, Take};
+use std::io::Take;
 impl<'a, R> FitsRead<'a, AsciiTable> for R
 where
     R: Read + Debug + 'a,
 {
-    type Data = Bytes<Take<&'a mut R>>;
+    type Data = BufReader<Take<&'a mut R>>;
 
     fn read_data_unit(&'a mut self, header: &Header<AsciiTable>, _start_pos: u64) -> Self::Data {
         let limit = header.get_xtension().get_num_bytes_data_block();
 
-        self.take(limit).bytes()
+        BufReader::new(self.take(limit))
     }
 }
 

src/hdu/data/bintable/data.rs

@@ -10,8 +10,8 @@ use crate::hdu::header::extension::bintable::{BinTable, TFormType};
 use crate::hdu::FitsRead;
 use byteorder::BigEndian;
 use log::warn;
-use std::io::Read;
-use std::io::{Bytes, SeekFrom};
+use std::io::SeekFrom;
+use std::io::{BufReader, Read};
 
 impl<'a, R> FitsRead<'a, BinTable> for R
 where
@@ -173,9 +173,9 @@ where
     R: Read,
 {
     /// Gives an iterator over the bytes of the main data table
-    pub fn bytes(self) -> Bytes<Take<R>> {
+    pub fn bytes(self) -> BufReader<Take<R>> {
         let only_main_data_table = self.reader.take(self.main_data_table_byte_size as u64);
-        only_main_data_table.bytes()
+        BufReader::new(only_main_data_table)
     }
 }
 

src/lib.rs

@@ -85,7 +85,7 @@ mod tests {
 
     #[test]
     fn test_fits_image_mandatory_kw() {
-        let f = File::open("samples/hipsgen/Npix208.fits").unwrap();
+        let f = BufReader::new(File::open("samples/hipsgen/Npix208.fits").unwrap());
         let bytes: Result<Vec<_>, _> = f.bytes().collect();
         let buf = bytes.unwrap();
 
@@ -157,7 +157,7 @@ mod tests {
 
     #[test]
     fn test_fits_image_f32() {
-        let f = File::open("samples/hipsgen/Npix208.fits").unwrap();
+        let f = BufReader::new(File::open("samples/hipsgen/Npix208.fits").unwrap());
         let bytes: Result<Vec<_>, _> = f.bytes().collect();
         let buf = bytes.unwrap();
 
@@ -460,7 +460,7 @@ mod tests {
                     let num_bytes = hdu.get_header().get_xtension().get_num_bytes_data_block();
                     let bytes = hdu_list.get_data(&hdu);
 
-                    assert_eq!(num_bytes as usize, bytes.collect::<Vec<_>>().len());
+                    assert_eq!(num_bytes as usize, bytes.bytes().collect::<Vec<_>>().len());
                 }
             }
         }
@@ -524,7 +524,7 @@ mod tests {
                     let num_bytes = hdu.get_header().get_xtension().get_num_bytes_data_block();
 
                     let it_bytes = hdu_list.get_data(&hdu);
-                    let data = it_bytes.collect::<Vec<_>>();
+                    let data = it_bytes.bytes().collect::<Vec<_>>();
                     assert_eq!(num_bytes as usize, data.len());
                 }
                 _ => (),
@@ -687,7 +687,7 @@ mod tests {
                 HDU::XASCIITable(hdu) => {
                     let num_bytes = hdu.get_header().get_xtension().get_num_bytes_data_block();
 
-                    let data = hdu_list.get_data(&hdu).collect::<Vec<_>>();
+                    let data = hdu_list.get_data(&hdu).bytes().collect::<Vec<_>>();
 
                     assert_eq!(num_bytes as usize, data.len());
                 }