Merge pull request #7 from Zalexanninev15/version-1.5

Author: Zalexanninev15

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "gru"
-version = "1.4.0"
+version = "1.5.0"
 edition = "2021"
 authors = ["Zalexanninev15 <blue.shark@disroot.org>"]
 license = "MIT License"
@@ -16,19 +16,17 @@ winapi = { version = "0.3.9", features = [
   "handleapi",
   "processthreadsapi",
   "winnt",
-  "securitybaseapi",
-  "impl-default",
+  "securitybaseapi"
 ] }
-arguments = "0.6.2"
-#pelite = "0.9.1"
-isahc = "1.0.0"
-serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
-trauma = "2.0.0"
-console = "0.15.1"
-tokio = "1.0.0"
+arguments = "0.7.1"
+isahc = "1.7.2"
+serde_json = { version = "1.0.95", default-features = false, features = ["alloc"] }
+trauma = "2.2.1"
+console = "0.15.5"
+tokio = "1.27.0"
 
 [profile.release]
-strip = true      # Comment this if cargo-bloat: cargo bloat --release --crates
+strip = true
 opt-level = "z"
 lto = true
-codegen-units = 1
+codegen-units = 1

Cargo.toml

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Zalexanninev15
+Copyright (c) 2022-2023 Zalexanninev15
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -22,7 +22,7 @@ Updater for applications from GitHub
 
 ## System requirements
 
-- **OS:** Windows 7 or higher
+- **OS:** Windows 10 (x64) or higher (may work on Windows 7/8/8.1, but the correct display of characters in the console is not guaranteed). The latest version for Windows 7/8/8.1 (x32 and x64) is [version 1.4-1 (1.4.0.1)](https://github.com/Zalexanninev15/GRU/releases/tag/1.4.0.1)
 
 ## Usage
 

README.md

@@ -1,9 +1,10 @@
-use std::{fs, path::PathBuf};
+use std::{fs, path::{PathBuf, Path}};
+use console::style;
 use tokio;
 use trauma::{
     download::Download,
-    downloader::{DownloaderBuilder, StyleOptions},
-    Error,
+    downloader::{DownloaderBuilder, StyleOptions, ProgressBarOpts},
+    Error
 };
 
 // Download the asset
@@ -19,16 +20,36 @@ pub async fn download(
         "https://github.com/{}/releases/download/{}/{}",
         repo, ver_tag, file
     ));
+    let d_file = String::from(format!("{}\\{}", application_path, file));
+    if Path::new(&d_file).exists() {
+        fs::remove_file(&d_file).expect("\n");
+    }
     let downloads = vec![Download::try_from(asset).unwrap()];
-    let style_opts = StyleOptions::default();
+    let style_opts = StyleOptions::new(
+        ProgressBarOpts::new(
+            Some(ProgressBarOpts::TEMPLATE_BAR_WITH_POSITION.into()),
+            Some(ProgressBarOpts::CHARS_FINE.into()),
+            true,
+            false,
+        ),
+        ProgressBarOpts::new(
+            Some(format!(
+                "{{bar:40.cyan}} {{bytes_per_sec:>13.green}} {{percent:>2.cyan}}{} {{bytes:>11.green}}/{{total_bytes:<11.green}}",
+                style("%").cyan(),
+            )),
+            Some("████ ".into()),
+            true,
+            false,
+        )
+    );
     let downloader = DownloaderBuilder::new()
         .directory(PathBuf::from(application_path))
         .style_options(style_opts)
         .build();
     downloader.download(&downloads).await;
     fs::rename(
-        String::from(format!("{}\\{}", application_path, file)),
+        &d_file,
         String::from(format!("{}\\app.dat", application_path)),
     )?;
     Ok(())
-}
+}

src/downloader.rs

@@ -1,13 +1,11 @@
 use std::fs::File;
 use std::io::Read;
 use std::path::Path;
-// use pelite::FileMap;
 
 // Checker for the versions
 pub fn is_new_version(new_version: &str, application_path: &str) -> i32 {
-    let mut real_version = "0.0.0.0".to_string();
     if Path::new("app.version").exists() && Path::new(&application_path).exists() {
-        real_version = get_version_from_file();
+        let real_version = get_version_from_file();
         println!("\nCurrent version of app: {}", real_version);
         if new_version == real_version {
             return 0;
@@ -18,34 +16,6 @@ pub fn is_new_version(new_version: &str, application_path: &str) -> i32 {
         println!("\nCurrent version of app: <not detected>");
         return 1;
     }
-    // let mut current_version = parse_pe_version(application_path);
-    // println!("\nCurrent version of app: {}", current_version);
-    // current_version = current_version
-    //     .to_lowercase()
-    //     .replace(",", ".")
-    //     .replace(" ", "")
-    //     .replace(".", "")
-    //     .replace("build", "")
-    //     .replace("v", "")
-    //     .replace("-", "");
-    // let new_version_c = &new_version
-    //     .to_lowercase()
-    //     .replace(".", "")
-    //     .replace("v", "")
-    //     .replace("build", "")
-    //     .replace("ersion", "")
-    //     .replace(" ", "")
-    //     .replace("_", "")
-    //     .replace("-", "");
-    // if current_version.contains(new_version_c) {
-    //     0
-    // } else {
-    //     if current_version == "" {
-    //         -1
-    //     } else {
-    //         1
-    //     }
-    // }
 }
 
 // Get version from file as GitHub release tag
@@ -57,34 +27,4 @@ fn get_version_from_file() -> String {
         .read_to_string(&mut file_data)
         .expect("Error reading file with version information!");
     file_data
-}
-
-// Function for getting the file version from PE file
-// fn parse_pe_version(file_path: &str) -> String {
-//     match FileMap::open(file_path) {
-//         Err(_) => "".to_string(),
-//         Ok(file_map) => {
-//             let result = match pelite::PeFile::from_bytes(&file_map) {
-//                 Err(e) => Err(e),
-//                 Ok(f) => f.resources(),
-//             };
-//             match result {
-//                 Err(_) => "".to_string(),
-//                 Ok(resources) => match resources.version_info() {
-//                     Err(_) => "".to_string(),
-//                     Ok(version_info) => match version_info.fixed() {
-//                         None => "".to_string(),
-//                         Some(fixed_info) => {
-//                             let version = fixed_info.dwFileVersion.to_string();
-//                             if version.len() > 0 {
-//                                 version
-//                             } else {
-//                                 fixed_info.dwProductVersion.to_string()
-//                             }
-//                         }
-//                     },
-//                 },
-//             }
-//         }
-//     }
-// }
+}

src/get_version.rs

@@ -12,7 +12,6 @@ fn main() {
     let current_dir = main_func::current_dir();
     let mut first_launch = false;
     let mut create_only_version_file = false;
-    let mut version_status_code = 1;
     const VERSION: &str = env!("CARGO_PKG_VERSION");
     let mut update_now = true;
     if arguments.len() >= 3 {
@@ -89,7 +88,7 @@ fn main() {
                 update_now = false;
                 println!("\nNo updates detected!");
             } else {
-                version_status_code = get_version::is_new_version(&v_list_version, &app_path);
+                let version_status_code = get_version::is_new_version(&v_list_version, &app_path);
                 if version_status_code != 0 && create_only_version_file == false {
                     println!("\nNew version ({}) is available!", v_list_version);
                     if version_status_code == -1 {
@@ -106,16 +105,13 @@ fn main() {
                 // Deleting unnecessary data
                 main_func::task_kill(&launcher_exe);
                 main_func::delete_file(&current_dir, &is_leave_folders);
-
-                // Old downloader by redl
-                // main_func::downloading_by_redl(&repo, &part);
-
-                // New native downloader
+                
+                // Downloading the file
                 println!("Downloading...");
                 let result =
                     downloader::download(&repo, &v_list_version, &v_list_asset, &current_dir);
                 if result.is_err() {
-                    println!("Failed to download!");
+                        println!("Failed to download!");
                 }
 
                 // The updating process itself

src/main.rs

@@ -42,9 +42,6 @@ pub fn run_post_script(current_dir: &str) {
     for out in String::from_utf8(script.stdout).iter() {
         println!("{}", out);
     }
-
-    // script.arg(format!("/C {}", &script_file));
-    // script.execute_output().unwrap();
 }
 
 // Kill application processes
@@ -53,60 +50,8 @@ pub fn task_kill(application_exe: &str) {
     let mut command = Command::new(TASKKILL_TOOL);
     command.arg("/F").arg("/T").arg("/IM").arg(application_exe);
     command.execute().unwrap();
-
-    // let output = command.execute_output().unwrap();
-    // if let Some(exit_code) = output.status.code() {
-    //     if exit_code == 0 {
-    //         println!("The application processes are killed. (this is good)");
-    //     } else {
-    //         eprintln!("The process was not found. (this is good)");
-    //     }
-    // } else {
-    //     eprintln!("Interrupted!");
-    //     press_btn_continue::wait("Press any key to exit...").unwrap();
-    //     process::exit(1);
-    // }
 }
 
-// Downloading github release by redl
-// pub fn downloading_by_redl(github_repo_path: &str, part: &str) {
-//     const EGET_PATH: &str = "redl.exe";
-//     let mut command = Command::new(EGET_PATH);
-//     // let download_path = String::from(format!("{}app.dat", current_dir));
-//     if part.contains(" ") {
-//         command
-//             .arg("-r")
-//             .arg(github_repo_path)
-//             .arg("-p")
-//             .args(part.split(" "))
-//             .arg("-o")
-//             .arg("app.dat");
-//     } else {
-//         command
-//             .arg("-r")
-//             .arg(github_repo_path)
-//             .arg("-p")
-//             .arg(part)
-//             .arg("-o")
-//             .arg("app.dat");
-//     }
-
-//     let output = command.execute_output().unwrap();
-//     if let Some(exit_code) = output.status.code() {
-//         if exit_code == 0 {
-//             println!("Downloaded.");
-//         } else {
-//             eprintln!("Failed.");
-//             press_btn_continue::wait("Press any key to exit...").unwrap();
-//             process::exit(1);
-//         }
-//     } else {
-//         eprintln!("Interrupted!");
-//         press_btn_continue::wait("Press any key to exit...").unwrap();
-//         process::exit(1);
-//     }
-// }
-
 // Update by rename file
 pub fn updating(current_dir: &str, launcher_exe: &str) -> std::io::Result<()> {
     fs::rename(