run command & new log macros

Author: diced

Cargo.lock

@@ -4,16 +4,13 @@ description = "discord version manager for linux"
 homepage = "https://github.com/diced/dvm"
 repository = "https://github.com/diced/dvm.git"
 license = "MIT"
-version = "1.1.6"
+version = "1.1.7"
 authors = ["diced <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [[bin]]
 name = "dvm"
 
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 tokio = { version = "1.6.0", features = ["full"] }
 reqwest = { version = "0.11.3", features = ["json", "native-tls", "blocking"], default-features = false }

Cargo.toml

@@ -4,7 +4,7 @@ Allowing you to manage all of your discord versions. This was made as I was impa
 
 # Usage
 ```
-dvm 0.1.1
+dvm 1.1.4
 
 USAGE:
     dvm <SUBCOMMAND>
@@ -14,11 +14,13 @@ FLAGS:
     -V, --version    Prints version information
 
 SUBCOMMANDS:
-    help       Prints this message or the help of the given subcommand(s)
-    install    install the latest <type> of discord
-    remove     remove the installed <type> of discord
-    show       show all installed versions
-    update     update to the latest <type> of discord
+    completions    get shell completions
+    help           Prints this message or the help of the given subcommand(s)
+    install        install the latest <type> of discord
+    remove         remove the installed <type> of discord
+    run            run discord with specific options
+    show           show all installed versions
+    update         update to the latest <type> of discord
 ```
 
 # Installing

README.md

@@ -7,7 +7,7 @@ pub async fn install(release_type: Type, verbose: bool) -> Res<()> {
   let user = env::var("USER")?;
   fs::create_dir_all(format!("/home/{}/.dvm/bin", user))?;
   if verbose {
-    info("created .dvm dir")
+    info!("created .dvm dir")
   }
 
   let pascal_pkg = match release_type {
@@ -20,12 +20,11 @@ pub async fn install(release_type: Type, verbose: bool) -> Res<()> {
   let exists = Path::new(&format!("/home/{}/.dvm/{}", user, pascal_pkg)).exists();
 
   if exists {
-    error(format!("{} is already installed", release_type));
-    std::process::exit(1);
+    error!("{} is already installed", release_type);
   }
 
   let (latest, _) = install_version(false, release_type.clone(), verbose, user).await?;
 
-  success(format!("installed {}:{}", release_type, latest));
+  success!("installed {}:{}", release_type, latest);
   Ok(())
 }

src/cli/install.rs

@@ -2,5 +2,6 @@ mod install;
 mod remove;
 mod show;
 mod update;
+mod run;
 
-pub use {install::install, remove::remove, show::show, update::update};
+pub use {install::install, remove::remove, show::show, update::update, run::run};

src/cli/mod.rs

@@ -23,33 +23,32 @@ pub async fn remove(release_type: Type, verbose: bool) -> Res<()> {
 
   let exists = Path::new(&format!("/home/{}/.dvm/{}", user, pascal_pkg)).exists();
   if verbose {
-    info("checking if installation exists")
+    info!("checking if installation exists")
   }
 
   if !exists {
-    error(format!("{} not installed", release_type));
-    std::process::exit(1);
+    error!("{} not installed", release_type);
   }
 
   let version = fs::read_to_string(format!("/home/{}/.dvm/{}/version", user, pascal_pkg))
     .expect("could not read version file: malformed installation detected");
   if verbose {
-    info("reading version file")
+    info!("reading version file")
   }
 
-  info(format!("removing version {}:{}", release_type, version));
+  info!("removing version {}:{}", release_type, version);
 
   // remove all {release type} associated files
   fs::remove_dir_all(format!("/home/{}/.dvm/{}", user, pascal_pkg))
     .expect("error when removing data dirs");
   if verbose {
-    info("removed data dirs")
+    info!("removed data dirs")
   }
 
   fs::remove_file(format!("/home/{}/.dvm/bin/{}", user, pkg_name))
     .expect("error when removing bin file");
   if verbose {
-    info("removed bin file")
+    info!("removed bin file")
   }
 
   fs::remove_file(format!(
@@ -58,7 +57,7 @@ pub async fn remove(release_type: Type, verbose: bool) -> Res<()> {
   ))
   .expect("error when removing desktop file");
   if verbose {
-    info("removed desktop file")
+    info!("removed desktop file")
   }
 
   fs::remove_file(format!(
@@ -67,9 +66,9 @@ pub async fn remove(release_type: Type, verbose: bool) -> Res<()> {
   ))
   .expect("error when removing icon");
   if verbose {
-    info("removed icon")
+    info!("removed icon")
   }
 
-  success(format!("removed version {}:{}", release_type, version));
+  success!("removed version {}:{}", release_type, version);
   Ok(())
 }

src/cli/remove.rs

@@ -0,0 +1,38 @@
+use std::{env, fs, path::Path};
+
+use tokio::process::Command;
+
+use crate::{Res, error, info, r#type::Type};
+
+pub async fn run(release_type: Type, args: Vec<String>, verbose: bool) -> Res<()> {
+  // create user var & create .dvm dirs
+  let user = env::var("USER")?;
+  fs::create_dir_all(format!("/home/{}/.dvm/bin", user))?;
+
+  // create user var & create .dvm dirs
+  let user = env::var("USER")?;
+  fs::create_dir_all(format!("/home/{}/.dvm/bin", user))?;
+  if verbose {
+    info!("created .dvm dir")
+  }
+
+  let pascal_pkg = match release_type {
+    Type::STABLE => "Discord",
+    Type::PTB => "DiscordPTB",
+    Type::CANARY => "DiscordCanary",
+    Type::DEVELOPMENT => "DiscordDevelopment",
+  };
+
+  let exists = Path::new(&format!("/home/{}/.dvm/{}", user, pascal_pkg)).exists();
+
+  if !exists {
+    error!("{} is not installed", release_type);
+  }
+
+  Command::new(format!("/home/{}/.dvm/{}/{}", user, pascal_pkg, pascal_pkg))
+    .args(&args)
+    .spawn()?
+    .wait_with_output().await?;
+
+  Ok(())
+}

src/cli/run.rs

@@ -11,7 +11,7 @@ pub async fn update(release_type: Type, verbose: bool) -> Res<()> {
   let user = env::var("USER")?;
   fs::create_dir_all(format!("/home/{}/.dvm/bin", user))?;
   if verbose {
-    info("created .dvm dir")
+    info!("created .dvm dir")
   }
 
   let pascal_pkg = match release_type {
@@ -24,16 +24,15 @@ pub async fn update(release_type: Type, verbose: bool) -> Res<()> {
   let exists = Path::new(&format!("/home/{}/.dvm/{}", user, pascal_pkg)).exists();
 
   if !exists {
-    error(format!("{} is not installed", release_type));
-    std::process::exit(1);
+    error!("{} is not installed", release_type);
   }
 
   let (latest, version) = install_version(true, release_type.clone(), verbose, user).await?;
 
-  success(format!(
+  success!(
     "updated {}:{} -> {}:{}",
     release_type, version, release_type, latest
-  ));
+  );
 
   Ok(())
 }

src/cli/update.rs

@@ -9,6 +9,8 @@ pub const SHOW_DESC: &str = "show all installed versions";
 pub const SHOW_ALIASES: &[&str] = &["s", "installed", "all", "a", "versions", "types"];
 pub const COMP_DESC: &str = "get shell completions";
 pub const COMP_ALIASES: &[&str] = &["c", "comp"];
+pub const RUN_DESC: &str = "run discord with specific options";
+pub const RUN_ALIASES: &[&str] =  &["r", "start", "s"];
 
 pub const POSSIBLE_SHELLS: &[&str] = &[
   "bash", "b",

src/common.rs

@@ -12,8 +12,7 @@ pub fn give_completions(shell: &str) {
     "powershell" | "pwsh" | "ps" | "p" => return_bash(),
     "zsh" | "z" => return_bash(),
     _ => {
-      error(format!("shell \"{}\" is not supported", shell));
-      std::process::exit(1);
+      error!("shell \"{}\" is not supported", shell);
     }
   };
 }