extract info_fields into its own module

Author: o2sh

Diff for: src/main.rs

@@ -1,7 +1,9 @@
 // `error_chain!` can recurse deeply
 #![recursion_limit = "1024"]
 
-use onefetch::{clap_app, error::*, image_backends, info, language::Language, options};
+use onefetch::{
+    clap_app, error::*, image_backends, info, info_fields, language::Language, options,
+};
 
 use {
     process::{Command, Stdio},
@@ -59,7 +61,7 @@ fn run() -> Result<()> {
         } else {
             Vec::new()
         },
-        disabled_fields: info::get_disabled_fields(fields_to_hide)?,
+        disabled_fields: info_fields::get_disabled_fields(fields_to_hide)?,
         no_bold: !matches.is_present("no-bold"),
         image,
         image_backend,

Diff for: src/onefetch/clap_app.rs

@@ -1,5 +1,5 @@
 use {
-    crate::onefetch::{info::InfoFields, language::Language},
+    crate::onefetch::{info_fields::InfoFields, language::Language},
     clap::{crate_description, crate_name, crate_version, App, AppSettings, Arg},
     strum::{EnumCount, IntoEnumIterator},
 };

Diff for: src/onefetch/info.rs

@@ -1,56 +1,19 @@
 use {
     crate::onefetch::{
-        ascii_art::AsciiArt, commit_info::CommitInfo, error::*, language::Language,
-        license::Detector, options::Options,
+        ascii_art::AsciiArt,
+        commit_info::CommitInfo,
+        error::*,
+        language::Language,
+        license::{Detector, LICENSE_FILES},
+        options::Options,
     },
     colored::{Color, ColoredString, Colorize},
     git2::Repository,
     regex::Regex,
-    std::{ffi::OsStr, fmt::Write, fs, str::FromStr},
-    strum::{EnumCount, EnumIter, EnumString, IntoStaticStr},
+    std::{ffi::OsStr, fmt::Write, fs},
     tokio::process::Command,
 };
 
-const LICENSE_FILES: [&str; 3] = ["LICENSE", "LICENCE", "COPYING"];
-
-#[derive(Default)]
-pub struct InfoFieldOn {
-    pub git_info: bool,
-    pub project: bool,
-    pub head: bool,
-    pub version: bool,
-    pub created: bool,
-    pub languages: bool,
-    pub authors: bool,
-    pub last_change: bool,
-    pub repo: bool,
-    pub commits: bool,
-    pub pending: bool,
-    pub lines_of_code: bool,
-    pub size: bool,
-    pub license: bool,
-}
-
-#[derive(PartialEq, Eq, EnumString, EnumCount, EnumIter, IntoStaticStr)]
-#[strum(serialize_all = "snake_case")]
-pub enum InfoFields {
-    GitInfo,
-    Project,
-    HEAD,
-    Version,
-    Created,
-    Languages,
-    Authors,
-    LastChange,
-    Repo,
-    Commits,
-    Pending,
-    LinesOfCode,
-    Size,
-    License,
-    UnrecognizedField,
-}
-
 pub struct Info {
     git_version: String,
     git_username: String,
@@ -73,37 +36,6 @@ pub struct Info {
     config: Options,
 }
 
-pub fn get_disabled_fields(fields_to_hide: Vec<String>) -> Result<InfoFieldOn> {
-    let mut disabled_fields = InfoFieldOn {
-        ..Default::default()
-    };
-
-    for field in fields_to_hide.iter() {
-        let item = InfoFields::from_str(field.to_lowercase().as_str())
-            .unwrap_or(InfoFields::UnrecognizedField);
-
-        match item {
-            InfoFields::GitInfo => disabled_fields.git_info = true,
-            InfoFields::Project => disabled_fields.project = true,
-            InfoFields::HEAD => disabled_fields.head = true,
-            InfoFields::Version => disabled_fields.version = true,
-            InfoFields::Created => disabled_fields.created = true,
-            InfoFields::Languages => disabled_fields.languages = true,
-            InfoFields::Authors => disabled_fields.authors = true,
-            InfoFields::LastChange => disabled_fields.last_change = true,
-            InfoFields::Repo => disabled_fields.repo = true,
-            InfoFields::Pending => disabled_fields.pending = true,
-            InfoFields::Commits => disabled_fields.commits = true,
-            InfoFields::LinesOfCode => disabled_fields.lines_of_code = true,
-            InfoFields::Size => disabled_fields.size = true,
-            InfoFields::License => disabled_fields.license = true,
-            _ => (),
-        }
-    }
-
-    Ok(disabled_fields)
-}
-
 impl std::fmt::Display for Info {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         let mut buf = String::new();

Diff for: src/onefetch/info_fields.rs

@@ -0,0 +1,74 @@
+use {
+    crate::onefetch::error::*,
+    std::str::FromStr,
+    strum::{EnumCount, EnumIter, EnumString, IntoStaticStr},
+};
+
+#[derive(Default)]
+pub struct InfoFieldOn {
+    pub git_info: bool,
+    pub project: bool,
+    pub head: bool,
+    pub version: bool,
+    pub created: bool,
+    pub languages: bool,
+    pub authors: bool,
+    pub last_change: bool,
+    pub repo: bool,
+    pub commits: bool,
+    pub pending: bool,
+    pub lines_of_code: bool,
+    pub size: bool,
+    pub license: bool,
+}
+
+#[derive(PartialEq, Eq, EnumString, EnumCount, EnumIter, IntoStaticStr)]
+#[strum(serialize_all = "snake_case")]
+pub enum InfoFields {
+    GitInfo,
+    Project,
+    HEAD,
+    Version,
+    Created,
+    Languages,
+    Authors,
+    LastChange,
+    Repo,
+    Commits,
+    Pending,
+    LinesOfCode,
+    Size,
+    License,
+    UnrecognizedField,
+}
+
+pub fn get_disabled_fields(fields_to_hide: Vec<String>) -> Result<InfoFieldOn> {
+    let mut disabled_fields = InfoFieldOn {
+        ..Default::default()
+    };
+
+    for field in fields_to_hide.iter() {
+        let item = InfoFields::from_str(field.to_lowercase().as_str())
+            .unwrap_or(InfoFields::UnrecognizedField);
+
+        match item {
+            InfoFields::GitInfo => disabled_fields.git_info = true,
+            InfoFields::Project => disabled_fields.project = true,
+            InfoFields::HEAD => disabled_fields.head = true,
+            InfoFields::Version => disabled_fields.version = true,
+            InfoFields::Created => disabled_fields.created = true,
+            InfoFields::Languages => disabled_fields.languages = true,
+            InfoFields::Authors => disabled_fields.authors = true,
+            InfoFields::LastChange => disabled_fields.last_change = true,
+            InfoFields::Repo => disabled_fields.repo = true,
+            InfoFields::Pending => disabled_fields.pending = true,
+            InfoFields::Commits => disabled_fields.commits = true,
+            InfoFields::LinesOfCode => disabled_fields.lines_of_code = true,
+            InfoFields::Size => disabled_fields.size = true,
+            InfoFields::License => disabled_fields.license = true,
+            _ => (),
+        }
+    }
+
+    Ok(disabled_fields)
+}

Diff for: src/onefetch/license.rs

@@ -2,6 +2,8 @@ use askalono::{Store, TextData};
 
 use crate::onefetch::error::*;
 
+pub const LICENSE_FILES: [&str; 3] = ["LICENSE", "LICENCE", "COPYING"];
+
 static CACHE_DATA: &[u8] = include_bytes!("../../resources/licenses/cache.bin.zstd");
 const MIN_THRESHOLD: f32 = 0.8;
 

Diff for: src/onefetch/mod.rs

@@ -4,6 +4,7 @@ pub mod commit_info;
 pub mod error;
 pub mod image_backends;
 pub mod info;
+pub mod info_fields;
 pub mod language;
 pub mod license;
 pub mod options;

Diff for: src/onefetch/options.rs

@@ -1,5 +1,5 @@
 use {
-    crate::onefetch::{image_backends::ImageBackend, info::InfoFieldOn, language::Language},
+    crate::onefetch::{image_backends::ImageBackend, info_fields::InfoFieldOn, language::Language},
     image::DynamicImage,
 };