renamed download command to release & finished all display modes for release

Author: cqb13

Cargo.toml

@@ -17,7 +17,7 @@ exclude = [".gitignore", ".github/*"]
 [dependencies]
 reqwest = { version = "0.12", features = ["json", "blocking"] }
 serde_json = "1.0"
-serde = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 
 [[bin]]
 name = "gstats"

src/commands/mod.rs

@@ -1,2 +1,2 @@
 pub mod all;
-pub mod downloads;
+pub mod releases;

src/commands/downloads.rs src/commands/releases.rssrc/commands/downloads.rs renamed to src/commands/releases.rs

@@ -1,9 +1,10 @@
 use crate::utils::{bytes_to_best_size, pretty_dates, request, write_json_to_file};
-use serde::{Deserialize, Deserializer, Serialize};
+use serde::{Deserialize, Serialize};
 use serde_json::Value;
-use std::{path::PathBuf, vec};
+use std::path::PathBuf;
 
-pub struct DownloadData {
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct ReleaseData {
     pub name: String,
     pub tag: String,
     pub published_at: String,
@@ -14,16 +15,16 @@ pub struct DownloadData {
     pub downloads: i64,
 }
 
-impl DownloadData {
+impl ReleaseData {
     pub fn new(
         name: String,
         tag: String,
         published_at: String,
         created_at: String,
         html_url: String,
         body: String,
-    ) -> DownloadData {
-        DownloadData {
+    ) -> ReleaseData {
+        ReleaseData {
             name,
             tag,
             published_at,
@@ -52,6 +53,7 @@ impl DownloadData {
     }
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct Asset {
     pub download_url: String,
     pub created_at: String,
@@ -94,7 +96,7 @@ impl Asset {
     }
 }
 
-pub fn downloads_command(
+pub fn releases_command(
     owner: String,
     repo: String,
     individual: bool,
@@ -120,17 +122,31 @@ pub fn downloads_command(
     let simple_data = simplify_json_release_data(&json);
 
     if all && !display {
-        println!("{:#?}", json);
+        println!("{}", serde_json::to_string_pretty(&json).unwrap());
     } else if all && display {
         let mut download_count = 0;
-        for release in simple_data {
+        for release in &simple_data {
             release.display();
             download_count += release.downloads;
         }
         println!("Total Downloads: {}", download_count);
+        if link {
+            println!("Latest Release: {}", simple_data[0].html_url)
+        }
     } else if !all && !display {
-        // if individual, get latest download url, and sum all item count
-        // {download_url: Vec<(String name, String link for each asset of latest)>, html_url: String, download_count: i32}
+        if individual {
+            println!("{}", serde_json::to_string_pretty(&simple_data).unwrap());
+        } else {
+            let mut overview = simple_data[0].clone();
+            let mut download_count = 0;
+            for release in &simple_data {
+                download_count += release.downloads;
+            }
+
+            overview.downloads = download_count;
+
+            println!("{}", serde_json::to_string_pretty(&overview).unwrap());
+        }
     } else if !all && display {
         let mut download_count = 0;
         for release in &simple_data {
@@ -161,8 +177,8 @@ pub fn downloads_command(
     }
 }
 
-fn simplify_json_release_data(json: &Value) -> Vec<DownloadData> {
-    let mut download_data: Vec<DownloadData> = Vec::new();
+fn simplify_json_release_data(json: &Value) -> Vec<ReleaseData> {
+    let mut download_data: Vec<ReleaseData> = Vec::new();
 
     for release in json.as_array().unwrap() {
         let name = &release["name"].as_str().unwrap_or("None").to_string();
@@ -175,7 +191,7 @@ fn simplify_json_release_data(json: &Value) -> Vec<DownloadData> {
         let html_url = &release["html_url"].as_str().unwrap_or("None").to_string();
         let body = &release["body"].as_str().unwrap_or("None").to_string();
 
-        let mut download = DownloadData::new(
+        let mut download = ReleaseData::new(
             name.to_string(),
             tag.to_string(),
             pretty_dates(&published_at),

src/main.rs

@@ -4,7 +4,7 @@ pub mod utils;
 
 use crate::cli::{Arg, Cli, Command};
 use crate::commands::all::all_command;
-use crate::commands::downloads::downloads_command;
+use crate::commands::releases::releases_command;
 use crate::utils::validate_and_convert_path;
 
 fn main() {
@@ -44,7 +44,7 @@ fn main() {
                     .with_long("display")
                     .with_help("Converts the json to an easier format (will remove some data)."),
             ),
-        Command::new("downloads", "Gives download count of releases as json")
+        Command::new("releases", "Gives information on github releases")
             .with_arg(
                 Arg::new()
                     .with_name("owner")
@@ -97,48 +97,6 @@ fn main() {
                     .with_long("display")
                     .with_help("Converts the json to an easier format (will remove some data)."),
             ),
-        Command::new(
-            "releases",
-            "Gives names and download links for all releases as json",
-        )
-        .with_arg(
-            Arg::new()
-                .with_name("owner")
-                .with_short('o')
-                .with_long("owner")
-                .with_value_name("OWNER")
-                .with_help("Owner of the repository"),
-        )
-        .with_arg(
-            Arg::new()
-                .with_name("repository")
-                .with_short('r')
-                .with_long("repository")
-                .with_value_name("REPOSITORY")
-                .with_help("Name of the repository"),
-        )
-        .with_arg(
-            Arg::new()
-                .with_name("output")
-                .with_short('f')
-                .with_long("output")
-                .with_value_name("OUTPUT")
-                .with_help("File path to save the json"),
-        )
-        .with_arg(
-            Arg::new()
-                .with_name("all")
-                .with_short('a')
-                .with_long("all")
-                .with_help("All json from request"),
-        )
-        .with_arg(
-            Arg::new()
-                .with_name("display")
-                .with_short('d')
-                .with_long("display")
-                .with_help("Converts the json to an easier format (will remove some data)."),
-        ),
         Command::new("help", "Helps you with the commands").with_short('h'),
     ]);
 
@@ -156,7 +114,7 @@ fn main() {
 
             all_command(owner, repo, output, display);
         }
-        "downloads" => {
+        "releases" => {
             let owner = command.get_value_of("owner").throw_if_none();
             let repo = command.get_value_of("repository").throw_if_none();
             let individual = command.has("individual");
@@ -167,14 +125,7 @@ fn main() {
 
             let output = output_to_path(output);
 
-            downloads_command(owner, repo, individual, link, output, all, display);
-        }
-        "releases" => {
-            let owner = command.get_value_of("owner").throw_if_none();
-            let repo = command.get_value_of("repository").throw_if_none();
-            let output = command.get_value_of("output").to_option();
-            let all = command.has("all");
-            let display = command.has("display");
+            releases_command(owner, repo, individual, link, output, all, display);
         }
         "help" => cli.help(),
         _ => cli.help(),