feat: add status command

coffeeispower · coffeeispower · commit 2e20a8c9d74c · 2022-12-18T16:28:42.000Z
diff --git a/src/commands.rs b/src/commands.rs
@@ -2,6 +2,7 @@ pub mod aboutme;
 pub mod apps;
 pub mod authstatus;
 pub mod commit;
+pub mod status;
 pub mod init;
 pub mod login;
 pub mod logs;
@@ -35,7 +36,7 @@ macro_rules! handle_result {
         }
     };
 }
-use crate::entities::FetchError;
+use crate::entities::{FetchError, app::App};
 #[tracing::instrument]
 pub fn expect_token() -> String {
     if crate::auth::validate_token() {
@@ -99,15 +100,43 @@ mod tests {
         assert_eq!(super::format_warn("Some warnings"), out)
     }
 }
-pub fn ask_for_app(token: String, action: &str, teams: bool) -> Result<u128, FetchError> {
+
+pub fn ask_for_app(token: String, action: &str, teams: bool) -> Result<App, FetchError> {
+    let mut apps = if teams {
+        crate::entities::app::App::fetch_foreign_apps(token)
+    } else {
+        crate::entities::app::App::fetch_all(token)
+    }?;
+    match apps.len() {
+        0 => {
+            err("You don't have any apps!");
+            std::process::exit(1);
+        },
+        1 => Ok(apps.remove(0)),
+        _ => {
+            let options = apps
+                .iter()
+                .map(|app| format!("{}: ({}) {}", app.name, app.lang, app.id))
+                .collect::<Vec<_>>();
+            let chosen_opt = Select::with_theme(&ColorfulTheme::default())
+                .items(&options)
+                .with_prompt(format!("Which app you want to {}?", action))
+                .interact()
+                .unwrap();
+            Ok(apps.remove(chosen_opt))
+        }
+    }
+}
+
+pub fn ask_for_app_id(token: String, action: &str, teams: bool) -> Result<u128, FetchError> {
     let apps = if teams {
         crate::entities::app::App::fetch_foreign_apps(token)
     } else {
         crate::entities::app::App::fetch_all(token)
     }?;
     match apps.len() {
         0 => {
-            format_err("You don't have any apps!");
+            err("You don't have any apps!");
             std::process::exit(1);
         },
         1 => Ok(apps[0].id.parse().unwrap()),
diff --git a/src/commands/commit.rs b/src/commands/commit.rs
@@ -18,7 +18,7 @@ fn get_zip_file_path() -> PathBuf {
 #[tracing::instrument]
 pub fn commit(teams: bool) {
     let token = super::expect_token();
-    let app_id = match super::ask_for_app(token.clone(), "commit", teams) {
+    let app_id = match super::ask_for_app_id(token.clone(), "commit", teams) {
         Ok(app_id) => app_id,
         Err(error) => {
             super::err(&format!("Couldn't fetch apps: {}", error));
diff --git a/src/commands/logs.rs b/src/commands/logs.rs
@@ -3,7 +3,7 @@ use spinners::{Spinner, Spinners};
 #[tracing::instrument]
 pub fn logs(teams: bool) {
     let token = super::expect_token();
-    match super::ask_for_app(token.clone(), "show the logs", teams) {
+    match super::ask_for_app_id(token.clone(), "show the logs", teams) {
         Ok(app_id) => {
             let mut spinner = Spinner::new(Spinners::Bounce, "Downloading the logs".into());
             match crate::entities::app::App::get_logs(token, app_id, teams) {
diff --git a/src/commands/mods/add.rs b/src/commands/mods/add.rs
@@ -1,14 +1,14 @@
 use spinners::Spinner;
 
 use crate::{
-    commands::{ask_for_app, expect_token},
+    commands::{ask_for_app_id, expect_token},
     entities::moderator::{Feature, Mod},
 };
 
 #[tracing::instrument]
 pub fn add(id: u128) {
     let token = expect_token();
-    let app_id = crate::handle_result!(ask_for_app(token.clone(), "add a moderator", false));
+    let app_id = crate::handle_result!(ask_for_app_id(token.clone(), "add a moderator", false));
     let mut spinner = Spinner::new(
         spinners::Spinners::Bounce,
         format!("Adding {} as a moderator", id),
diff --git a/src/commands/mods/allow.rs b/src/commands/mods/allow.rs
@@ -2,7 +2,7 @@ use crate::entities::moderator::Feature;
 use spinners::*;
 pub fn allow(id: u128, features: Vec<Feature>) {
     let token = super::expect_token();
-    let app_id = crate::handle_result!(super::ask_for_app(
+    let app_id = crate::handle_result!(super::ask_for_app_id(
         token.clone(),
         "modify the mod's permissions",
         false
diff --git a/src/commands/mods/deny.rs b/src/commands/mods/deny.rs
@@ -8,7 +8,7 @@ where
 }
 pub fn deny(id: u128, features: Vec<Feature>) {
     let token = super::expect_token();
-    let app_id = crate::handle_result!(super::ask_for_app(
+    let app_id = crate::handle_result!(super::ask_for_app_id(
         token.clone(),
         "modify the mod's permissions",
         false
diff --git a/src/commands/mods/remove.rs b/src/commands/mods/remove.rs
@@ -2,13 +2,13 @@ use spinners::Spinner;
 
 use crate::handle_result;
 use crate::{
-    commands::{ask_for_app, expect_token},
+    commands::{ask_for_app_id, expect_token},
     entities::{app::App, moderator::Mod},
 };
 #[tracing::instrument]
 pub fn remove(id: u128) {
     let token = expect_token();
-    let app_id = handle_result!(ask_for_app(token.clone(), "remove the moderator", false));
+    let app_id = handle_result!(ask_for_app_id(token.clone(), "remove the moderator", false));
     let mut spinner = Spinner::new(
         spinners::Spinners::Moon,
         format!("Sending {} to the moon", id),
diff --git a/src/commands/remove.rs b/src/commands/remove.rs
@@ -2,7 +2,7 @@ use spinners::*;
 #[tracing::instrument]
 pub fn remove() {
     let token = super::expect_token();
-    match super::ask_for_app(token.clone(), "delete", false) {
+    match super::ask_for_app_id(token.clone(), "delete", false) {
         Ok(app_id) => {
             let mut spinner = Spinner::new(Spinners::Flip, "Deleting your app".into());
             match crate::entities::app::App::delete(token, app_id) {
diff --git a/src/commands/restart.rs b/src/commands/restart.rs
@@ -2,7 +2,7 @@ use spinners::*;
 #[tracing::instrument]
 pub fn restart(teams: bool) {
     let token = super::expect_token();
-    match super::ask_for_app(token.clone(), "restart", teams) {
+    match super::ask_for_app_id(token.clone(), "restart", teams) {
         Ok(app_id) => {
             let mut spinner = Spinner::new(Spinners::Earth, "Restarting your app".into());
             match crate::entities::app::App::restart(token, app_id, teams) {
diff --git a/src/commands/start.rs b/src/commands/start.rs
@@ -2,7 +2,7 @@ use spinners::*;
 #[tracing::instrument]
 pub fn start(teams: bool) {
     let token = super::expect_token();
-    match super::ask_for_app(token.clone(), "start", teams) {
+    match super::ask_for_app_id(token.clone(), "start", teams) {
         Ok(app_id) => {
             let mut spinner = Spinner::new(Spinners::Earth, "Starting your app".into());
             match crate::entities::app::App::start(token, app_id, teams) {
diff --git a/src/commands/status.rs b/src/commands/status.rs
@@ -0,0 +1,19 @@
+use colored::Colorize;
+use spinners::*;
+#[tracing::instrument]
+pub fn status(teams: bool) {
+    let token = super::expect_token();
+    match super::ask_for_app(token.clone(), "show the status", teams) {
+        Ok(app) => {
+            println!("Your app is {}", if app.online {
+                "on".green()
+            } else {
+                "off".red()
+            });
+        }
+        Err(err) => {
+            super::err(&format!("Couldn't fetch apps from api: {}", err));
+            std::process::exit(1);
+        }
+    }
+}
diff --git a/src/commands/stop.rs b/src/commands/stop.rs
@@ -2,7 +2,7 @@ use spinners::*;
 #[tracing::instrument]
 pub fn stop(teams: bool) {
     let token = super::expect_token();
-    match super::ask_for_app(token.clone(), "shutdown", teams) {
+    match super::ask_for_app_id(token.clone(), "shutdown", teams) {
         Ok(app_id) => {
             let mut spinner = Spinner::new(Spinners::Pong, "Shutting down your app".into());
             match crate::entities::app::App::stop(token, app_id, teams) {
diff --git a/src/main.rs b/src/main.rs
@@ -82,6 +82,12 @@ fn main() -> std::io::Result<()> {
                 .about("Commits to an app on discloud. If you have more than one app, it will ask which app you want to commit to.")
                 .alias("c")
         )
+        
+        .subcommand(
+            Command::new("status")
+                .about("Says if a app is on or off")
+                .alias("s")
+        )
         .subcommand(
             Command::new("remove")
                 .about("Removes an app. If you have more than one app, it will ask which app you want to delete.")
@@ -126,6 +132,11 @@ fn main() -> std::io::Result<()> {
             .about("Allows to interact with other people's bots, you can use this once someone adds you as a moderator.")
             .subcommand_required(true)
             .arg_required_else_help(true)
+            .subcommand(
+                Command::new("status")
+                    .about("Says if a app is on or off")
+                    .alias("s")
+            )
             .subcommand(
                 Command::new("apps")
                     .about("Shows all bots you have access to.")
@@ -210,6 +221,11 @@ fn main() -> std::io::Result<()> {
         Some(("login", login_matches)) => commands::login::login(login_matches),
         Some(("authstatus", _)) => commands::authstatus::authstatus(),
         Some(("init", _)) => commands::init::init(),
+        
+        Some(("status", _)) => {
+            commands::status::status(false);
+            Ok(())
+        }
         Some(("upload", _)) => {
             commands::upload::upload();
             Ok(())
@@ -276,6 +292,10 @@ fn main() -> std::io::Result<()> {
             }
         },
         Some(("teams", matches)) => match matches.subcommand() {
+            Some(("status", _)) => {
+                commands::status::status(true);
+                Ok(())
+            }
             Some(("commit", _)) => {
                 commands::commit::commit(true);
                 Ok(())

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ where`
`8`	`8`	`}`
`9`	`9`	`pub fn deny(id: u128, features: Vec<Feature>) {`
`10`	`10`	`let token = super::expect_token();`
`11`		`- let app_id = crate::handle_result!(super::ask_for_app(`
	`11`	`+ let app_id = crate::handle_result!(super::ask_for_app_id(`
`12`	`12`	`token.clone(),`
`13`	`13`	`"modify the mod's permissions",`
`14`	`14`	`false`