Major refactoring and cleanup

src/app.rs

@@ -1,15 +1,51 @@
-use atty::{self, Stream};
-use clap::{App as ClapApp, AppSettings, Arg, ArgGroup, ArgMatches, SubCommand};
-use console::Term;
-use errors::*;
 use std::collections::HashSet;
 use std::env;
-use style::{OutputComponent, OutputComponents, OutputWrap};
+
+use atty::{self, Stream};
+
+use clap::{App as ClapApp, AppSettings, Arg, ArgGroup, ArgMatches, SubCommand};
+
+use console::Term;
 
 #[cfg(windows)]
 use ansi_term;
 
 use assets::BAT_THEME_DEFAULT;
+use errors::*;
+use line_range::LineRange;
+use style::{OutputComponent, OutputComponents, OutputWrap};
+
+#[derive(Debug, Clone, Copy)]
+pub enum PagingMode {
+    Always,
+    QuitIfOneScreen,
+    Never,
+}
+
+pub struct Config<'a> {
+    pub true_color: bool,
+    pub output_wrap: OutputWrap,
+    pub output_components: OutputComponents,
+    pub language: Option<&'a str>,
+    pub colored_output: bool,
+    pub paging_mode: PagingMode,
+    pub term_width: usize,
+    pub files: Vec<Option<&'a str>>,
+    pub theme: String,
+    pub line_range: Option<LineRange>,
+}
+
+fn is_truecolor_terminal() -> bool {
+    env::var("COLORTERM")
+        .map(|colorterm| colorterm == "truecolor" || colorterm == "24bit")
+        .unwrap_or(false)
+}
+
+/// Helper function that should might appear in Rust stable at some point
+/// (https://doc.rust-lang.org/stable/std/option/enum.Option.html#method.transpose)
+fn transpose<T>(opt: Option<Result<T>>) -> Result<Option<T>> {
+    opt.map_or(Ok(None), |res| res.map(Some))
+}
 
 pub struct App {
     pub matches: ArgMatches<'static>,
@@ -319,104 +355,3 @@ impl App {
         }))
     }
 }
-
-#[derive(Debug, Clone, Copy)]
-pub enum PagingMode {
-    Always,
-    QuitIfOneScreen,
-    Never,
-}
-
-pub struct Config<'a> {
-    pub true_color: bool,
-    pub output_wrap: OutputWrap,
-    pub output_components: OutputComponents,
-    pub language: Option<&'a str>,
-    pub colored_output: bool,
-    pub paging_mode: PagingMode,
-    pub term_width: usize,
-    pub files: Vec<Option<&'a str>>,
-    pub theme: String,
-    pub line_range: Option<LineRange>,
-}
-
-fn is_truecolor_terminal() -> bool {
-    env::var("COLORTERM")
-        .map(|colorterm| colorterm == "truecolor" || colorterm == "24bit")
-        .unwrap_or(false)
-}
-
-pub struct LineRange {
-    pub lower: usize,
-    pub upper: usize,
-}
-
-impl LineRange {
-    pub fn from(range_raw: &str) -> Result<LineRange> {
-        LineRange::parse_range(range_raw)
-    }
-
-    pub fn new() -> LineRange {
-        LineRange {
-            lower: usize::min_value(),
-            upper: usize::max_value(),
-        }
-    }
-
-    pub fn parse_range(range_raw: &str) -> Result<LineRange> {
-        let mut new_range = LineRange::new();
-
-        if range_raw.bytes().nth(0).ok_or("Empty line range")? == b':' {
-            new_range.upper = range_raw[1..].parse()?;
-            return Ok(new_range);
-        } else if range_raw.bytes().last().ok_or("Empty line range")? == b':' {
-            new_range.lower = range_raw[..range_raw.len() - 1].parse()?;
-            return Ok(new_range);
-        }
-
-        let line_numbers: Vec<&str> = range_raw.split(':').collect();
-        if line_numbers.len() == 2 {
-            new_range.lower = line_numbers[0].parse()?;
-            new_range.upper = line_numbers[1].parse()?;
-            return Ok(new_range);
-        }
-        Err("expected single ':' character".into())
-    }
-}
-
-#[test]
-fn test_parse_line_range_full() {
-    let range = LineRange::from("40:50").expect("Shouldn't fail on test!");
-    assert_eq!(40, range.lower);
-    assert_eq!(50, range.upper);
-}
-
-#[test]
-fn test_parse_line_range_partial_min() {
-    let range = LineRange::from(":50").expect("Shouldn't fail on test!");
-    assert_eq!(usize::min_value(), range.lower);
-    assert_eq!(50, range.upper);
-}
-
-#[test]
-fn test_parse_line_range_partial_max() {
-    let range = LineRange::from("40:").expect("Shouldn't fail on test!");
-    assert_eq!(40, range.lower);
-    assert_eq!(usize::max_value(), range.upper);
-}
-
-#[test]
-fn test_parse_line_range_fail() {
-    let range = LineRange::from("40:50:80");
-    assert!(range.is_err());
-    let range = LineRange::from("40::80");
-    assert!(range.is_err());
-    let range = LineRange::from(":40:");
-    assert!(range.is_err());
-    let range = LineRange::from("40");
-    assert!(range.is_err());
-}
-
-fn transpose<T>(opt: Option<Result<T>>) -> Result<Option<T>> {
-    opt.map_or(Ok(None), |res| res.map(Some))
-}