Multiple changes linked to git2-rs migration

- Merge git_utils with repo into a single file
- Move get_repo_size_field into info file
- Remove blocking dependency with Git binary from onefetch

Author: o2sh

src/main.rs

@@ -22,10 +22,6 @@ fn run() -> Result<()> {
         return cli_utils::print_supported_package_managers();
     }
 
-    if !cli_utils::is_git_installed() {
-        return Err("git failed to execute!".into());
-    }
-
     if !repo::is_valid(&config.repo_path)? {
         return Err("please run onefetch inside of a non-bare git repository".into());
     }

src/onefetch/cli_utils.rs

@@ -1,6 +1,6 @@
 use crate::onefetch::{deps::package_manager::PackageManager, error::*, language::Language};
 use std::env;
-use std::process::{Command, Stdio};
+use std::process::Command;
 use strum::IntoEnumIterator;
 
 pub fn print_supported_languages() -> Result<()> {
@@ -25,11 +25,11 @@ pub fn is_truecolor_terminal() -> bool {
         .unwrap_or(false)
 }
 
-pub fn get_git_version() -> Result<String> {
-    let version = Command::new("git").arg("--version").output()?;
-    Ok(String::from_utf8_lossy(&version.stdout).replace('\n', ""))
-}
+pub fn get_git_version() -> String {
+    let version = Command::new("git").arg("--version").output();
 
-pub fn is_git_installed() -> bool {
-    Command::new("git").arg("--version").stdout(Stdio::null()).status().is_ok()
+    match version {
+        Ok(v) => String::from_utf8_lossy(&v.stdout).replace('\n', ""),
+        Err(_) => String::new(),
+    }
 }

src/onefetch/git_utils.rs

@@ -1,7 +1,7 @@
 use {
     crate::onefetch::{
-        cli::Cli, cli_utils, commit_info::CommitInfo, deps, error::*, git_utils,
-        language::Language, license::Detector, repo::Repo, text_color::TextColor,
+        cli::Cli, cli_utils, commit_info::CommitInfo, deps, error::*, language::Language,
+        license::Detector, repo::Repo, text_color::TextColor,
     },
     colored::{Color, ColoredString, Colorize},
     git2::Repository,
@@ -26,8 +26,7 @@ pub struct Info {
     repo_url: String,
     number_of_commits: String,
     lines_of_code: usize,
-    packed_repo_size: String,
-    files_count: u64,
+    file_count: u64,
     repo_size: String,
     license: String,
     pub dominant_language: Language,
@@ -38,7 +37,10 @@ pub struct Info {
 
 impl std::fmt::Display for Info {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        if !self.config.disabled_fields.git_info {
+        if !self.config.disabled_fields.git_info
+            && !&self.git_username.is_empty()
+            && !&self.git_version.is_empty()
+        {
             let git_info_length = self.git_username.len() + self.git_version.len() + 3;
 
             writeln!(
@@ -173,12 +175,14 @@ impl std::fmt::Display for Info {
             )?;
         }
 
-        if !self.config.disabled_fields.size && !self.packed_repo_size.is_empty() {
+        if !self.config.disabled_fields.size && !self.repo_size.is_empty() {
+            let repo_size_str = self.get_repo_size_field();
+
             writeln!(
                 f,
                 "{}{}",
                 &self.get_formatted_subtitle_label("Size"),
-                &self.packed_repo_size.color(self.text_colors.info),
+                &repo_size_str.color(self.text_colors.info),
             )?;
         }
 
@@ -212,28 +216,22 @@ impl std::fmt::Display for Info {
 
 impl Info {
     pub fn new(config: Cli) -> Result<Info> {
-        let repo = Repo::new(&config.repo_path)?;
-        let workdir = repo.get_work_dir()?;
-        let (repo_name, repo_url) = repo.get_name_and_url()?;
-        let head_refs = repo.get_head_refs()?;
-        let pending_changes = repo.get_pending_changes()?;
-        let version = repo.get_version()?;
-        let git_username = repo.get_git_username()?;
-        let number_of_tags = repo.get_number_of_tags()?;
-        let number_of_branches = repo.get_number_of_branches()?;
-
-        let repo = Repository::discover(&workdir)?;
-
-        let git_client = git_utils::GitClient::new(&repo, config.no_merges)?;
-        let creation_date = git_client.get_creation_date()?;
-        let number_of_commits = git_client.get_number_of_commits();
-        let authors = git_client.get_authors(config.number_of_authors);
-        let last_change = git_client.get_date_of_last_commit();
-        let (repo_size, files_count) = git_client.get_repo_size();
-        let packed_repo_size = git_utils::get_packed_size(repo_size.clone(), files_count)?;
-
-        let git_version = cli_utils::get_git_version()?;
-
+        let git_version = cli_utils::get_git_version();
+        let repo = Repository::discover(&config.repo_path)?;
+        let internal_repo = Repo::new(&repo, config.no_merges)?;
+        let (repo_name, repo_url) = internal_repo.get_name_and_url()?;
+        let head_refs = internal_repo.get_head_refs()?;
+        let pending_changes = internal_repo.get_pending_changes()?;
+        let version = internal_repo.get_version()?;
+        let git_username = internal_repo.get_git_username()?;
+        let number_of_tags = internal_repo.get_number_of_tags()?;
+        let number_of_branches = internal_repo.get_number_of_branches()?;
+        let creation_date = internal_repo.get_creation_date()?;
+        let number_of_commits = internal_repo.get_number_of_commits();
+        let authors = internal_repo.get_authors(config.number_of_authors);
+        let last_change = internal_repo.get_date_of_last_commit();
+        let (repo_size, file_count) = internal_repo.get_repo_size();
+        let workdir = internal_repo.get_work_dir()?;
         let license = Detector::new()?.get_license(&workdir)?;
         let dependencies = deps::DependencyDetector::new().get_dependencies(&workdir)?;
         let (languages, lines_of_code) =
@@ -264,9 +262,8 @@ impl Info {
             repo_url,
             number_of_commits,
             lines_of_code,
-            packed_repo_size,
-            files_count,
             repo_size,
+            file_count,
             license,
             dominant_language,
             ascii_colors,
@@ -383,6 +380,16 @@ impl Info {
             format!("({}, {})", branches_str, tags_str)
         }
     }
+
+    fn get_repo_size_field(&self) -> String {
+        match self.file_count {
+            0 => String::from(&self.repo_size),
+            _ => {
+                let res = format!("{} ({} files)", self.repo_size, self.file_count.to_string());
+                res
+            }
+        }
+    }
 }
 
 impl Serialize for Info {
@@ -393,7 +400,7 @@ impl Serialize for Info {
         let mut state = serializer.serialize_struct("Info", 21)?;
         // Only collect the version number
         let git_version_split: Vec<String> =
-            self.git_version.split(" ").map(|s| s.to_string()).collect();
+            self.git_version.split(' ').map(|s| s.to_string()).collect();
 
         state.serialize_field("gitVersion", &git_version_split[2])?;
         state.serialize_field("gitUsername", &self.git_username)?;
@@ -407,17 +414,16 @@ impl Serialize for Info {
         state.serialize_field("languages", &self.languages)?;
 
         let dependencies_split: Vec<String> =
-            self.dependencies.split(" ").map(|s| s.to_string()).collect();
+            self.dependencies.split(' ').map(|s| s.to_string()).collect();
 
         state.serialize_field("dependencies", &dependencies_split[0])?;
         state.serialize_field("authors", &self.authors)?;
         state.serialize_field("lastChange", &self.last_change)?;
         state.serialize_field("repoUrl", &self.repo_url)?;
         state.serialize_field("numberOfCommits", &self.number_of_commits)?;
         state.serialize_field("linesOfCode", &self.lines_of_code)?;
-        state.serialize_field("packedRepoSize", &self.packed_repo_size)?;
         state.serialize_field("repoSize", &self.repo_size)?;
-        state.serialize_field("filesCount", &self.files_count)?;
+        state.serialize_field("filesCount", &self.file_count)?;
         state.serialize_field("license", &self.license)?;
         state.serialize_field("dominantLanguage", &self.dominant_language)?;
         state.serialize_field("textColors", &self.text_colors)?;

src/onefetch/info.rs

@@ -4,7 +4,6 @@ pub mod cli_utils;
 mod commit_info;
 mod deps;
 pub mod error;
-mod git_utils;
 mod image_backends;
 pub mod info;
 mod info_field;