add is_valid_repo check in main

Author: o2sh

Diff for: src/main.rs

@@ -19,18 +19,21 @@ fn run() -> Result<()> {
         return Err("Git failed to execute!".into());
     }
 
-    // Load command line options.
-    let options = Cli::new()?;
+    let config = Cli::new()?;
 
-    if options.print_languages {
+    if !cli_utils::is_valid_repo(&config.repo_path)? {
+        return Err("please run onefetch inside of a non-bare git repository".into());
+    }
+
+    if config.print_languages {
         return cli_utils::print_supported_languages();
     }
 
-    if options.print_package_managers {
+    if config.print_package_managers {
         return cli_utils::print_supported_package_managers();
     }
 
-    let info = info::Info::new(options)?;
+    let info = info::Info::new(config)?;
 
     let mut printer = cli_utils::Printer::new(io::BufWriter::new(io::stdout()), info);
 

Diff for: src/onefetch/cli.rs

@@ -13,7 +13,7 @@ use {
 };
 
 pub struct Cli {
-    pub path: String,
+    pub repo_path: String,
     pub ascii_input: Option<String>,
     pub ascii_language: Option<Language>,
     pub ascii_colors: Vec<String>,
@@ -49,8 +49,11 @@ impl Cli {
         .setting(AppSettings::DeriveDisplayOrder)
         .setting(AppSettings::UnifiedHelpMessage)
         .setting(AppSettings::HidePossibleValuesInHelp)
-        .arg(Arg::with_name("input").default_value(".").hide_default_value(true).help(
-            "Run as if onefetch was started in <input> instead of the current working directory.",
+        .arg(
+            Arg::with_name("input")
+            .default_value(".")
+            .hide_default_value(true)
+            .help("Run as if onefetch was started in <input> instead of the current working directory.",
         ))
         .arg(
             Arg::with_name("ascii-language")
@@ -263,7 +266,7 @@ impl Cli {
             16
         };
 
-        let path = String::from(matches.value_of("input").unwrap());
+        let repo_path = String::from(matches.value_of("input").unwrap());
 
         let ascii_input = matches.value_of("ascii-input").map(String::from);
 
@@ -296,7 +299,7 @@ impl Cli {
         };
 
         Ok(Cli {
-            path,
+            repo_path,
             ascii_input,
             ascii_language,
             ascii_colors,

Diff for: src/onefetch/cli_utils.rs

@@ -3,8 +3,10 @@ use crate::onefetch::{
     language::Language,
 };
 use colored::Color;
+use git2::{Repository, RepositoryOpenFlags};
 use std::env;
 use std::io::Write;
+use std::path::Path;
 use strum::IntoEnumIterator;
 
 pub struct Printer<W> {
@@ -85,6 +87,13 @@ impl<W: Write> Printer<W> {
     }
 }
 
+pub fn is_valid_repo(repo_path: &str) -> Result<bool> {
+    let repo =
+        Repository::open_ext(repo_path, RepositoryOpenFlags::empty(), Vec::<&Path>::new());
+
+    Ok(repo.is_ok() && !repo?.is_bare())
+}
+
 pub fn print_supported_languages() -> Result<()> {
     for l in Language::iter() {
         println!("{}", l);

Diff for: src/onefetch/error.rs

@@ -12,6 +12,7 @@ error_chain! {
         Json(json::Error);
         Regex(regex::Error);
         Toml(toml::de::Error);
+        Git2(git2::Error);
     }
 }
 

Diff for: src/onefetch/info.rs

@@ -212,9 +212,8 @@ impl std::fmt::Display for Info {
 
 impl Info {
     pub fn new(config: Cli) -> Result<Info> {
-        let repo = Repository::discover(&config.path)
-            .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 repo = Repository::discover(&config.repo_path)?;
+        let workdir = repo.workdir().unwrap();
         let workdir_str = workdir.to_str().unwrap();
         let (languages_stats, lines_of_code) =
             Language::get_language_statistics(workdir_str, &config.excluded)?;