From ee430fb3fcd3d8592e22e7a3d098630ebdb9cd37 Mon Sep 17 00:00:00 2001 From: Alexander Date: Tue, 26 Apr 2022 12:58:24 +0300 Subject: refactor file reader --- src/reader.rs | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) (limited to 'src/reader.rs') diff --git a/src/reader.rs b/src/reader.rs index 5b1b75f..593fda5 100644 --- a/src/reader.rs +++ b/src/reader.rs @@ -1,23 +1,53 @@ //file reads dataset file and also does the parsing //aim is to read this as a stream use std::fs::File; -use std::io::BufReader; +use std::io::{BufReader, BufRead}; use std::path::Path; -pub fn file_reader(file_path:&str) ->Result, Box>{ +pub struct BufferReader { + reader:BufReader +} - let y = Path::new(file_path); +impl BufferReader{ + fn new(file_path:&str) -> std::io::Result{ + let file = File::open(Path::new(file_path))?; + //add file validator - //println!("the file path is {}",y.display(); - println!("{}",y.display()); + return Ok(Self{ + reader:BufReader::new(file) + }); - let file = File::open(Path::new(file_path))?; + - let buf_reader = BufReader::new(file); + } + + fn read_line <'a>(&mut self,buf:&'a mut String) -> Option>{ + //to avoid allocation for each new line + buf.clear(); + self.reader.read_line(buf).map(|u | { + if u == 0 as usize { + return None + } + + Some(buf) + + + + }).transpose() + +} +} + + +pub fn file_reader(file_path:&str) ->Result, Box>{ + + let file = File::open(Path::new(file_path))?; + + let buf_reader = BufReader::new(file); Ok(buf_reader) } -- cgit 1.4.1