Merge pull request #7 from arduano/trunk

Updating dependencies to be able to compile again, plus various cleanups

Author: diced

Cargo.lock

@@ -3,7 +3,7 @@ name = "dvm"
 description = "discord version manager for linux"
 homepage = "https://github.com/diced/dvm"
 repository = "https://github.com/diced/dvm.git"
-license = "MIT"
+license = "GPL-3"
 version = "1.1.9"
 authors = ["diced <pranaco2@gmail.com>"]
 edition = "2021"
@@ -13,7 +13,11 @@ name = "dvm"
 
 [dependencies]
 tokio = { version = "1.6.0", features = ["full"] }
-reqwest = { version = "0.11.3", features = ["json", "native-tls", "blocking"], default-features = false }
+reqwest = { version = "0.11.3", features = [
+    "json",
+    "native-tls",
+    "blocking",
+], default-features = false }
 colored = "2.0.0"
-clap = "3.0.0-beta.2"
-clap_generate = "3.0.0-beta.2"
+clap = { version = "4.4.11", features = ["derive", "color"] }
+clap_complete = "4.4.4"

Cargo.toml

@@ -0,0 +1,37 @@
+use std::fmt;
+
+use clap::ValueEnum;
+
+#[derive(Debug, Clone, Copy)]
+pub enum DiscordBranch {
+  STABLE,
+  PTB,
+  CANARY,
+  DEVELOPMENT,
+}
+
+impl fmt::Display for DiscordBranch {
+  fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+    write!(f, "{}", self.to_possible_value().unwrap().get_name())
+  }
+}
+
+impl clap::ValueEnum for DiscordBranch {
+  fn value_variants<'a>() -> &'a [Self] {
+    &[
+      DiscordBranch::STABLE,
+      DiscordBranch::CANARY,
+      DiscordBranch::PTB,
+      DiscordBranch::DEVELOPMENT,
+    ]
+  }
+
+  fn to_possible_value(&self) -> Option<clap::builder::PossibleValue> {
+    match self {
+      DiscordBranch::STABLE => Some(clap::builder::PossibleValue::new("stable")),
+      DiscordBranch::CANARY => Some(clap::builder::PossibleValue::new("canary")),
+      DiscordBranch::PTB => Some(clap::builder::PossibleValue::new("ptb")),
+      DiscordBranch::DEVELOPMENT => Some(clap::builder::PossibleValue::new("development")),
+    }
+  }
+}

LICENSE

@@ -1,8 +1,8 @@
-use std::{ env, fs, path::Path};
+use std::{env, fs, path::Path};
 
-use crate::{error, info, r#type::Type, success, Res, util::install_version};
+use crate::{branch::DiscordBranch, error, info, success, util::install_version, Res};
 
-pub async fn install(release_type: Type, verbose: bool, open_asar: bool) -> Res<()> {
+pub async fn install(release_type: DiscordBranch, verbose: bool, open_asar: bool) -> Res<()> {
   // create user var & create .dvm dirs
   let user = env::var("USER")?;
   fs::create_dir_all(format!("/home/{}/.dvm/bin", user))?;
@@ -11,10 +11,10 @@ pub async fn install(release_type: Type, verbose: bool, open_asar: bool) -> Res<
   }
 
   let pascal_pkg = match release_type {
-    Type::STABLE => "Discord",
-    Type::PTB => "DiscordPTB",
-    Type::CANARY => "DiscordCanary",
-    Type::DEVELOPMENT => "DiscordDevelopment",
+    DiscordBranch::STABLE => "Discord",
+    DiscordBranch::PTB => "DiscordPTB",
+    DiscordBranch::CANARY => "DiscordCanary",
+    DiscordBranch::DEVELOPMENT => "DiscordDevelopment",
   };
 
   let exists = Path::new(&format!("/home/{}/.dvm/{}", &user, &pascal_pkg)).exists();
@@ -31,10 +31,11 @@ pub async fn install(release_type: Type, verbose: bool, open_asar: bool) -> Res<
     fs::rename(&asar_file, format!("{}.bak", &asar_file))?;
     info!("renamed app.asar to app.asar.bak (if discord doesn't work after this, rename it back)");
 
-    let res = reqwest::get("https://github.com/GooseMod/OpenAsar/releases/download/nightly/app.asar")
-      .await?
-      .bytes()
-      .await?;
+    let res =
+      reqwest::get("https://github.com/GooseMod/OpenAsar/releases/download/nightly/app.asar")
+        .await?
+        .bytes()
+        .await?;
 
     fs::write(&asar_file, res)?;
 

src/branch.rs

@@ -1,8 +1,8 @@
 use std::{env, fs, path::Path};
 
-use crate::{error, info, r#type::Type, success, Res};
+use crate::{branch::DiscordBranch, error, info, success, Res};
 
-pub async fn install_openasar(release_type: Type, verbose: bool) -> Res<()> {
+pub async fn install_openasar(release_type: DiscordBranch, verbose: bool) -> Res<()> {
   // create user var & create .dvm dirs
   let user = env::var("USER")?;
   fs::create_dir_all(format!("/home/{}/.dvm/bin", user))?;
@@ -11,10 +11,10 @@ pub async fn install_openasar(release_type: Type, verbose: bool) -> Res<()> {
   }
 
   let pascal_pkg = match release_type {
-    Type::STABLE => "Discord",
-    Type::PTB => "DiscordPTB",
-    Type::CANARY => "DiscordCanary",
-    Type::DEVELOPMENT => "DiscordDevelopment",
+    DiscordBranch::STABLE => "Discord",
+    DiscordBranch::PTB => "DiscordPTB",
+    DiscordBranch::CANARY => "DiscordCanary",
+    DiscordBranch::DEVELOPMENT => "DiscordDevelopment",
   };
 
   let exists = Path::new(&format!("/home/{}/.dvm/{}", &user, &pascal_pkg)).exists();

src/cli/install.rs

@@ -1,8 +1,13 @@
 mod install;
 mod install_openasar;
 mod remove;
+mod run;
 mod show;
 mod update;
-mod run;
 
-pub use {install::install, install_openasar::install_openasar, remove::remove, show::show, update::update, run::run};
+pub use install::install;
+pub use install_openasar::install_openasar;
+pub use remove::remove;
+pub use run::run;
+pub use show::show;
+pub use update::update;

src/cli/install_openasar.rs

@@ -1,24 +1,24 @@
 use std::{env, fs, path::Path};
 
-use crate::{error, info, r#type::Type, success, Res};
+use crate::{branch::DiscordBranch, error, info, success, Res};
 
-pub async fn remove(release_type: Type, verbose: bool) -> Res<()> {
+pub async fn remove(release_type: DiscordBranch, verbose: bool) -> Res<()> {
   // create user var & create .dvm dirs
   let user = env::var("USER")?;
   fs::create_dir_all(format!("/home/{}/.dvm/bin", user))?;
 
   let pascal_pkg = match release_type {
-    Type::STABLE => "Discord",
-    Type::PTB => "DiscordPTB",
-    Type::CANARY => "DiscordCanary",
-    Type::DEVELOPMENT => "DiscordDevelopment",
+    DiscordBranch::STABLE => "Discord",
+    DiscordBranch::PTB => "DiscordPTB",
+    DiscordBranch::CANARY => "DiscordCanary",
+    DiscordBranch::DEVELOPMENT => "DiscordDevelopment",
   };
 
   let pkg_name = match release_type {
-    Type::STABLE => "discord",
-    Type::PTB => "discord-ptb",
-    Type::CANARY => "discord-canary",
-    Type::DEVELOPMENT => "discord-development",
+    DiscordBranch::STABLE => "discord",
+    DiscordBranch::PTB => "discord-ptb",
+    DiscordBranch::CANARY => "discord-canary",
+    DiscordBranch::DEVELOPMENT => "discord-development",
   };
 
   let exists = Path::new(&format!("/home/{}/.dvm/{}", user, pascal_pkg)).exists();

src/cli/mod.rs

@@ -2,9 +2,9 @@ use std::{env, fs, path::Path};
 
 use tokio::process::Command;
 
-use crate::{Res, error, info, r#type::Type};
+use crate::{branch::DiscordBranch, error, info, Res};
 
-pub async fn run(release_type: Type, args: Vec<String>, verbose: bool) -> Res<()> {
+pub async fn run(release_type: DiscordBranch, 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))?;
@@ -17,10 +17,10 @@ pub async fn run(release_type: Type, args: Vec<String>, verbose: bool) -> Res<()
   }
 
   let pascal_pkg = match release_type {
-    Type::STABLE => "Discord",
-    Type::PTB => "DiscordPTB",
-    Type::CANARY => "DiscordCanary",
-    Type::DEVELOPMENT => "DiscordDevelopment",
+    DiscordBranch::STABLE => "Discord",
+    DiscordBranch::PTB => "DiscordPTB",
+    DiscordBranch::CANARY => "DiscordCanary",
+    DiscordBranch::DEVELOPMENT => "DiscordDevelopment",
   };
 
   let exists = Path::new(&format!("/home/{}/.dvm/{}", user, pascal_pkg)).exists();
@@ -32,7 +32,8 @@ pub async fn run(release_type: Type, args: Vec<String>, verbose: bool) -> Res<()
   Command::new(format!("/home/{}/.dvm/{}/{}", user, pascal_pkg, pascal_pkg))
     .args(&args)
     .spawn()?
-    .wait_with_output().await?;
+    .wait_with_output()
+    .await?;
 
   Ok(())
 }

src/cli/remove.rs

@@ -7,7 +7,7 @@ use std::{
 
 use colored::*;
 
-use crate::{r#type::Type, Res};
+use crate::{branch::DiscordBranch, Res};
 
 // fn dirent(dirent: DirEntry) -> Res<(String, Type)> {
 //   let rl_type = match dirent.file_name().to_str().unwrap() {
@@ -22,21 +22,21 @@ use crate::{r#type::Type, Res};
 //   Ok((version, rl_type))
 // }
 
-fn dirent_verbose(dirent: DirEntry) -> Res<(String, Type, PathBuf)> {
+fn dirent_verbose(dirent: DirEntry) -> Res<(String, DiscordBranch, PathBuf)> {
   let rl_type = match dirent.file_name().to_str().unwrap() {
-    "Discord" => Type::STABLE,
-    "DiscordCanary" => Type::CANARY,
-    "DiscordPTB" => Type::PTB,
-    "DiscordDevelopment" => Type::DEVELOPMENT,
-    _ => Type::STABLE,
+    "Discord" => DiscordBranch::STABLE,
+    "DiscordCanary" => DiscordBranch::CANARY,
+    "DiscordPTB" => DiscordBranch::PTB,
+    "DiscordDevelopment" => DiscordBranch::DEVELOPMENT,
+    _ => DiscordBranch::STABLE,
   };
   let path = dirent.path();
   let version = fs::read_to_string(path.join("version"))?.replace("\n", "");
 
   Ok((version, rl_type, path))
 }
 
-async fn needs_update(version: String, release_type: Type) -> Res<(bool, String)> {
+async fn needs_update(version: String, release_type: DiscordBranch) -> Res<(bool, String)> {
   let res = reqwest::get(format!(
     "https://discordapp.com/api/v8/updates/{}?platform=linux",
     release_type