path validation

Author: cqb13

src/commands/all.rs

@@ -1,23 +1,30 @@
 use crate::utils::{pretty_dates, request};
 use serde_json::Value;
+use std::path::PathBuf;
 
 pub fn all(
     owner: String,
     repo: String,
-    output: Option<String>,
+    output: Option<PathBuf>,
     display: bool,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    //TODO: handle no repo/private repo
     let url = format!("https://api.github.com/repos/{}/{}", owner, repo);
 
     let json = request(url)?;
 
+    if &json["message"] == "Not Found" {
+        println!("Repository not found.");
+        return Ok(());
+    }
+
     if !display {
         println!("{:#?}", json);
     } else {
         simplify_and_display_json(json)
     }
 
+    
+
     Ok(())
 }
 

src/main.rs

@@ -2,8 +2,11 @@ pub mod cli;
 pub mod commands;
 pub mod utils;
 
+use std::process::Output;
+
+use crate::cli::{Arg, Cli, Command};
 use crate::commands::all::all;
-use cli::{Arg, Cli, Command};
+use crate::utils::validate_and_convert_path;
 
 fn main() {
     let cli = Cli::new().with_default_command("help").with_commands(vec![
@@ -135,6 +138,17 @@ fn main() {
             let output = command.get_value_of("output").to_option();
             let display = command.has("display");
 
+            let output = match output {
+                Some(path) => match validate_and_convert_path(path) {
+                    Ok(real_path) => Some(real_path),
+                    Err(err) => {
+                        println!("{}", err);
+                        std::process::exit(0)
+                    }
+                },
+                None => None,
+            };
+
             let _ = all(owner, repo, output, display);
         }
         "downloads" => {

src/utils.rs

@@ -14,7 +14,7 @@ pub fn request(url: String) -> Result<Value, Box<dyn std::error::Error>> {
 
 fn construct_header() -> HeaderMap {
     let mut headers = HeaderMap::new();
-    headers.insert(USER_AGENT, "User".parse().unwrap());
+    headers.insert(USER_AGENT, "GSTATS".parse().unwrap());
     headers.insert(ACCEPT, "application/vnd.github.v3+json".parse().unwrap());
     return headers;
 }
@@ -25,14 +25,18 @@ pub fn pretty_dates(date: &str) -> String {
     format!("{}-{}-{}", date[2], date[1], date[0])
 }
 
-pub fn validate_path(path: String) -> Result<PathBuf, String> {
+pub fn validate_and_convert_path(path: String) -> Result<PathBuf, String> {
     let real_path = Path::new(&path);
 
-    if !real_path.exists() {
-        return Err(format!("Failed to find path \"{}\"", path));
+    if real_path.is_file() {
+        println!("A file was found at the path: \"{}\"", path);
+        println!("Would you like to clear the file and continue? [y/N]");
+        let mut input = String::new();
+        std::io::stdin().read_line(&mut input).unwrap();
+        if input.trim().to_lowercase() != "y" {
+            return Err("A file already exists at the path.".to_owned());
+        }
     }
 
-    
-
     Ok(real_path.to_owned())
 }