From d10c0c7dc8e4ed1b227aa061ae1b1c649d8ada38 Mon Sep 17 00:00:00 2001 From: Jesus Bracho Date: Thu, 3 Oct 2024 15:30:17 -0400 Subject: [PATCH 1/5] build(ci): add extra checks to test workflow --- .github/workflows/tests.yaml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 9edb0b7..f332cb8 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -81,6 +81,18 @@ jobs: - name: Yarn install FE dependencies run: yarn --prefer-offline --frozen-lockfile --network-timeout 1000000 install + - name: Cargo Check + run: cargo check + working-directory: src-tauri + + - name: Cargo Fmt + run: cargo fmt -- --check + working-directory: src-tauri + + - name: Cargo Clippy + run: cargo clippy -- -D warnings + working-directory: src-tauri + - name: Build tauri App uses: tauri-apps/tauri-action@v0 env: @@ -89,9 +101,8 @@ jobs: TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} - name: Run Rust tests - run: | - cd src-tauri - cargo test --package coh3-stats-desktop-app --lib + run: cargo test --package coh3-stats-desktop-app --lib + working-directory: src-tauri - name: Install tauri-driver run: | From b91cced45d9fd5293670dc1d3278f3b71acc0297 Mon Sep 17 00:00:00 2001 From: Jesus Bracho Date: Wed, 23 Oct 2024 20:27:28 -0400 Subject: [PATCH 2/5] fix: run rust checks after frontend is built --- .github/workflows/tests.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index f332cb8..24ebd14 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -81,6 +81,13 @@ jobs: - name: Yarn install FE dependencies run: yarn --prefer-offline --frozen-lockfile --network-timeout 1000000 install + - name: Build tauri App + uses: tauri-apps/tauri-action@v0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} + TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} + - name: Cargo Check run: cargo check working-directory: src-tauri @@ -93,13 +100,6 @@ jobs: run: cargo clippy -- -D warnings working-directory: src-tauri - - name: Build tauri App - uses: tauri-apps/tauri-action@v0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} - TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} - - name: Run Rust tests run: cargo test --package coh3-stats-desktop-app --lib working-directory: src-tauri From b93ba68c5f04948dc94a5922999df7b52047f93c Mon Sep 17 00:00:00 2001 From: Jesus Bracho Date: Wed, 23 Oct 2024 20:49:46 -0400 Subject: [PATCH 3/5] build(ci): remove updater for prs --- .github/workflows/tests.yaml | 4 ---- src-tauri/tauri.conf.json | 6 ------ 2 files changed, 10 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 24ebd14..b4a65ae 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -83,10 +83,6 @@ jobs: - name: Build tauri App uses: tauri-apps/tauri-action@v0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} - TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} - name: Cargo Check run: cargo check diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 35063b4..826d06e 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -77,12 +77,6 @@ "security": { "csp": null }, - "updater": { - "active": true, - "endpoints": ["https://coh3stats.com/api/appUpdateRoute"], - "dialog": true, - "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IERFNjMzQTcwRjBEQjUwNTUKUldSVlVOdndjRHBqM21pc1BGYndieG03VVZOSGhxdUxPeDNkRkFqaXVpcEMyL2l1WUN6VDNCK1kK" - }, "windows": [ { "label": "main", From 1605fc3713148bc349b8fad013642e944c8caa4a Mon Sep 17 00:00:00 2001 From: Jesus Bracho Date: Wed, 23 Oct 2024 21:02:28 -0400 Subject: [PATCH 4/5] style: appease cargo fmt --- src-tauri/src/config.rs | 6 +++--- src-tauri/src/dp_utils.rs | 11 +++++++---- src-tauri/src/lib.rs | 6 +++--- src-tauri/src/main.rs | 1 - src-tauri/src/parse_log_file.rs | 10 ++++++---- src-tauri/src/parse_log_file/tests.rs | 12 +++++------- 6 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src-tauri/src/config.rs b/src-tauri/src/config.rs index 827f764..3cd06d9 100644 --- a/src-tauri/src/config.rs +++ b/src-tauri/src/config.rs @@ -1,6 +1,6 @@ // Streamer overlay local PORT -pub const OVERLAY_PORT:&str = "47824"; +pub const OVERLAY_PORT: &str = "47824"; // COHDB Auth -pub const COHDB_CLIENT_ID:&str = "kHERjpU_rXcvgvLgwPir0w3bqcgETLOH-p95-PVxN-M"; -pub const COHDB_REDIRECT_URI:&str = "coh3stats://cohdb.com/oauth/authorize"; \ No newline at end of file +pub const COHDB_CLIENT_ID: &str = "kHERjpU_rXcvgvLgwPir0w3bqcgETLOH-p95-PVxN-M"; +pub const COHDB_REDIRECT_URI: &str = "coh3stats://cohdb.com/oauth/authorize"; diff --git a/src-tauri/src/dp_utils.rs b/src-tauri/src/dp_utils.rs index 52405ae..88bc6c2 100644 --- a/src-tauri/src/dp_utils.rs +++ b/src-tauri/src/dp_utils.rs @@ -1,10 +1,13 @@ use serde::de::DeserializeOwned; // COH3 Desktop App Utils -use tauri_plugin_store::{StoreCollection, with_store}; -use log::{error}; +use log::error; use tauri::{AppHandle, Manager, Runtime}; +use tauri_plugin_store::{with_store, StoreCollection}; -pub fn load_from_store(handle: AppHandle, key: &str) -> Option { +pub fn load_from_store( + handle: AppHandle, + key: &str, +) -> Option { let stores = handle.state::>(); let path = handle .path_resolver() @@ -28,4 +31,4 @@ pub fn load_from_store(handle: AppHandle, ke None } } -} \ No newline at end of file +} diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 8078b11..8bd8dd5 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -1,5 +1,5 @@ +pub mod config; +pub mod dp_utils; +pub mod overlay_server; pub mod parse_log_file; pub mod plugins; -pub mod overlay_server; -pub mod dp_utils; -pub mod config; \ No newline at end of file diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 05cd7ae..c1ad129 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -89,7 +89,6 @@ fn setup(app: &mut tauri::App) -> Result<(), Box> { let _handle = thread::spawn(|| { run_http_server(file_path); }); - } else { info!("Streamer overlay server is disabled"); } diff --git a/src-tauri/src/parse_log_file.rs b/src-tauri/src/parse_log_file.rs index d6fccf7..7910b86 100644 --- a/src-tauri/src/parse_log_file.rs +++ b/src-tauri/src/parse_log_file.rs @@ -250,7 +250,9 @@ pub fn parse_log_file_reverse(path: String) -> LogFileData { info!( "Log file parsed: Found {} players. Left team {:?}, right team {:?}.", - left_team.players.len() + right_team.players.len(), left_team.side, right_team.side + left_team.players.len() + right_team.players.len(), + left_team.side, + right_team.side ); LogFileData { @@ -316,9 +318,9 @@ fn get_team_data(players: Vec) -> TeamData { for player in &players { if player.faction == "germans" || player.faction == "afrika_korps" { - is_axis = true; + is_axis = true; } else if player.faction == "americans" || player.faction == "british_africa" { - is_allies = true; + is_allies = true; } } @@ -327,7 +329,7 @@ fn get_team_data(players: Vec) -> TeamData { } else if is_axis { team_side = TeamSide::Axis; } else if is_allies { - team_side = TeamSide::Allies; + team_side = TeamSide::Allies; } TeamData { diff --git a/src-tauri/src/parse_log_file/tests.rs b/src-tauri/src/parse_log_file/tests.rs index f8fc0e9..dc5a033 100644 --- a/src-tauri/src/parse_log_file/tests.rs +++ b/src-tauri/src/parse_log_file/tests.rs @@ -1,13 +1,12 @@ use crate::parse_log_file::{parse_log_file_reverse, GameState, TeamSide}; - // TODO: Add more assertions and tests for parsing the log files #[test] fn test_parse_log_file_reverse_file_1() { // println!("{}", file!()); let result = parse_log_file_reverse("./test_assets/warnings-1.log".to_string()); - assert_eq!(result.game_state, GameState::Closed); + assert_eq!(result.game_state, GameState::Closed); // can't compare for some reason // assert_eq!(result.game_type, GameType::Custom); @@ -30,7 +29,7 @@ fn test_parse_log_file_reverse_file_1() { fn test_parse_log_file_reverse_file_2() { println!("{}", file!()); let result = parse_log_file_reverse("./test_assets/warnings-2.log".to_string()); - assert_eq!(result.game_state, GameState::Closed); + assert_eq!(result.game_state, GameState::Closed); assert_eq!(result.map, "rural_town_2p_mkii"); @@ -38,7 +37,7 @@ fn test_parse_log_file_reverse_file_2() { assert_eq!(result.right.side, TeamSide::Allies); assert_eq!(result.player_name, "UMirinBrah?"); - assert_eq!(result.language_code, "fr"); + assert_eq!(result.language_code, "fr"); // print!("{:#?}", result); } @@ -47,7 +46,7 @@ fn test_parse_log_file_reverse_file_2() { fn test_parse_log_file_reverse_file_3() { println!("{}", file!()); let result = parse_log_file_reverse("./test_assets/warnings-3.log".to_string()); - assert_eq!(result.game_state, GameState::Closed); + assert_eq!(result.game_state, GameState::Closed); assert_eq!(result.map, "desert_village_2p_mkiii"); @@ -64,10 +63,9 @@ fn test_parse_log_file_reverse_file_3() { fn test_team_composition() { println!("{}", file!()); let result = parse_log_file_reverse("./test_assets/warnings-4v4-allfactions.log".to_string()); - assert_eq!(result.game_state, GameState::Closed); + assert_eq!(result.game_state, GameState::Closed); assert_eq!(result.map, "winter_line_8p_mkii"); - assert_eq!(result.left.side, TeamSide::Allies); assert_eq!(result.right.side, TeamSide::Axis); From d0c6f12f646be590e5ff74fc8bbbb7f9322e89b8 Mon Sep 17 00:00:00 2001 From: Jesus Bracho Date: Wed, 23 Oct 2024 21:31:42 -0400 Subject: [PATCH 5/5] fix(deps): depend on v1 instead of dev --- src-tauri/Cargo.lock | 311 ++++++++++++++++++++++++++++++++++--------- src-tauri/Cargo.toml | 8 +- 2 files changed, 253 insertions(+), 66 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 51211aa..493ab9c 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -28,6 +28,17 @@ dependencies = [ "cpufeatures", ] +[[package]] +name = "ahash" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +dependencies = [ + "getrandom 0.2.15", + "once_cell", + "version_check", +] + [[package]] name = "aho-corasick" version = "1.1.3" @@ -104,6 +115,12 @@ dependencies = [ "x11rb", ] +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + [[package]] name = "ascii" version = "1.1.0" @@ -369,6 +386,18 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + [[package]] name = "block" version = "0.1.6" @@ -415,6 +444,30 @@ dependencies = [ "piper", ] +[[package]] +name = "borsh" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" +dependencies = [ + "borsh-derive", + "cfg_aliases 0.2.1", +] + +[[package]] +name = "borsh-derive" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" +dependencies = [ + "once_cell", + "proc-macro-crate 3.2.0", + "proc-macro2", + "quote", + "syn 2.0.72", + "syn_derive", +] + [[package]] name = "brotli" version = "3.5.0" @@ -454,14 +507,37 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byte-unit" -version = "4.0.19" +version = "5.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da78b32057b8fdfc352504708feeba7216dcd65a2c9ab02978cbd288d1279b6c" +checksum = "33ac19bdf0b2665407c39d82dbc937e951e7e2001609f0fb32edd0af45a2d63e" dependencies = [ + "rust_decimal", "serde", "utf8-width", ] +[[package]] +name = "bytecheck" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" +dependencies = [ + "bytecheck_derive", + "ptr_meta", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "bytecount" version = "0.6.8" @@ -598,6 +674,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chrono" version = "0.4.38" @@ -745,7 +827,7 @@ dependencies = [ "log", "machine-uid", "nom", - "notify 6.1.1", + "notify", "oauth2", "regex", "reqwest 0.12.7", @@ -1443,6 +1525,12 @@ dependencies = [ "libc", ] +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + [[package]] name = "futf" version = "0.1.5" @@ -1770,7 +1858,7 @@ checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" dependencies = [ "anyhow", "heck 0.4.1", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2", "quote", @@ -1865,7 +1953,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d" dependencies = [ "anyhow", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2", "quote", @@ -1925,6 +2013,9 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] [[package]] name = "hashbrown" @@ -2749,9 +2840,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "minisign-verify" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" +checksum = "a05b5d0594e0cb1ad8cee3373018d2b84e25905dc75b2468114cc9a8e86cfc20" [[package]] name = "miniz_oxide" @@ -2858,7 +2949,7 @@ checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ "bitflags 2.6.0", "cfg-if", - "cfg_aliases", + "cfg_aliases 0.1.1", "libc", ] @@ -2910,25 +3001,6 @@ dependencies = [ "nom", ] -[[package]] -name = "notify" -version = "5.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729f63e1ca555a43fe3efa4f3efdf4801c479da85b432242a7b726f353c88486" -dependencies = [ - "bitflags 1.3.2", - "crossbeam-channel", - "filetime", - "fsevent-sys", - "inotify", - "kqueue", - "libc", - "mio 0.8.11", - "serde", - "walkdir", - "windows-sys 0.45.0", -] - [[package]] name = "notify" version = "6.1.1" @@ -2944,18 +3016,20 @@ dependencies = [ "libc", "log", "mio 0.8.11", + "serde", "walkdir", "windows-sys 0.48.0", ] [[package]] name = "notify-debouncer-mini" -version = "0.2.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e23e9fa24f094b143c1eb61f90ac6457de87be6987bc70746e0179f7dbc9007b" +checksum = "5d40b221972a1fc5ef4d858a2f671fb34c75983eb385463dff3780eeff6a9d43" dependencies = [ "crossbeam-channel", - "notify 5.2.0", + "log", + "notify", "serde", ] @@ -3063,7 +3137,7 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -3745,6 +3819,15 @@ dependencies = [ "toml_edit 0.19.15", ] +[[package]] +name = "proc-macro-crate" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" +dependencies = [ + "toml_edit 0.22.20", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -3784,6 +3867,26 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "quick-xml" version = "0.32.0" @@ -3811,6 +3914,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + [[package]] name = "rand" version = "0.7.3" @@ -3991,6 +4100,15 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +[[package]] +name = "rend" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" +dependencies = [ + "bytecheck", +] + [[package]] name = "reqwest" version = "0.11.23" @@ -4129,6 +4247,51 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "rkyv" +version = "0.7.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" +dependencies = [ + "bitvec", + "bytecheck", + "bytes", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "rust_decimal" +version = "1.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" +dependencies = [ + "arrayvec", + "borsh", + "bytes", + "num-traits", + "rand 0.8.5", + "rkyv", + "serde", + "serde_json", +] + [[package]] name = "rustc-demangle" version = "0.1.24" @@ -4294,6 +4457,12 @@ dependencies = [ "untrusted", ] +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + [[package]] name = "secret-service" version = "3.1.0" @@ -4656,6 +4825,12 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +[[package]] +name = "simdutf8" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" + [[package]] name = "siphasher" version = "0.3.11" @@ -4812,6 +4987,18 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "sync_wrapper" version = "1.0.1" @@ -4947,6 +5134,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + [[package]] name = "tar" version = "0.4.41" @@ -5098,11 +5291,11 @@ dependencies = [ [[package]] name = "tauri-plugin-fs-watch" -version = "0.1.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=dev#cea1d4f7b54b94354e8100daf804b810c680efd7" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#fa8ee1d4f2115bf1201cb4b4082d343476c01785" dependencies = [ "log", - "notify 5.2.0", + "notify", "notify-debouncer-mini", "serde", "serde_json", @@ -5112,8 +5305,8 @@ dependencies = [ [[package]] name = "tauri-plugin-log" -version = "0.1.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=dev#cea1d4f7b54b94354e8100daf804b810c680efd7" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#fa8ee1d4f2115bf1201cb4b4082d343476c01785" dependencies = [ "byte-unit", "fern", @@ -5127,22 +5320,22 @@ dependencies = [ [[package]] name = "tauri-plugin-single-instance" -version = "0.1.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=dev#cea1d4f7b54b94354e8100daf804b810c680efd7" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#fa8ee1d4f2115bf1201cb4b4082d343476c01785" dependencies = [ "log", "serde", "serde_json", "tauri", "thiserror", - "windows-sys 0.48.0", + "windows-sys 0.59.0", "zbus", ] [[package]] name = "tauri-plugin-store" -version = "0.1.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=dev#cea1d4f7b54b94354e8100daf804b810c680efd7" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#fa8ee1d4f2115bf1201cb4b4082d343476c01785" dependencies = [ "log", "serde", @@ -6278,15 +6471,6 @@ dependencies = [ "windows_x86_64_msvc 0.42.2", ] -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - [[package]] name = "windows-sys" version = "0.48.0" @@ -6306,18 +6490,12 @@ dependencies = [ ] [[package]] -name = "windows-targets" -version = "0.42.2" +name = "windows-sys" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.52.6", ] [[package]] @@ -6654,6 +6832,15 @@ dependencies = [ "windows-implement", ] +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + [[package]] name = "x11" version = "2.21.0" @@ -6760,7 +6947,7 @@ version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "regex", @@ -6837,7 +7024,7 @@ version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 1050330..0fcf45d 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -27,10 +27,10 @@ serde_json = "=1.0.128" serde = { version = "=1.0.210", features = ["derive"] } tauri = { version = "=1.7.1", features = [ "process-all", "window-all", "path-all", "dialog-all", "shell-open", "clipboard-write-text", "http-all", "fs-all", "updater"] } tauri-plugin-deep-link = "=0.1.2" -tauri-plugin-fs-watch = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" } -tauri-plugin-log = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" } -tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" } -tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" } +tauri-plugin-fs-watch = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } +tauri-plugin-log = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } +tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } +tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } tauri-plugin-window-state = "=0.1.1" thiserror = "=1.0.64" tokio = { version = "=1.40.0", features = ["time"] }