diff --git a/apply_patches.sh b/apply_patches.sh index 8570802..fe314f6 100755 --- a/apply_patches.sh +++ b/apply_patches.sh @@ -1,7 +1,7 @@ #!/bin/sh basedir=`pwd` -tg_tag="1.2.0" +tg_tag="3.0.0" echo "Checking for TG rust-g repo.." if [ ! -d "./tg-rust-g" ] diff --git a/paradise-rust-g-patches/0001-Paradise-Version-Changes.patch b/paradise-rust-g-patches/0001-Paradise-Version-Changes.patch index adfffb2..67ee515 100644 --- a/paradise-rust-g-patches/0001-Paradise-Version-Changes.patch +++ b/paradise-rust-g-patches/0001-Paradise-Version-Changes.patch @@ -1,32 +1,32 @@ -From 124eccba73fa986f9d9ceffa7a8a69bd97eae218 Mon Sep 17 00:00:00 2001 +From 85c987757fe9a259a370c79333b3e57ef820dcf5 Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> -Date: Wed, 13 Oct 2021 22:04:30 +0100 +Date: Tue, 24 Oct 2023 21:44:45 +0100 Subject: [PATCH] Paradise Version Changes diff --git a/Cargo.lock b/Cargo.lock -index ab158a2..f77d99f 100644 +index afdaa60..b276d34 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -1999,7 +1999,7 @@ dependencies = [ +@@ -2166,7 +2166,7 @@ dependencies = [ [[package]] name = "rust-g" --version = "1.2.0" -+version = "1.2.0-P" +-version = "3.0.0" ++version = "3.0.0-P" dependencies = [ "aho-corasick", "base64", diff --git a/Cargo.toml b/Cargo.toml -index 121c252..b2166a7 100644 +index 958fbd4..e3965dd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,15 +1,15 @@ [package] name = "rust-g" edition = "2021" --version = "1.2.0" -+version = "1.2.0-P" +-version = "3.0.0" ++version = "3.0.0-P" authors = [ "Bjorn Neergaard ", "Tad Hardesty ", @@ -41,5 +41,5 @@ index 121c252..b2166a7 100644 [lib] crate-type = ["cdylib"] -- -2.35.2.windows.1 +2.41.0.windows.3 diff --git a/paradise-rust-g-patches/0002-Paradise-Logging-Changes.patch b/paradise-rust-g-patches/0002-Paradise-Logging-Changes.patch index 0da6d94..61d58b1 100644 --- a/paradise-rust-g-patches/0002-Paradise-Logging-Changes.patch +++ b/paradise-rust-g-patches/0002-Paradise-Logging-Changes.patch @@ -1,6 +1,6 @@ -From a7d7ad5361239e00852692abc39c8404383290e4 Mon Sep 17 00:00:00 2001 +From 95c923ce48d5a3a8944ca26375715f1802b11f52 Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> -Date: Wed, 13 Oct 2021 22:04:37 +0100 +Date: Tue, 24 Oct 2023 21:48:34 +0100 Subject: [PATCH] Paradise Logging Changes @@ -14,7 +14,7 @@ index 1faadc8..bbc8fe6 100644 +#define rustg_log_write(fname, text) RUSTG_CALL(RUST_G, "log_write")(fname, text) +/proc/rustg_log_close_all() return RUSTG_CALL(RUST_G, "log_close_all")() diff --git a/src/log.rs b/src/log.rs -index 9bd019b..6722353 100644 +index 4184945..d3eb7aa 100644 --- a/src/log.rs +++ b/src/log.rs @@ -14,7 +14,7 @@ thread_local! { @@ -32,25 +32,25 @@ index 9bd019b..6722353 100644 - if rest.first().map(|x| &**x) == Some("false") { - // Write the data to the file with no accoutrements. -- write!(file, "{}", data)?; +- write!(file, "{data}")?; - } else { - // write first line, timestamped - let mut iter = data.split('\n'); - if let Some(line) = iter.next() { -- write!(file, "[{}] {}\n", Utc::now().format("%F %T%.3f"), line)?; +- writeln!(file, "[{}] {}", Utc::now().format("%F %T%.3f"), line)?; - } - - // write remaining lines - for line in iter { -- write!(file, " - {}\n", line)?; +- writeln!(file, " - {line}")?; - } + // write all lines timestamped + let iter = data.split('\n'); + for line in iter { -+ write!(file, "[{}] {}\n", Utc::now().format("%FT%T"), line)?; ++ writeln!(file, "[{}] {}", Utc::now().format("%FT%T"), line)?; } Ok(()) -- -2.35.2.windows.1 +2.41.0.windows.3 diff --git a/paradise-rust-g-patches/0005-Paradise-HTTP-Module-Tweaks.patch b/paradise-rust-g-patches/0005-Paradise-HTTP-Module-Tweaks.patch index f713d06..c9e222b 100644 --- a/paradise-rust-g-patches/0005-Paradise-HTTP-Module-Tweaks.patch +++ b/paradise-rust-g-patches/0005-Paradise-HTTP-Module-Tweaks.patch @@ -1,21 +1,13 @@ -From 81098ac672c0e1f44dfb7d511453439c4799ed54 Mon Sep 17 00:00:00 2001 +From edf520da0a3f4c4b9141cde63918b23dcc3f6dac Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Thu, 14 Oct 2021 15:50:14 +0100 Subject: [PATCH] Paradise HTTP Module Tweaks diff --git a/dmsrc/http.dm b/dmsrc/http.dm -index eba7d68..fdcf7a7 100644 +index eba7d68..c880334 100644 --- a/dmsrc/http.dm +++ b/dmsrc/http.dm -@@ -1,5 +1,5 @@ --// HTTP Operations // -- -+// HTTP Operations // -+ - #define RUSTG_HTTP_METHOD_GET "get" - #define RUSTG_HTTP_METHOD_PUT "put" - #define RUSTG_HTTP_METHOD_DELETE "delete" @@ -9,3 +9,5 @@ #define rustg_http_request_blocking(method, url, body, headers, options) RUSTG_CALL(RUST_G, "http_request_blocking")(method, url, body, headers, options) #define rustg_http_request_async(method, url, body, headers, options) RUSTG_CALL(RUST_G, "http_request_async")(method, url, body, headers, options) @@ -23,7 +15,7 @@ index eba7d68..fdcf7a7 100644 +/proc/rustg_create_async_http_client() return RUSTG_CALL(RUST_G, "start_http_client")() +/proc/rustg_close_async_http_client() return RUSTG_CALL(RUST_G, "shutdown_http_client")() diff --git a/src/http.rs b/src/http.rs -index 5da2ff1..426f869 100644 +index 43f891e..135b2c2 100644 --- a/src/http.rs +++ b/src/http.rs @@ -1,8 +1,8 @@ @@ -36,7 +28,7 @@ index 5da2ff1..426f869 100644 // ---------------------------------------------------------------------------- // Interface -@@ -78,7 +78,9 @@ fn setup_http_client() -> reqwest::blocking::Client { +@@ -75,7 +75,9 @@ fn setup_http_client() -> reqwest::blocking::Client { Client::builder().default_headers(headers).build().unwrap() } @@ -47,7 +39,7 @@ index 5da2ff1..426f869 100644 // ---------------------------------------------------------------------------- // Request construction and execution -@@ -95,38 +97,56 @@ fn construct_request( +@@ -92,38 +94,56 @@ fn construct_request( headers: &str, options: &str, ) -> Result { @@ -135,7 +127,7 @@ index 5da2ff1..426f869 100644 }) } -@@ -158,3 +178,17 @@ fn submit_request(prep: RequestPrep) -> Result { +@@ -155,3 +175,17 @@ fn submit_request(prep: RequestPrep) -> Result { Ok(serde_json::to_string(&resp)?) } @@ -174,5 +166,5 @@ index 16b5009..9b5d5c5 100644 req, unzip_directory: dir_copy, -- -2.35.2.windows.1 +2.41.0.windows.3 diff --git a/paradise-rust-g-patches/0007-Paradise-Toast-System.patch b/paradise-rust-g-patches/0007-Paradise-Toast-System.patch index 2c09e33..e7cc6d7 100644 --- a/paradise-rust-g-patches/0007-Paradise-Toast-System.patch +++ b/paradise-rust-g-patches/0007-Paradise-Toast-System.patch @@ -1,14 +1,14 @@ -From df1f55eec1251a8f45a2643479d5fa6dd6dd0b6c Mon Sep 17 00:00:00 2001 +From f62531b52f69dd337bc6b29abc045f71ab14bede Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> -Date: Thu, 12 Jan 2023 08:47:47 +0000 +Date: Tue, 24 Oct 2023 21:56:43 +0100 Subject: [PATCH] Paradise Toast System diff --git a/Cargo.lock b/Cargo.lock -index f77d99f..c63a365 100644 +index b276d34..9129a6e 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -135,6 +135,12 @@ dependencies = [ +@@ -150,6 +150,12 @@ dependencies = [ "wyz", ] @@ -20,8 +20,8 @@ index f77d99f..c63a365 100644 + [[package]] name = "block-buffer" - version = "0.10.2" -@@ -449,6 +455,17 @@ dependencies = [ + version = "0.10.4" +@@ -568,6 +574,17 @@ dependencies = [ "rayon", ] @@ -38,8 +38,8 @@ index f77d99f..c63a365 100644 + [[package]] name = "deflate" - version = "0.8.6" -@@ -490,6 +507,27 @@ dependencies = [ + version = "1.0.0" +@@ -599,6 +616,27 @@ dependencies = [ "subtle", ] @@ -65,55 +65,48 @@ index f77d99f..c63a365 100644 +] + [[package]] - name = "dtoa" - version = "0.4.8" -@@ -812,6 +850,15 @@ dependencies = [ - "ahash", + name = "dmi" + version = "0.3.0" +@@ -1051,7 +1089,7 @@ dependencies = [ + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", +- "windows", ++ "windows 0.48.0", ] -+[[package]] -+name = "heck" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -+dependencies = [ -+ "unicode-segmentation", -+] -+ [[package]] - name = "hermit-abi" - version = "0.1.19" -@@ -1174,6 +1221,15 @@ version = "0.2.126" +@@ -1290,6 +1328,15 @@ version = "0.2.146" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" + checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +[[package]] +name = "libdbus-sys" -+version = "0.2.3" ++version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2264f9d90a9b4e60a2dc722ad899ea0374f03c2e96e755fe22a8f551d4d5fb3c" ++checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" +dependencies = [ + "pkg-config", +] + [[package]] name = "libgit2-sys" - version = "0.13.4+1.4.2" -@@ -1236,6 +1292,28 @@ dependencies = [ - "hashbrown", + version = "0.15.2+1.6.4" +@@ -1355,6 +1402,28 @@ dependencies = [ + "hashbrown 0.13.2", ] +[[package]] +name = "mac-notification-sys" -+version = "0.5.6" ++version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3e72d50edb17756489e79d52eb146927bec8eba9dd48faadf9ef08bca3791ad5" ++checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64" +dependencies = [ + "cc", + "dirs-next", + "objc-foundation", + "objc_id", -+ "time 0.3.11", ++ "time 0.3.22", +] + +[[package]] @@ -126,19 +119,20 @@ index f77d99f..c63a365 100644 +] + [[package]] - name = "matches" - version = "0.1.9" -@@ -1438,6 +1516,17 @@ dependencies = [ + name = "md-5" + version = "0.10.5" +@@ -1555,6 +1624,18 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "notify-rust" -+version = "4.6.0" ++version = "4.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5cc2e370356160e41aba3fd0fbac26d86a89ddd2ac4300c03de999a77cfa2509" ++checksum = "6d7b75c8958cb2eab3451538b32db8a7b74006abc33eb2e6a9a56d21e4775c2b" +dependencies = [ + "dbus", ++ "log", + "mac-notification-sys", + "tauri-winrt-notification", +] @@ -146,7 +140,7 @@ index f77d99f..c63a365 100644 [[package]] name = "num" version = "0.4.0" -@@ -1544,6 +1633,35 @@ dependencies = [ +@@ -1641,6 +1722,35 @@ dependencies = [ "libc", ] @@ -181,25 +175,50 @@ index f77d99f..c63a365 100644 + [[package]] name = "once_cell" - version = "1.13.0" -@@ -1756,6 +1874,15 @@ dependencies = [ - "unicode-ident", + version = "1.18.0" +@@ -1699,7 +1809,7 @@ checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" + dependencies = [ + "cfg-if", + "libc", +- "redox_syscall", ++ "redox_syscall 0.3.5", + "smallvec", + "windows-targets", + ] +@@ -1898,6 +2008,15 @@ dependencies = [ + "syn 1.0.109", ] +[[package]] +name = "quick-xml" -+version = "0.23.1" ++version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" ++checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +dependencies = [ + "memchr", +] + [[package]] name = "quote" - version = "1.0.20" -@@ -1917,6 +2044,17 @@ dependencies = [ - "bitflags", + version = "1.0.28" +@@ -2047,6 +2166,15 @@ dependencies = [ + "url", + ] + ++[[package]] ++name = "redox_syscall" ++version = "0.2.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" ++dependencies = [ ++ "bitflags 1.3.2", ++] ++ + [[package]] + name = "redox_syscall" + version = "0.3.5" +@@ -2056,6 +2184,17 @@ dependencies = [ + "bitflags 1.3.2", ] +[[package]] @@ -208,24 +227,15 @@ index f77d99f..c63a365 100644 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ -+ "getrandom 0.2.7", -+ "redox_syscall", ++ "getrandom 0.2.10", ++ "redox_syscall 0.2.16", + "thiserror", +] + [[package]] name = "regex" - version = "1.6.0" -@@ -1999,7 +2137,7 @@ dependencies = [ - - [[package]] - name = "rust-g" --version = "1.2.0-P" -+version = "1.2.0-P2" - dependencies = [ - "aho-corasick", - "base64", -@@ -2015,6 +2153,7 @@ dependencies = [ + version = "1.8.4" +@@ -2183,6 +2322,7 @@ dependencies = [ "md-5", "mysql", "noise", @@ -233,192 +243,190 @@ index f77d99f..c63a365 100644 "num", "once_cell", "pathfinding", -@@ -2284,6 +2423,27 @@ version = "1.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -+[[package]] -+name = "strum" -+version = "0.22.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e" -+dependencies = [ -+ "strum_macros", -+] -+ -+[[package]] -+name = "strum_macros" -+version = "0.22.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" -+dependencies = [ -+ "heck", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ - [[package]] - name = "subprocess" - version = "0.2.9" -@@ -2317,6 +2477,17 @@ version = "1.0.1" +@@ -2554,6 +2694,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "tauri-winrt-notification" -+version = "0.1.0" ++version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c58de036c4d2e20717024de2a3c4bf56c301f07b21bc8ef9b57189fce06f1f3b" ++checksum = "006851c9ccefa3c38a7646b8cec804bb429def3da10497bfa977179869c3e8e2" +dependencies = [ + "quick-xml", -+ "strum", -+ "windows", ++ "windows 0.51.1", +] + [[package]] name = "tempfile" - version = "3.3.0" -@@ -2557,6 +2728,12 @@ dependencies = [ - "tinyvec", + version = "3.6.0" +@@ -2563,7 +2713,7 @@ dependencies = [ + "autocfg", + "cfg-if", + "fastrand", +- "redox_syscall", ++ "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.48.0", + ] +@@ -3017,6 +3167,25 @@ dependencies = [ + "windows-targets", ] +[[package]] -+name = "unicode-segmentation" -+version = "1.10.0" ++name = "windows" ++version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" ++checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" ++dependencies = [ ++ "windows-core", ++ "windows-targets", ++] + - [[package]] - name = "untrusted" - version = "0.7.1" -@@ -2744,17 +2921,30 @@ version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - +[[package]] -+name = "windows" -+version = "0.39.0" ++name = "windows-core" ++version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" ++checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ -+ "windows_aarch64_msvc 0.39.0", -+ "windows_i686_gnu 0.39.0", -+ "windows_i686_msvc 0.39.0", -+ "windows_x86_64_gnu 0.39.0", -+ "windows_x86_64_msvc 0.39.0", ++ "windows-targets", +] + [[package]] name = "windows-sys" - version = "0.36.1" + version = "0.42.0" +@@ -3043,17 +3212,17 @@ dependencies = [ + + [[package]] + name = "windows-targets" +-version = "0.48.0" ++version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" ++checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ -- "windows_aarch64_msvc", -- "windows_i686_gnu", -- "windows_i686_msvc", -- "windows_x86_64_gnu", -- "windows_x86_64_msvc", -+ "windows_aarch64_msvc 0.36.1", -+ "windows_i686_gnu 0.36.1", -+ "windows_i686_msvc 0.36.1", -+ "windows_x86_64_gnu 0.36.1", -+ "windows_x86_64_msvc 0.36.1", +- "windows_aarch64_gnullvm 0.48.0", +- "windows_aarch64_msvc 0.48.0", +- "windows_i686_gnu 0.48.0", +- "windows_i686_msvc 0.48.0", +- "windows_x86_64_gnu 0.48.0", +- "windows_x86_64_gnullvm 0.48.0", +- "windows_x86_64_msvc 0.48.0", ++ "windows_aarch64_gnullvm 0.48.5", ++ "windows_aarch64_msvc 0.48.5", ++ "windows_i686_gnu 0.48.5", ++ "windows_i686_msvc 0.48.5", ++ "windows_x86_64_gnu 0.48.5", ++ "windows_x86_64_gnullvm 0.48.5", ++ "windows_x86_64_msvc 0.48.5", ] [[package]] -@@ -2763,30 +2953,60 @@ version = "0.36.1" +@@ -3064,9 +3233,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + + [[package]] + name = "windows_aarch64_gnullvm" +-version = "0.48.0" ++version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" ++checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + + [[package]] + name = "windows_aarch64_msvc" +@@ -3076,9 +3245,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + + [[package]] + name = "windows_aarch64_msvc" +-version = "0.48.0" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" ++checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" -+[[package]] -+name = "windows_aarch64_msvc" -+version = "0.39.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" -+ [[package]] name = "windows_i686_gnu" - version = "0.36.1" +@@ -3088,9 +3257,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + + [[package]] + name = "windows_i686_gnu" +-version = "0.48.0" ++version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" ++checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + + [[package]] + name = "windows_i686_msvc" +@@ -3100,9 +3269,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" -+[[package]] -+name = "windows_i686_gnu" -+version = "0.39.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" -+ [[package]] name = "windows_i686_msvc" - version = "0.36.1" +-version = "0.48.0" ++version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" ++checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + + [[package]] + name = "windows_x86_64_gnu" +@@ -3112,9 +3281,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" -+[[package]] -+name = "windows_i686_msvc" -+version = "0.39.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" -+ [[package]] name = "windows_x86_64_gnu" - version = "0.36.1" +-version = "0.48.0" ++version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" ++checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + + [[package]] + name = "windows_x86_64_gnullvm" +@@ -3124,9 +3293,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + + [[package]] + name = "windows_x86_64_gnullvm" +-version = "0.48.0" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" ++checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + + [[package]] + name = "windows_x86_64_msvc" +@@ -3136,9 +3305,9 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" -+[[package]] -+name = "windows_x86_64_gnu" -+version = "0.39.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" -+ [[package]] name = "windows_x86_64_msvc" - version = "0.36.1" +-version = "0.48.0" ++version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" ++checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" -+[[package]] -+name = "windows_x86_64_msvc" -+version = "0.39.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" -+ [[package]] - name = "winreg" - version = "0.10.1" + name = "winnow" diff --git a/Cargo.toml b/Cargo.toml -index 1ad5412..6701724 100644 +index 3647e3e..92fb50b 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -1,7 +1,7 @@ - [package] - name = "rust-g" - edition = "2021" --version = "1.2.0-P" -+version = "1.2.0-P2" - authors = [ - "Bjorn Neergaard ", - "Tad Hardesty ", -@@ -55,6 +55,7 @@ rayon = { version = "1.5", optional = true } - dbpnoise = { version = "0.1.2", optional = true } - pathfinding = { version = "3.0.13", optional = true } +@@ -56,6 +56,7 @@ dbpnoise = { version = "0.1.2", optional = true } + pathfinding = { version = "4.2.1", optional = true } num = { version = "0.4.0", optional = true } + dmi = { version = "0.3.0", optional = true } +notify-rust = { version = "4.6.0", optional = true, features=["d"], default-features = false } [features] default = [ -@@ -69,6 +70,7 @@ default = [ - "noise", +@@ -71,6 +72,7 @@ default = [ + "rustls_tls", "sql", "time", + "toast", "toml", "url", ] -@@ -84,6 +86,7 @@ json = ["serde", "serde_json"] +@@ -110,6 +112,7 @@ json = ["serde", "serde_json"] log = ["chrono"] sql = ["mysql", "serde", "serde_json", "once_cell", "dashmap", "jobs"] time = [] @@ -436,10 +444,10 @@ index 0000000..9222f88 + +#define rustg_create_toast(title, body) RUSTG_CALL(RUST_G, "create_toast")(title, body) diff --git a/src/lib.rs b/src/lib.rs -index bbe4055..c043ecf 100644 +index 8b9fa90..5a79710 100644 --- a/src/lib.rs +++ b/src/lib.rs -@@ -38,6 +38,8 @@ pub mod redis_pubsub; +@@ -40,6 +40,8 @@ pub mod redis_reliablequeue; pub mod sql; #[cfg(feature = "time")] pub mod time; @@ -464,5 +472,5 @@ index 0000000..a1d6cd8 + Some("") +}); -- -2.25.1 +2.41.0.windows.3