From d5b0502419dd919b75df20fd4798dce66c532d63 Mon Sep 17 00:00:00 2001
From: sharkdp <davidpeter@web.de>
Date: Sun, 7 Oct 2018 11:54:01 +0200
Subject: [PATCH] Move get_reader into inputfile module

---
 src/controller.rs | 36 ++++++++++--------------------------
 src/inputfile.rs  | 25 +++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/src/controller.rs b/src/controller.rs
index 192c161f..532a0f0d 100644
--- a/src/controller.rs
+++ b/src/controller.rs
@@ -1,5 +1,4 @@
-use std::fs::File;
-use std::io::{self, BufRead, BufReader, Write};
+use std::io::{self, BufRead, Write};
 
 use app::Config;
 use assets::HighlightingAssets;
@@ -9,8 +8,6 @@ use line_range::LineRange;
 use output::OutputType;
 use printer::{InteractivePrinter, Printer, SimplePrinter};
 
-const THEME_PREVIEW_FILE: &[u8] = include_bytes!("../assets/theme_preview.rs");
-
 pub struct Controller<'a> {
     config: &'a Config<'a>,
     assets: &'a HighlightingAssets,
@@ -26,13 +23,13 @@ impl<'b> Controller<'b> {
         let writer = output_type.handle()?;
         let mut no_errors: bool = true;
 
-        for filename in &self.config.files {
+        for input_file in &self.config.files {
             let result = if self.config.loop_through {
                 let mut printer = SimplePrinter::new();
-                self.print_file(&mut printer, writer, *filename)
+                self.print_file(&mut printer, writer, *input_file)
             } else {
-                let mut printer = InteractivePrinter::new(&self.config, &self.assets, *filename);
-                self.print_file(&mut printer, writer, *filename)
+                let mut printer = InteractivePrinter::new(&self.config, &self.assets, *input_file);
+                self.print_file(&mut printer, writer, *input_file)
             };
 
             if let Err(error) = result {
@@ -48,28 +45,15 @@ impl<'b> Controller<'b> {
         &self,
         printer: &mut P,
         writer: &mut Write,
-        filename: InputFile<'a>,
+        input_file: InputFile<'a>,
     ) -> Result<()> {
         let stdin = io::stdin();
-        {
-            let reader: Box<BufRead> = match filename {
-                InputFile::StdIn => Box::new(stdin.lock()),
-                InputFile::Ordinary(filename) => {
-                    let file = File::open(filename)?;
+        let reader = input_file.get_reader(&stdin)?;
 
-                    if file.metadata()?.is_dir() {
-                        return Err(format!("'{}' is a directory.", filename).into());
-                    }
+        printer.print_header(writer, input_file)?;
+        self.print_file_ranges(printer, writer, reader, &self.config.line_range)?;
+        printer.print_footer(writer)?;
 
-                    Box::new(BufReader::new(file))
-                }
-                InputFile::ThemePreviewFile => Box::new(THEME_PREVIEW_FILE),
-            };
-
-            printer.print_header(writer, filename)?;
-            self.print_file_ranges(printer, writer, reader, &self.config.line_range)?;
-            printer.print_footer(writer)?;
-        }
         Ok(())
     }
 
diff --git a/src/inputfile.rs b/src/inputfile.rs
index cc07c7a3..07d68a34 100644
--- a/src/inputfile.rs
+++ b/src/inputfile.rs
@@ -1,6 +1,31 @@
+use std::fs::File;
+use std::io::{self, BufRead, BufReader};
+
+use errors::*;
+
+const THEME_PREVIEW_FILE: &[u8] = include_bytes!("../assets/theme_preview.rs");
+
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum InputFile<'a> {
     StdIn,
     Ordinary(&'a str),
     ThemePreviewFile,
 }
+
+impl<'a> InputFile<'a> {
+    pub fn get_reader(&self, stdin: &'a io::Stdin) -> Result<Box<dyn BufRead + 'a>> {
+        match self {
+            InputFile::StdIn => Ok(Box::new(stdin.lock())),
+            InputFile::Ordinary(filename) => {
+                let file = File::open(filename)?;
+
+                if file.metadata()?.is_dir() {
+                    return Err(format!("'{}' is a directory.", filename).into());
+                }
+
+                Ok(Box::new(BufReader::new(file)))
+            }
+            InputFile::ThemePreviewFile => Ok(Box::new(THEME_PREVIEW_FILE)),
+        }
+    }
+}