reorganize file structure

Author: o2sh

src/cli.rs

@@ -1,17 +1,16 @@
 use crate::error::*;
-use crate::repo::deps::package_manager::PackageManager;
-use crate::repo::language::Language;
+use crate::info::deps::package_manager::PackageManager;
+use crate::info::info_field::{InfoField, InfoFieldOff};
+use crate::info::language::Language;
 use crate::ui::image_backends;
 use crate::ui::image_backends::ImageBackend;
-use crate::ui::info::info_field::{InfoField, InfoFieldOff};
 use crate::ui::printer::SerializationFormat;
 use clap::{crate_description, crate_name, crate_version, App, AppSettings, Arg};
 use image::DynamicImage;
 use regex::Regex;
 use std::process::Command;
 use std::{convert::From, env, str::FromStr};
 use strum::IntoEnumIterator;
-use term_size;
 
 const MAX_TERM_WIDTH: usize = 95;
 

src/repo/deps/mod.rs renamed to src/info/deps/mod.rs

@@ -25,7 +25,7 @@ macro_rules! define_languages {
         pub enum Language {
             $(
                 $( #[strum(serialize = $serialize)] )?
-                $name ,
+                $name,
             )*
         }
 

src/repo/deps/package_manager.rs renamed to src/info/deps/package_manager.rs

@@ -1,18 +1,23 @@
 use crate::cli::{self, Config};
 use crate::error::*;
-use crate::repo::deps::DependencyDetector;
-use crate::repo::head_refs::HeadRefs;
-use crate::repo::language::Language;
-use crate::repo::license::Detector;
-use crate::repo::Repo;
-use crate::ui;
+use crate::ui::get_ascii_colors;
 use crate::ui::text_color::TextColor;
 use colored::{Color, ColoredString, Colorize};
+use deps::DependencyDetector;
 use git2::Repository;
+use head_refs::HeadRefs;
+use language::Language;
+use license::Detector;
+use repo::Repo;
 use serde::ser::SerializeStruct;
 use serde::Serialize;
 
+pub mod deps;
+mod head_refs;
 pub mod info_field;
+pub mod language;
+mod license;
+pub mod repo;
 
 pub struct Info {
     git_username: String,
@@ -213,7 +218,7 @@ impl std::fmt::Display for Info {
 }
 
 impl Info {
-    pub fn new(config: Config) -> Result<Info> {
+    pub fn new(config: Config) -> Result<Self> {
         let git_version = cli::get_git_version();
         let repo = Repository::discover(&config.repo_path)?;
         let internal_repo = Repo::new(&repo, config.no_merges, &config.bot_regex_pattern)?;
@@ -243,7 +248,7 @@ impl Info {
         );
         let text_colors = TextColor::get_text_colors(&config.text_colors, &ascii_colors);
 
-        Ok(Info {
+        Ok(Self {
             git_username,
             git_version,
             repo_name,
@@ -421,32 +426,6 @@ impl Info {
     }
 }
 
-fn get_ascii_colors(
-    ascii_language: &Option<Language>,
-    dominant_language: &Language,
-    ascii_colors: &[String],
-    true_color: bool,
-) -> Vec<Color> {
-    let language =
-        if let Some(ascii_language) = ascii_language { ascii_language } else { &dominant_language };
-
-    let colors = language.get_colors(true_color);
-
-    let colors: Vec<Color> = colors
-        .iter()
-        .enumerate()
-        .map(|(index, default_color)| {
-            if let Some(color_num) = ascii_colors.get(index) {
-                if let Some(color) = ui::num_to_color(color_num) {
-                    return color;
-                }
-            }
-            *default_color
-        })
-        .collect();
-    colors
-}
-
 impl Serialize for Info {
     fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
     where

src/repo/head_refs.rs renamed to src/info/head_refs.rs

@@ -1,5 +1,5 @@
 use crate::error::*;
-use crate::repo::head_refs::HeadRefs;
+use crate::info::head_refs::HeadRefs;
 use byte_unit::Byte;
 use chrono::{FixedOffset, TimeZone};
 use chrono_humanize::HumanTime;
@@ -11,11 +11,6 @@ use git2::{
 use regex::Regex;
 use std::path::Path;
 
-pub mod deps;
-pub mod head_refs;
-pub mod language;
-pub mod license;
-
 pub struct Repo<'a> {
     repo: &'a Repository,
     logs: Vec<Commit<'a>>,
@@ -27,7 +22,7 @@ impl<'a> Repo<'a> {
         no_merges: bool,
         bot_regex_pattern: &Option<Regex>,
     ) -> Result<Self> {
-        let logs = Repo::get_logs(repo, no_merges, bot_regex_pattern)?;
+        let logs = Self::get_logs(repo, no_merges, bot_regex_pattern)?;
         Ok(Self { repo, logs })
     }
 
@@ -293,17 +288,17 @@ impl<'a> Repo<'a> {
     }
 }
 
-pub fn is_bot(author: Signature, bot_regex_pattern: &Option<Regex>) -> bool {
+fn is_bot(author: Signature, bot_regex_pattern: &Option<Regex>) -> bool {
     let author_name = String::from_utf8_lossy(author.name_bytes()).into_owned();
     bot_regex_pattern.as_ref().unwrap().is_match(&author_name)
 }
 
-pub fn bytes_to_human_readable(bytes: u128) -> String {
+fn bytes_to_human_readable(bytes: u128) -> String {
     let byte = Byte::from_bytes(bytes);
     byte.get_appropriate_unit(true).to_string()
 }
 
-pub fn git_time_to_formatted_time(time: &Time, iso_time: bool) -> String {
+fn git_time_to_formatted_time(time: &Time, iso_time: bool) -> String {
     let (offset, _) = match time.offset_minutes() {
         n if n < 0 => (-n, '-'),
         n => (n, '+'),

src/ui/info/info_field.rs renamed to src/info/info_field.rs

@@ -4,13 +4,13 @@
 
 use cli::Config;
 use error::*;
+use info::{repo, Info};
 use std::{io, process};
-use ui::info::Info;
 use ui::printer::Printer;
 
 mod cli;
 mod error;
-mod repo;
+mod info;
 mod ui;
 
 fn run() -> Result<()> {
@@ -30,6 +30,7 @@ fn run() -> Result<()> {
     if !repo::is_valid(&config.repo_path)? {
         return Err("please run onefetch inside of a non-bare git repository".into());
     }
+
     let info = Info::new(config)?;
 
     let mut printer = Printer::new(io::BufWriter::new(io::stdout()), info);

src/repo/language.rs renamed to src/info/language.rs

@@ -1,12 +1,38 @@
+use crate::info::language::Language;
 use colored::Color;
 
 pub mod ascii_art;
 pub mod image_backends;
-pub mod info;
 pub mod printer;
-mod text_color;
+pub mod text_color;
 
-pub fn num_to_color(num: &str) -> Option<Color> {
+pub fn get_ascii_colors(
+    ascii_language: &Option<Language>,
+    dominant_language: &Language,
+    ascii_colors: &[String],
+    true_color: bool,
+) -> Vec<Color> {
+    let language =
+        if let Some(ascii_language) = ascii_language { ascii_language } else { &dominant_language };
+
+    let colors = language.get_colors(true_color);
+
+    let colors: Vec<Color> = colors
+        .iter()
+        .enumerate()
+        .map(|(index, default_color)| {
+            if let Some(color_num) = ascii_colors.get(index) {
+                if let Some(color) = num_to_color(color_num) {
+                    return color;
+                }
+            }
+            *default_color
+        })
+        .collect();
+    colors
+}
+
+fn num_to_color(num: &str) -> Option<Color> {
     let color = match num {
         "0" => Color::Black,
         "1" => Color::Red,

src/repo/license.rs renamed to src/info/license.rs

@@ -1,6 +1,6 @@
 use crate::error::*;
+use crate::info::Info;
 use crate::ui::ascii_art::AsciiArt;
-use crate::ui::info::Info;
 use colored::Color;
 use std::io::Write;
 use strum::{EnumIter, EnumString, IntoStaticStr};