progress bar 'fix'

This commit is contained in:
SpikeHD
2022-07-26 20:49:20 -07:00
parent 7e5f3be4fa
commit 0971f5b826
5 changed files with 6 additions and 27 deletions

View File

@@ -1,6 +1,6 @@
{ {
"name": "cultivation", "name": "cultivation",
"version": "1.0.4", "version": "1.0.5",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@tauri-apps/api": "^1.0.0-rc.5", "@tauri-apps/api": "^1.0.0-rc.5",

View File

@@ -18,8 +18,6 @@ pub fn run_program_relative(path: String, args: Option<String>) {
// Set new working directory // Set new working directory
std::env::set_current_dir(&path_buf).unwrap(); std::env::set_current_dir(&path_buf).unwrap();
println!("Opening {} {}", &path, args.clone().unwrap_or("".into()));
// Without unwrap_or, this can crash when UAC prompt is denied // Without unwrap_or, this can crash when UAC prompt is denied
open::that(format!("{} {}", &path, args.unwrap_or("".into()))).unwrap_or(()); open::that(format!("{} {}", &path, args.unwrap_or("".into()))).unwrap_or(());
@@ -27,25 +25,6 @@ pub fn run_program_relative(path: String, args: Option<String>) {
std::env::set_current_dir(&cwd).unwrap(); std::env::set_current_dir(&cwd).unwrap();
} }
#[tauri::command]
pub fn run_program_relative(path: String) {
// Save the current working directory
let cwd = std::env::current_dir().unwrap();
// Set the new working directory to the path before the executable
let mut path_buf = std::path::PathBuf::from(&path);
path_buf.pop();
// Open in new thread to prevent blocking.
std::thread::spawn(move || {
// Without unwrap_or, this can crash when UAC prompt is denied
open::that(&path).unwrap_or(());
});
// Restore the original working directory
std::env::set_current_dir(&cwd).unwrap();
}
#[tauri::command] #[tauri::command]
pub fn run_command(program: &str, args: Vec<&str>) { pub fn run_command(program: &str, args: Vec<&str>) {
let prog = program.to_string(); let prog = program.to_string();

View File

@@ -1,7 +1,7 @@
use std::fs::{read_dir, File}; use std::fs::{read_dir, File};
use std::path; use std::path;
use std::thread; use std::thread;
use unrar::archive::{Archive, OpenArchive}; use unrar::archive::Archive;
#[tauri::command] #[tauri::command]
pub fn unzip( pub fn unzip(
@@ -132,9 +132,9 @@ pub fn unzip(
fn extract_rar( fn extract_rar(
window: &tauri::Window, window: &tauri::Window,
rarfile: &String, rarfile: &String,
f: &File, _f: &File,
full_path: &path::PathBuf, full_path: &path::PathBuf,
top_level: bool, _top_level: bool,
) { ) {
let archive = Archive::new(rarfile.clone()); let archive = Archive::new(rarfile.clone());

View File

@@ -7,7 +7,7 @@
}, },
"package": { "package": {
"productName": "Cultivation", "productName": "Cultivation",
"version": "1.0.4" "version": "1.0.5"
}, },
"tauri": { "tauri": {
"allowlist": { "allowlist": {

View File

@@ -57,7 +57,7 @@ export default class ProgressBar extends React.Component<IProps, IState> {
style={{ style={{
width: `${(() => { width: `${(() => {
// Handles no files downloading // Handles no files downloading
if (this.state.files === 0) { if (this.state.files === 0 || this.state.average >= 100) {
return '100' return '100'
} }