6d1cc8c · bat · git.iko.soy

git.iko.soy/bat

Move read_line functionality to inputfile module

commit6d1cc8c2c8bc2bea6d381fd6ec4a29f66dde8699 authorsharkdp <davidpeter@web.de> dateSun 7 Oct 2018, 12:15 (8 years ago) parent87f0210

2 files changed+24−8

compare with master

unifiedsplit

src/controller.rs+4−4 src/inputfile.rs+20−4

src/controller.rs+4−4

@@ -1,9 +1,9 @@

1−use std::io::{self, BufRead, Write};

1+use std::io::{self, Write};

33use app::Config;

44use assets::HighlightingAssets;

55use errors::*;

6−use inputfile::InputFile;

6+use inputfile::{InputFile, InputFileReader};

77use line_range::LineRange;

88use output::OutputType;

99use printer::{InteractivePrinter, Printer, SimplePrinter};

@@ -61,14 +61,14 @@ impl<'b> Controller<'b> {

6161 &self,

6262 printer: &mut P,

6363 writer: &mut Write,

64− mut reader: Box<BufRead + 'a>,

64+ mut reader: InputFileReader,

6565 line_ranges: &Option<LineRange>,

6666 ) -> Result<()> {

6767 let mut line_buffer = Vec::new();

6868

6969 let mut line_number: usize = 1;

7070

71− while reader.read_until(b'\n', &mut line_buffer)? > 0 {

71+ while reader.read_line(&mut line_buffer)? {

7272 match line_ranges {

7373 &Some(ref range) => {

7474 if line_number < range.lower {

src/inputfile.rs+20−4

@@ -5,6 +5,22 @@ use errors::*;

66const THEME_PREVIEW_FILE: &[u8] = include_bytes!("../assets/theme_preview.rs");

8+pub struct InputFileReader<'a> {

9+ inner: Box<dyn BufRead + 'a>,

10+}

11+

12+impl<'a> InputFileReader<'a> {

13+ fn new<R: BufRead + 'a>(reader: R) -> InputFileReader<'a> {

14+ InputFileReader {

15+ inner: Box::new(reader),

16+ }

17+ }

18+

19+ pub fn read_line(&mut self, buf: &mut Vec<u8>) -> io::Result<bool> {

20+ self.inner.read_until(b'\n', buf).map(|size| size > 0)

21+ }

22+}

23+

824#[derive(Debug, Clone, Copy, PartialEq)]

925pub enum InputFile<'a> {

1026 StdIn,

@@ -13,9 +29,9 @@ pub enum InputFile<'a> {

1329}

1430

1531impl<'a> InputFile<'a> {

16− pub fn get_reader(&self, stdin: &'a io::Stdin) -> Result<Box<dyn BufRead + 'a>> {

32+ pub fn get_reader(&self, stdin: &'a io::Stdin) -> Result<InputFileReader> {

1733 match self {

18− InputFile::StdIn => Ok(Box::new(stdin.lock())),

34+ InputFile::StdIn => Ok(InputFileReader::new(stdin.lock())),

1935 InputFile::Ordinary(filename) => {

2036 let file = File::open(filename)?;

2137

@@ -23,9 +39,9 @@ impl<'a> InputFile<'a> {

2339 return Err(format!("'{}' is a directory.", filename).into());

2440 }

2541

26− Ok(Box::new(BufReader::new(file)))

42+ Ok(InputFileReader::new(BufReader::new(file)))

2743 }

28− InputFile::ThemePreviewFile => Ok(Box::new(THEME_PREVIEW_FILE)),

44+ InputFile::ThemePreviewFile => Ok(InputFileReader::new(THEME_PREVIEW_FILE)),

2945 }

3046 }

3147}