Skip to content

Commit 1fecaea

Browse files
committed
move get_git_version in cli_utils.rs
1 parent 0c9fcbb commit 1fecaea

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

src/onefetch/cli_utils.rs

+6
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use crate::onefetch::{
55
use colored::Color;
66
use std::env;
77
use std::io::Write;
8+
use std::process::Command;
89
use strum::IntoEnumIterator;
910

1011
pub struct Printer<W> {
@@ -106,3 +107,8 @@ pub fn is_truecolor_terminal() -> bool {
106107
.map(|colorterm| colorterm == "truecolor" || colorterm == "24bit")
107108
.unwrap_or(false)
108109
}
110+
111+
pub fn get_git_version() -> Result<String> {
112+
let version = Command::new("git").arg("--version").output()?;
113+
Ok(String::from_utf8_lossy(&version.stdout).replace('\n', ""))
114+
}

src/onefetch/info.rs

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use {
22
crate::onefetch::{
3-
cli::Cli, commit_info::CommitInfo, deps, error::*, language::Language, license::Detector,
4-
repo::Repo, text_color::TextColor,
3+
cli::Cli, cli_utils, commit_info::CommitInfo, deps, error::*, language::Language,
4+
license::Detector, repo::Repo, text_color::TextColor,
55
},
66
colored::{Color, ColoredString, Colorize},
77
std::process::Command,
@@ -224,7 +224,7 @@ impl Info {
224224
let number_of_commits = Info::get_number_of_commits(&git_history);
225225
let authors = Info::get_authors(&git_history, config.number_of_authors);
226226
let last_change = Info::get_date_of_last_commit(&git_history)?;
227-
let git_version = Info::get_git_version()?;
227+
let git_version = cli_utils::get_git_version()?;
228228
let repo_size = Info::get_packed_size(&workdir)?;
229229
let license = Detector::new()?.get_license(&workdir)?;
230230
let dependencies = deps::DependencyDetector::new().get_dependencies(&workdir)?;
@@ -338,11 +338,6 @@ impl Info {
338338
number_of_commits.to_string()
339339
}
340340

341-
fn get_git_version() -> Result<String> {
342-
let version = Command::new("git").arg("--version").output()?;
343-
Ok(String::from_utf8_lossy(&version.stdout).replace('\n', ""))
344-
}
345-
346341
fn get_packed_size(dir: &str) -> Result<String> {
347342
let output = Command::new("git")
348343
.arg("-C")

0 commit comments

Comments
 (0)