Merge branch 'master' of https://github.com/o2sh/onefetch

Update branch for merging

Author: Luke-zhang-04

README.md

@@ -19,7 +19,7 @@ Onefetch is a command-line Git information tool written in `Rust` that will disp
 
 By default, the repo's information is displayed alongside the dominant language's ASCII logo, but you can further configure Onefetch to instead display an image - on supported terminals (more info [here](https://github.com/o2sh/onefetch/wiki/Images-in-the-terminal)) -, a text input or nothing at all.
 
-It automatically detects open source licenses from texts and provides the user with various information like code distribution, pending changes, top contributors (by number of commits), size on disk, creation date, version, HEAD, last change, LOC (lines of code), etc.
+It automatically detects open source licenses from texts and provides the user with various information like code distribution, pending changes, dependencies, top contributors (by number of commits), size on disk, creation date, version, HEAD, last change, LOC (lines of code), etc.
 
 <img src="assets/go.png" align="right" height="240px">
 

assets/go.png

@@ -129,7 +129,7 @@ impl Cli {
                     "Changes the text colors (X X X...). \
                      Goes in order of title, ~, underline, subtitle, colon, and info. \
                      For example:\n \
-                     '--text-color 9 10 11 12 13 14'"
+                     '--text-colors 9 10 11 12 13 14'"
             )
         )
         .arg(

assets/linux.png

@@ -25,7 +25,7 @@ pub struct Info {
     commits: String,
     pending: String,
     repo_size: String,
-    number_of_lines: usize,
+    lines_of_code: usize,
     number_of_tags: usize,
     number_of_branches: usize,
     license: String,
@@ -167,9 +167,9 @@ impl std::fmt::Display for Info {
         if !self.config.disabled_fields.lines_of_code {
             writeln!(
                 f,
-                "{} {}",
+                "{}{}",
                 &self.get_formatted_subtitle_label("Lines of code"),
-                &self.number_of_lines.to_string().color(self.color_set.info),
+                &self.lines_of_code.to_string().color(self.color_set.info),
             )?;
         }
 
@@ -216,7 +216,7 @@ impl Info {
             .chain_err(|| "Could not find a valid git repo on the current path")?;
         let workdir = repo.workdir().chain_err(|| "Unable to run onefetch on bare git repo")?;
         let workdir_str = workdir.to_str().unwrap();
-        let (languages_stats, number_of_lines) =
+        let (languages_stats, lines_of_code) =
             Language::get_language_statistics(workdir_str, &config.excluded)?;
         let git_history = Info::get_git_history(workdir_str, config.no_merges);
         let (number_of_tags, number_of_branches) = Info::get_number_of_tags_branches(workdir_str);
@@ -257,7 +257,7 @@ impl Info {
             commits: number_of_commits,
             pending: pending?,
             repo_size: repo_size?,
-            number_of_lines,
+            lines_of_code,
             number_of_tags,
             number_of_branches,
             license: project_license?,

src/onefetch/cli.rs

@@ -16,7 +16,7 @@ impl TextColor {
             tilde: Color::White,
             underline: Color::White,
             subtitle: color,
-            colon: color,
+            colon: Color::White,
             info: Color::White,
         }
     }
@@ -39,7 +39,7 @@ impl TextColor {
             text_color_set.tilde = *custom_color.get(1).unwrap_or(&Color::White);
             text_color_set.underline = *custom_color.get(2).unwrap_or(&Color::White);
             text_color_set.subtitle = *custom_color.get(3).unwrap_or(&default_colors[0]);
-            text_color_set.colon = *custom_color.get(4).unwrap_or(&default_colors[0]);
+            text_color_set.colon = *custom_color.get(4).unwrap_or(&Color::White);
             text_color_set.info = *custom_color.get(5).unwrap_or(&Color::White);
         }