feat(add i686 support, add 'disable' command): add i686 support, add 'disable' command

Author: bic-potato

src/java_remote.rs

@@ -43,8 +43,8 @@ pub async fn get_remote(version: &str) {
             if !version_list.contains(&version_name) {
                 // println!("{}", file_name);
                 let download_url = format!(
-                    "https://mirrors.tuna.tsinghua.edu.cn/AdoptOpenJDK/{}/jdk/x64/windows/{}",
-                    version, file_name
+                    "https://mirrors.tuna.tsinghua.edu.cn/AdoptOpenJDK/{}/jdk/{}/windows/{}",
+                    version, arch, file_name
                 );
 
                 // println!("{}", download_url);

src/java_ver.rs

@@ -82,7 +82,10 @@ pub fn version_record(file: &Path, java_config: Java) {
 }
 
 pub fn enable_version(version: &str) {
-    let contents = std::fs::read_to_string("./versions.toml").expect("Unable to load");
+    let mut current_location = std::env::current_exe().unwrap();
+    current_location.pop();
+    current_location.push("versions.toml");
+    let contents = std::fs::read_to_string(&current_location).expect("Unable to load Version Files");
     let store: Store = toml::from_str(&contents).unwrap();
     if let Some(list) = store.Java_Version {
         for element in list {

src/main.rs

@@ -1,7 +1,9 @@
 use clap;
+use tokio;
 pub mod java_remote;
 pub mod java_ver;
 mod utils;
+use console::Style;
 use dotenv::dotenv;
 
 #[tokio::main]
@@ -10,27 +12,32 @@ async fn main() {
     let matches = clap::App::new("java-version")
         .about("Manage Java Developer Kit Versions")
         .author("ZuoXichen")
-        .version("0.1.1")
+        .version("0.1.2")
         .subcommand(
             clap::App::new("list")
                 .about("List local available JDKs")
                 .short_flag('l')
                 .subcommand(
                     clap::App::new("remote").about("List available JDKs from remote server"),
                 )
-                .subcommand(clap::App::new("local").about("List local jdk versions"))
+                .subcommand(clap::App::new("local").about("List local jdk versions")),
         )
         .subcommand(
             clap::App::new("enable")
                 .about("enable one jdk version globally")
                 .arg(clap::Arg::new("version").takes_value(true)),
         )
+        .subcommand(
+            clap::App::new("disable")
+                .about("disable jdk version globally")
+                .arg(clap::Arg::new("version").takes_value(true)),
+        )
         .subcommand(
             clap::App::new("get").subcommand(
                 clap::App::new("remote").arg(
                     clap::Arg::new("version")
                         .takes_value(true)
-                        .value_name("Version")
+                        .value_name("Version"),
                 ),
             ),
         )
@@ -43,26 +50,36 @@ async fn main() {
         } else if let Some(_) = f.subcommand_matches("local") {
             let version_list = java_ver::read_version();
             println!("All available JDKs:");
-            for element in version_list
-            {
+            for element in version_list {
                 println!("{}", element);
             }
         }
-    }else if let Some(g) = matches.subcommand_matches("get"){
+    } else if let Some(g) = matches.subcommand_matches("get") {
         if let Some(r) = g.subcommand_matches("remote") {
-            if let Some(v) = r.value_of("version")
-            {
+            if let Some(v) = r.value_of("version") {
                 let version = String::from(v);
-                let _:i32 = version.trim().parse().expect("Please enter a number");
+                let _: i32 = version.trim().parse().expect("Please enter a number");
                 java_remote::get_remote(v).await;
             }
-            
         }
-    } else if let Some(e) = matches.subcommand_matches("enable"){
-        if let Some(version) = matches.value_of("version")
-        {
+    } else if let Some(e) = matches.subcommand_matches("enable") {
+        if let Some(version) = matches.value_of("version") {
             java_ver::enable_version(version);
         }
-        
+    } else if let Some(_) = matches.subcommand_matches("disable") {
+        let mut current_location = std::env::current_exe().unwrap();
+        current_location.pop();
+        current_location.push("OpenJDK/");
+        let result = std::fs::remove_dir_all(&current_location);
+        match result {
+            Ok(_) => {
+                let green = Style::new().green();
+                println!("{}", green.apply_to("Disable JDK SUCCESS"))
+            }
+            Err(e) => {
+                let red = Style::new().red();
+                println!("{} {}", red.apply_to("Disable JDK FAILED"), e.to_string());
+            }
+        }
     }
 }