Skip to content

Commit

Permalink
GUI Hotfix 0.13.1 (#476)
Browse files Browse the repository at this point in the history
  • Loading branch information
Bwc9876 authored Mar 20, 2024
2 parents 8db3efc + 9ef3327 commit 29c4b21
Show file tree
Hide file tree
Showing 9 changed files with 219 additions and 205 deletions.
59 changes: 37 additions & 22 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nix/owmods-gui.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
}:
rustPlatform.buildRustPackage rec {
pname = "owmods-gui";
version = "0.13.0";
version = "0.13.1";

VITE_VERSION_SUFFIX = "-nix";

Expand Down
6 changes: 3 additions & 3 deletions owmods_cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ depends = "libssl1.1"

[dependencies]
owmods_core = { version = "0.13.0", path = "../owmods_core" }
clap = { version = "4.5.2", features = ["derive"] }
clap = { version = "4.5.3", features = ["derive"] }
colored = "2.1.0"
anyhow = "1.0.80"
anyhow = "1.0.81"
indicatif = { version = "0.17.8", features = ["improved_unicode"] }
tokio = { version = "1.36.0", features = ["macros", "rt-multi-thread"] }
log = { version = "0.4.21", features = ["std"] }
clap_complete = "4.5.1"
serde_json = "1.0.114"

[build-dependencies]
clap = { version = "4.5.2", features = ["derive"] }
clap = { version = "4.5.3", features = ["derive"] }
clap_complete = "4.5.1"
clap_mangen = "0.2.20"

Expand Down
10 changes: 5 additions & 5 deletions owmods_core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
opener = "0.6.1"
directories = "5.0.1"
reqwest = { version = "0.11.24", default-features = false, features = [
reqwest = { version = "0.11.27", default-features = false, features = [
"blocking",
"json",
"rustls-tls",
] }
glob = "0.3.1"
version-compare = "0.1.1"
anyhow = "1.0.80"
version-compare = "0.2.0"
anyhow = "1.0.81"
zip = { version = "0.6.6", default-features = false, features = [
"deflate",
"zstd",
Expand All @@ -31,12 +31,12 @@ futures = "0.3.30"
log = "0.4.21"
tokio = { version = "1.36.0", features = ["net", "time", "process", "macros"] }
serde_repr = "0.1.18"
uuid = { version = "1.7.0", features = ["v4", "fast-rng"] }
uuid = { version = "1.8.0", features = ["v4", "fast-rng"] }
typeshare = "1.0.2"
lazy_static = "1.4.0"
tempfile = "3.10.1"
unicode-normalization = "0.1.23"
regex = "1.10.3"

[dev-dependencies]
tokio-test = "0.4.3"
tokio-test = "0.4.4"
6 changes: 3 additions & 3 deletions owmods_gui/backend/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "owmods_gui"
version = "0.13.0"
version = "0.13.1"
license = "GPL-3.0-or-later"
edition = "2021"

Expand All @@ -25,7 +25,7 @@ tauri = { version = "1.6.1", features = [ "clipboard-write-text",
"window-set-title",
# "reqwest-native-tls-vendored"
] }
anyhow = "1.0.80"
anyhow = "1.0.81"
tokio = { version = "1.36.0", features = ["sync", "macros"] }
log = { version = "0.4.21", features = ["std", "serde"] }
typeshare = "1.0.2"
Expand All @@ -36,7 +36,7 @@ regex = "1.10.3"
time = { version = "0.3.34", features = ["macros", "local-offset"] }
tauri-plugin-deep-link = "0.1.2"
opener = "0.6.1"
tauri-plugin-window-state = "0.1.0"
tauri-plugin-window-state = "0.1.1"

[features]
default = ["custom-protocol"]
Expand Down
21 changes: 10 additions & 11 deletions owmods_gui/backend/src/commands.rs
Original file line number Diff line number Diff line change
Expand Up @@ -604,19 +604,18 @@ pub async fn update_mod(
let remote_db = state.remote_db.read().await.clone();
let remote_db = remote_db.try_get()?;

let remote_mod = remote_db
.get_mod(unique_name)
.ok_or_else(|| anyhow!("Can't find mod {} in remote", unique_name))?;
let remote_mod = if unique_name == OWML_UNIQUE_NAME {
remote_db
.get_owml()
.ok_or_else(|| anyhow!("Can't find OWML"))?
} else {
remote_db
.get_mod(unique_name)
.ok_or_else(|| anyhow!("Can't find mod {} in remote", unique_name))?
};

let res = if unique_name == OWML_UNIQUE_NAME {
download_and_install_owml(
&config,
remote_db
.get_owml()
.ok_or_else(|| anyhow!("OWML Not Found!"))?,
false,
)
.await
download_and_install_owml(&config, remote_mod, false).await
} else {
install_mod_from_db(
&unique_name.to_string(),
Expand Down
24 changes: 12 additions & 12 deletions owmods_gui/frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "owmods-gui-frontend",
"private": true,
"version": "0.13.0",
"version": "0.13.1",
"type": "module",
"scripts": {
"dev": "vite",
Expand All @@ -21,28 +21,28 @@
"@emotion/react": "11.11.4",
"@emotion/styled": "11.11.0",
"@fontsource/roboto": "5.0.12",
"@mui/icons-material": "5.15.12",
"@mui/lab": "5.0.0-alpha.167",
"@mui/material": "5.15.12",
"@mui/icons-material": "5.15.14",
"@mui/lab": "5.0.0-alpha.169",
"@mui/material": "5.15.14",
"@tauri-apps/api": "1.5.3",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-error-boundary": "4.0.13",
"react-virtuoso": "4.7.2"
"react-virtuoso": "4.7.3"
},
"devDependencies": {
"@testing-library/react": "14.2.1",
"@types/react": "18.2.64",
"@types/react-dom": "18.2.21",
"@typescript-eslint/eslint-plugin": "7.1.1",
"@typescript-eslint/parser": "7.1.1",
"@testing-library/react": "14.2.2",
"@types/react": "18.2.67",
"@types/react-dom": "18.2.22",
"@typescript-eslint/eslint-plugin": "7.3.1",
"@typescript-eslint/parser": "7.3.1",
"@vitejs/plugin-react": "4.2.1",
"eslint": "8.57.0",
"eslint-plugin-react": "7.34.0",
"eslint-plugin-react": "7.34.1",
"eslint-plugin-react-hooks": "4.6.0",
"prettier": "3.2.5",
"typescript": "5.4.2",
"vite": "5.1.5",
"vite": "5.1.6",
"vite-imagetools": "6.2.9"
}
}
Loading

0 comments on commit 29c4b21

Please sign in to comment.