diff --git a/Cargo.lock b/Cargo.lock
index 31ab38f..d1a0e2b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -41,15 +41,6 @@ dependencies = [
"version_check",
]
-[[package]]
-name = "aho-corasick"
-version = "0.7.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
-dependencies = [
- "memchr",
-]
-
[[package]]
name = "android_glue"
version = "0.2.3"
@@ -74,18 +65,23 @@ dependencies = [
"x11rb",
]
-[[package]]
-name = "arrayvec"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
-
[[package]]
name = "ascii"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbf56136a5198c7b01a49e3afcbef6cf84597273d298f54432926024107b0109"
+[[package]]
+name = "async-trait"
+version = "0.1.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "atomic_refcell"
version = "0.1.8"
@@ -122,9 +118,30 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
+[[package]]
+name = "block-buffer"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
+dependencies = [
+ "block-padding",
+ "byte-tools",
+ "byteorder",
+ "generic-array",
+]
+
+[[package]]
+name = "block-padding"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
+dependencies = [
+ "byte-tools",
+]
+
[[package]]
name = "boilr"
-version = "1.3.16"
+version = "1.3.17"
dependencies = [
"base64",
"chrono",
@@ -137,10 +154,10 @@ dependencies = [
"futures",
"image",
"is_executable",
- "nom 7.1.1",
+ "nom",
"reqwest",
"rusty-leveldb",
- "serde 1.0.137",
+ "serde",
"serde_json",
"sqlite",
"steam_shortcuts_util",
@@ -164,6 +181,12 @@ version = "3.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
+[[package]]
+name = "byte-tools"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
+
[[package]]
name = "bytecount"
version = "0.6.2"
@@ -253,7 +276,7 @@ checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
dependencies = [
"libc",
"num-integer",
- "num-traits 0.2.15",
+ "num-traits",
"time",
"winapi",
]
@@ -328,15 +351,18 @@ dependencies = [
[[package]]
name = "config"
-version = "0.11.0"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1b9d958c2b1368a663f05538fc1b5975adce1e19f435acceae987aceeeb369"
+checksum = "3ea917b74b6edfb5024e3b55d3c8f710b5f4ed92646429601a42e96f0812b31b"
dependencies = [
+ "async-trait",
+ "json5",
"lazy_static",
- "nom 5.1.2",
+ "nom",
+ "pathdiff",
+ "ron",
"rust-ini",
- "serde 1.0.137",
- "serde-hjson",
+ "serde",
"serde_json",
"toml",
"yaml-rust",
@@ -544,14 +570,15 @@ dependencies = [
[[package]]
name = "dashmap"
-version = "5.3.3"
+version = "5.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "391b56fbd302e585b7a9494fb70e40949567b1cf9003a8e4a6041a1687c26573"
+checksum = "3495912c9c1ccf2e18976439f4443f3fee0fd61f424ff99fde6a66b15ecb448f"
dependencies = [
"cfg-if 1.0.0",
"hashbrown 0.12.1",
"lock_api",
- "serde 1.0.137",
+ "parking_lot_core 0.9.3",
+ "serde",
]
[[package]]
@@ -563,6 +590,15 @@ dependencies = [
"adler32",
]
+[[package]]
+name = "digest"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
+dependencies = [
+ "generic-array",
+]
+
[[package]]
name = "dispatch"
version = "0.2.0"
@@ -578,6 +614,12 @@ dependencies = [
"libloading",
]
+[[package]]
+name = "dlv-list"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257"
+
[[package]]
name = "downcast-rs"
version = "1.2.0"
@@ -732,6 +774,12 @@ dependencies = [
"threadpool",
]
+[[package]]
+name = "fake-simd"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
+
[[package]]
name = "fastrand"
version = "1.7.0"
@@ -743,13 +791,11 @@ dependencies = [
[[package]]
name = "flate2"
-version = "1.0.23"
+version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af"
+checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
dependencies = [
- "cfg-if 1.0.0",
"crc32fast",
- "libc",
"miniz_oxide",
]
@@ -896,6 +942,15 @@ dependencies = [
"slab",
]
+[[package]]
+name = "generic-array"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
+dependencies = [
+ "typenum",
+]
+
[[package]]
name = "gethostname"
version = "0.2.3"
@@ -1071,6 +1126,9 @@ name = "hashbrown"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3"
+dependencies = [
+ "ahash",
+]
[[package]]
name = "hermit-abi"
@@ -1183,7 +1241,7 @@ dependencies = [
"jpeg-decoder",
"num-iter",
"num-rational",
- "num-traits 0.2.15",
+ "num-traits",
"png",
"scoped_threadpool",
"tiff",
@@ -1285,6 +1343,17 @@ dependencies = [
"wasm-bindgen",
]
+[[package]]
+name = "json5"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1"
+dependencies = [
+ "pest",
+ "pest_derive",
+ "serde",
+]
+
[[package]]
name = "khronos_api"
version = "3.1.0"
@@ -1309,19 +1378,6 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7efd1d698db0759e6ef11a7cd44407407399a910c774dd804c64c032da7826ff"
-[[package]]
-name = "lexical-core"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"
-dependencies = [
- "arrayvec",
- "bitflags",
- "cfg-if 1.0.0",
- "ryu",
- "static_assertions",
-]
-
[[package]]
name = "libc"
version = "0.2.125"
@@ -1372,6 +1428,12 @@ dependencies = [
"libc",
]
+[[package]]
+name = "maplit"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
+
[[package]]
name = "matches"
version = "0.1.9"
@@ -1571,17 +1633,6 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
-[[package]]
-name = "nom"
-version = "5.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
-dependencies = [
- "lexical-core",
- "memchr",
- "version_check",
-]
-
[[package]]
name = "nom"
version = "7.1.1"
@@ -1600,7 +1651,7 @@ checksum = "37794436ca3029a3089e0b95d42da1f0b565ad271e4d3bb4bad0c7bb70b10605"
dependencies = [
"bytecount",
"memchr",
- "nom 7.1.1",
+ "nom",
]
[[package]]
@@ -1619,7 +1670,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
dependencies = [
"autocfg",
- "num-traits 0.2.15",
+ "num-traits",
]
[[package]]
@@ -1630,7 +1681,7 @@ checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
dependencies = [
"autocfg",
"num-integer",
- "num-traits 0.2.15",
+ "num-traits",
]
[[package]]
@@ -1641,16 +1692,7 @@ checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a"
dependencies = [
"autocfg",
"num-integer",
- "num-traits 0.2.15",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.1.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
-dependencies = [
- "num-traits 0.2.15",
+ "num-traits",
]
[[package]]
@@ -1728,6 +1770,12 @@ version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
+[[package]]
+name = "opaque-debug"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
+
[[package]]
name = "openssl"
version = "0.10.40"
@@ -1773,6 +1821,16 @@ dependencies = [
"vcpkg",
]
+[[package]]
+name = "ordered-multimap"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a"
+dependencies = [
+ "dlv-list",
+ "hashbrown 0.12.1",
+]
+
[[package]]
name = "osmesa-sys"
version = "0.1.2"
@@ -1839,12 +1897,61 @@ dependencies = [
"windows-sys",
]
+[[package]]
+name = "pathdiff"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
+
[[package]]
name = "percent-encoding"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
+[[package]]
+name = "pest"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
+dependencies = [
+ "ucd-trie",
+]
+
+[[package]]
+name = "pest_derive"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
+dependencies = [
+ "pest",
+ "pest_generator",
+]
+
+[[package]]
+name = "pest_generator"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
+dependencies = [
+ "pest",
+ "pest_meta",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "pest_meta"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"
+dependencies = [
+ "maplit",
+ "pest",
+ "sha-1",
+]
+
[[package]]
name = "pin-project"
version = "1.0.10"
@@ -1913,11 +2020,11 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.38"
+version = "1.0.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9027b48e9d4c9175fa2218adf3557f91c1137021739951d4932f5f8268ac48aa"
+checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
dependencies = [
- "unicode-xid",
+ "unicode-ident",
]
[[package]]
@@ -2021,23 +2128,6 @@ dependencies = [
"bitflags",
]
-[[package]]
-name = "regex"
-version = "1.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
-
[[package]]
name = "remove_dir_all"
version = "0.5.3"
@@ -2071,7 +2161,7 @@ dependencies = [
"native-tls",
"percent-encoding",
"pin-project-lite",
- "serde 1.0.137",
+ "serde",
"serde_json",
"serde_urlencoded",
"tokio",
@@ -2084,10 +2174,25 @@ dependencies = [
]
[[package]]
-name = "rust-ini"
-version = "0.13.0"
+name = "ron"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2"
+checksum = "1b861ecaade43ac97886a512b360d01d66be9f41f3c61088b42cedf92e03d678"
+dependencies = [
+ "base64",
+ "bitflags",
+ "serde",
+]
+
+[[package]]
+name = "rust-ini"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df"
+dependencies = [
+ "cfg-if 1.0.0",
+ "ordered-multimap",
+]
[[package]]
name = "rusty-leveldb"
@@ -2169,12 +2274,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "serde"
-version = "0.8.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
-
[[package]]
name = "serde"
version = "1.0.137"
@@ -2184,18 +2283,6 @@ dependencies = [
"serde_derive",
]
-[[package]]
-name = "serde-hjson"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a3a4e0ea8a88553209f6cc6cfe8724ecad22e1acf372793c27d995290fe74f8"
-dependencies = [
- "lazy_static",
- "num-traits 0.1.43",
- "regex",
- "serde 0.8.23",
-]
-
[[package]]
name = "serde_derive"
version = "1.0.137"
@@ -2215,7 +2302,7 @@ checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
dependencies = [
"itoa",
"ryu",
- "serde 1.0.137",
+ "serde",
]
[[package]]
@@ -2227,7 +2314,19 @@ dependencies = [
"form_urlencoded",
"itoa",
"ryu",
- "serde 1.0.137",
+ "serde",
+]
+
+[[package]]
+name = "sha-1"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
+dependencies = [
+ "block-buffer",
+ "digest",
+ "fake-simd",
+ "opaque-debug",
]
[[package]]
@@ -2354,12 +2453,6 @@ dependencies = [
"sqlite3-src",
]
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
[[package]]
name = "steam_shortcuts_util"
version = "1.1.8"
@@ -2368,7 +2461,7 @@ checksum = "d0543ebdb23a93b196aceebc53f70cc5a573bb74248a974b3f5fa3883e6a89b6"
dependencies = [
"ascii",
"crc32fast",
- "nom 7.1.1",
+ "nom",
"nom_locate",
]
@@ -2379,7 +2472,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14968a884ba517e194649a482617c37e908ac9cb4dbcb55582a838705ee705c7"
dependencies = [
"reqwest",
- "serde 1.0.137",
+ "serde",
"serde_json",
"urlencoding",
]
@@ -2398,20 +2491,20 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "syn"
-version = "1.0.94"
+version = "1.0.96"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a07e33e919ebcd69113d5be0e4d70c5707004ff45188910106854f38b960df4a"
+checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf"
dependencies = [
"proc-macro2",
"quote",
- "unicode-xid",
+ "unicode-ident",
]
[[package]]
name = "sysinfo"
-version = "0.23.12"
+version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56b1e20ee77901236c389ff74618a899ff5fd34719a7ff0fd1d64f0acca5179a"
+checksum = "9a2809487b962344ca55d9aea565f9ffbcb6929780802217acc82561f6746770"
dependencies = [
"cfg-if 1.0.0",
"core-foundation-sys 0.8.3",
@@ -2503,9 +2596,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
-version = "1.18.2"
+version = "1.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395"
+checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439"
dependencies = [
"bytes",
"libc",
@@ -2562,7 +2655,7 @@ version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
dependencies = [
- "serde 1.0.137",
+ "serde",
]
[[package]]
@@ -2615,12 +2708,30 @@ version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c74c96594835e10fa545e2a51e8709f30b173a092bfd6036ef2cec53376244f3"
+[[package]]
+name = "typenum"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
+
+[[package]]
+name = "ucd-trie"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
+
[[package]]
name = "unicode-bidi"
version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
+[[package]]
+name = "unicode-ident"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"
+
[[package]]
name = "unicode-normalization"
version = "0.1.19"
@@ -2630,12 +2741,6 @@ dependencies = [
"tinyvec",
]
-[[package]]
-name = "unicode-xid"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04"
-
[[package]]
name = "url"
version = "2.2.2"
@@ -3073,7 +3178,7 @@ version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7"
dependencies = [
- "nom 7.1.1",
+ "nom",
]
[[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 53315ef..ff72199 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,14 +1,14 @@
[package]
edition = "2021"
name = "boilr"
-version = "1.3.16"
+version = "1.3.17"
[dependencies]
base64 = "^0.13.0"
chrono = "^0.4.19"
-config = "^0.11.0"
+config = "^0.13.1"
copypasta = "^0.7.1"
-flate2 = "^1.0.23"
+flate2 = "^1.0.24"
is_executable = "^1.0.1"
nom = "^7.1.1"
rusty-leveldb = "^0.3.6"
@@ -16,11 +16,11 @@ serde_json = "^1.0.81"
sqlite = "^0.26.0"
steam_shortcuts_util = "^1.1.8"
steamgriddb_api = "^0.3.0"
-sysinfo = "^0.23.12"
+sysinfo = "^0.24.2"
[dependencies.dashmap]
features = ["serde"]
-version = "^5.3.3"
+version = "^5.3.4"
[dependencies.eframe]
version = "^0.18.0"
@@ -45,7 +45,7 @@ version = "^1.0.137"
[dependencies.tokio]
features = ["full"]
-version = "^1.18.2"
+version = "^1.19.2"
[dependencies.toml]
version = "^0.5.9"
@@ -53,7 +53,7 @@ version = "^0.5.9"
[target]
[target."cfg(windows)"]
[target."cfg(windows)".build-dependencies]
-winres = "^0.1"
+winres = "^0.1.12"
[target."cfg(windows)".dependencies]
winreg = "^0.10.1"
diff --git a/flatpak/cargo-lock.json b/flatpak/cargo-lock.json
index 47302f6..0efa884 100644
--- a/flatpak/cargo-lock.json
+++ b/flatpak/cargo-lock.json
@@ -64,19 +64,6 @@
"dest": "cargo/vendor/ahash-0.7.6",
"dest-filename": ".cargo-checksum.json"
},
- {
- "type": "archive",
- "archive-type": "tar-gzip",
- "url": "https://static.crates.io/crates/aho-corasick/aho-corasick-0.7.18.crate",
- "sha256": "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f",
- "dest": "cargo/vendor/aho-corasick-0.7.18"
- },
- {
- "type": "inline",
- "contents": "{\"package\": \"1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f\", \"files\": {}}",
- "dest": "cargo/vendor/aho-corasick-0.7.18",
- "dest-filename": ".cargo-checksum.json"
- },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -103,19 +90,6 @@
"dest": "cargo/vendor/arboard-2.1.0",
"dest-filename": ".cargo-checksum.json"
},
- {
- "type": "archive",
- "archive-type": "tar-gzip",
- "url": "https://static.crates.io/crates/arrayvec/arrayvec-0.5.2.crate",
- "sha256": "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b",
- "dest": "cargo/vendor/arrayvec-0.5.2"
- },
- {
- "type": "inline",
- "contents": "{\"package\": \"23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b\", \"files\": {}}",
- "dest": "cargo/vendor/arrayvec-0.5.2",
- "dest-filename": ".cargo-checksum.json"
- },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -129,6 +103,19 @@
"dest": "cargo/vendor/ascii-1.0.0",
"dest-filename": ".cargo-checksum.json"
},
+ {
+ "type": "archive",
+ "archive-type": "tar-gzip",
+ "url": "https://static.crates.io/crates/async-trait/async-trait-0.1.56.crate",
+ "sha256": "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716",
+ "dest": "cargo/vendor/async-trait-0.1.56"
+ },
+ {
+ "type": "inline",
+ "contents": "{\"package\": \"96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716\", \"files\": {}}",
+ "dest": "cargo/vendor/async-trait-0.1.56",
+ "dest-filename": ".cargo-checksum.json"
+ },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -207,6 +194,32 @@
"dest": "cargo/vendor/block-0.1.6",
"dest-filename": ".cargo-checksum.json"
},
+ {
+ "type": "archive",
+ "archive-type": "tar-gzip",
+ "url": "https://static.crates.io/crates/block-buffer/block-buffer-0.7.3.crate",
+ "sha256": "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b",
+ "dest": "cargo/vendor/block-buffer-0.7.3"
+ },
+ {
+ "type": "inline",
+ "contents": "{\"package\": \"c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b\", \"files\": {}}",
+ "dest": "cargo/vendor/block-buffer-0.7.3",
+ "dest-filename": ".cargo-checksum.json"
+ },
+ {
+ "type": "archive",
+ "archive-type": "tar-gzip",
+ "url": "https://static.crates.io/crates/block-padding/block-padding-0.1.5.crate",
+ "sha256": "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5",
+ "dest": "cargo/vendor/block-padding-0.1.5"
+ },
+ {
+ "type": "inline",
+ "contents": "{\"package\": \"fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5\", \"files\": {}}",
+ "dest": "cargo/vendor/block-padding-0.1.5",
+ "dest-filename": ".cargo-checksum.json"
+ },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -233,6 +246,19 @@
"dest": "cargo/vendor/bumpalo-3.9.1",
"dest-filename": ".cargo-checksum.json"
},
+ {
+ "type": "archive",
+ "archive-type": "tar-gzip",
+ "url": "https://static.crates.io/crates/byte-tools/byte-tools-0.3.1.crate",
+ "sha256": "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7",
+ "dest": "cargo/vendor/byte-tools-0.3.1"
+ },
+ {
+ "type": "inline",
+ "contents": "{\"package\": \"e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7\", \"files\": {}}",
+ "dest": "cargo/vendor/byte-tools-0.3.1",
+ "dest-filename": ".cargo-checksum.json"
+ },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -470,14 +496,14 @@
{
"type": "archive",
"archive-type": "tar-gzip",
- "url": "https://static.crates.io/crates/config/config-0.11.0.crate",
- "sha256": "1b1b9d958c2b1368a663f05538fc1b5975adce1e19f435acceae987aceeeb369",
- "dest": "cargo/vendor/config-0.11.0"
+ "url": "https://static.crates.io/crates/config/config-0.13.1.crate",
+ "sha256": "3ea917b74b6edfb5024e3b55d3c8f710b5f4ed92646429601a42e96f0812b31b",
+ "dest": "cargo/vendor/config-0.13.1"
},
{
"type": "inline",
- "contents": "{\"package\": \"1b1b9d958c2b1368a663f05538fc1b5975adce1e19f435acceae987aceeeb369\", \"files\": {}}",
- "dest": "cargo/vendor/config-0.11.0",
+ "contents": "{\"package\": \"3ea917b74b6edfb5024e3b55d3c8f710b5f4ed92646429601a42e96f0812b31b\", \"files\": {}}",
+ "dest": "cargo/vendor/config-0.13.1",
"dest-filename": ".cargo-checksum.json"
},
{
@@ -730,14 +756,14 @@
{
"type": "archive",
"archive-type": "tar-gzip",
- "url": "https://static.crates.io/crates/dashmap/dashmap-5.3.3.crate",
- "sha256": "391b56fbd302e585b7a9494fb70e40949567b1cf9003a8e4a6041a1687c26573",
- "dest": "cargo/vendor/dashmap-5.3.3"
+ "url": "https://static.crates.io/crates/dashmap/dashmap-5.3.4.crate",
+ "sha256": "3495912c9c1ccf2e18976439f4443f3fee0fd61f424ff99fde6a66b15ecb448f",
+ "dest": "cargo/vendor/dashmap-5.3.4"
},
{
"type": "inline",
- "contents": "{\"package\": \"391b56fbd302e585b7a9494fb70e40949567b1cf9003a8e4a6041a1687c26573\", \"files\": {}}",
- "dest": "cargo/vendor/dashmap-5.3.3",
+ "contents": "{\"package\": \"3495912c9c1ccf2e18976439f4443f3fee0fd61f424ff99fde6a66b15ecb448f\", \"files\": {}}",
+ "dest": "cargo/vendor/dashmap-5.3.4",
"dest-filename": ".cargo-checksum.json"
},
{
@@ -753,6 +779,19 @@
"dest": "cargo/vendor/deflate-1.0.0",
"dest-filename": ".cargo-checksum.json"
},
+ {
+ "type": "archive",
+ "archive-type": "tar-gzip",
+ "url": "https://static.crates.io/crates/digest/digest-0.8.1.crate",
+ "sha256": "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5",
+ "dest": "cargo/vendor/digest-0.8.1"
+ },
+ {
+ "type": "inline",
+ "contents": "{\"package\": \"f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5\", \"files\": {}}",
+ "dest": "cargo/vendor/digest-0.8.1",
+ "dest-filename": ".cargo-checksum.json"
+ },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -779,6 +818,19 @@
"dest": "cargo/vendor/dlib-0.5.0",
"dest-filename": ".cargo-checksum.json"
},
+ {
+ "type": "archive",
+ "archive-type": "tar-gzip",
+ "url": "https://static.crates.io/crates/dlv-list/dlv-list-0.3.0.crate",
+ "sha256": "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257",
+ "dest": "cargo/vendor/dlv-list-0.3.0"
+ },
+ {
+ "type": "inline",
+ "contents": "{\"package\": \"0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257\", \"files\": {}}",
+ "dest": "cargo/vendor/dlv-list-0.3.0",
+ "dest-filename": ".cargo-checksum.json"
+ },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -948,6 +1000,19 @@
"dest": "cargo/vendor/exr-1.4.2",
"dest-filename": ".cargo-checksum.json"
},
+ {
+ "type": "archive",
+ "archive-type": "tar-gzip",
+ "url": "https://static.crates.io/crates/fake-simd/fake-simd-0.1.2.crate",
+ "sha256": "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed",
+ "dest": "cargo/vendor/fake-simd-0.1.2"
+ },
+ {
+ "type": "inline",
+ "contents": "{\"package\": \"e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed\", \"files\": {}}",
+ "dest": "cargo/vendor/fake-simd-0.1.2",
+ "dest-filename": ".cargo-checksum.json"
+ },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -964,14 +1029,14 @@
{
"type": "archive",
"archive-type": "tar-gzip",
- "url": "https://static.crates.io/crates/flate2/flate2-1.0.23.crate",
- "sha256": "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af",
- "dest": "cargo/vendor/flate2-1.0.23"
+ "url": "https://static.crates.io/crates/flate2/flate2-1.0.24.crate",
+ "sha256": "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6",
+ "dest": "cargo/vendor/flate2-1.0.24"
},
{
"type": "inline",
- "contents": "{\"package\": \"b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af\", \"files\": {}}",
- "dest": "cargo/vendor/flate2-1.0.23",
+ "contents": "{\"package\": \"f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6\", \"files\": {}}",
+ "dest": "cargo/vendor/flate2-1.0.24",
"dest-filename": ".cargo-checksum.json"
},
{
@@ -1169,6 +1234,19 @@
"dest": "cargo/vendor/futures-util-0.3.21",
"dest-filename": ".cargo-checksum.json"
},
+ {
+ "type": "archive",
+ "archive-type": "tar-gzip",
+ "url": "https://static.crates.io/crates/generic-array/generic-array-0.12.4.crate",
+ "sha256": "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd",
+ "dest": "cargo/vendor/generic-array-0.12.4"
+ },
+ {
+ "type": "inline",
+ "contents": "{\"package\": \"ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd\", \"files\": {}}",
+ "dest": "cargo/vendor/generic-array-0.12.4",
+ "dest-filename": ".cargo-checksum.json"
+ },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -1650,6 +1728,19 @@
"dest": "cargo/vendor/js-sys-0.3.57",
"dest-filename": ".cargo-checksum.json"
},
+ {
+ "type": "archive",
+ "archive-type": "tar-gzip",
+ "url": "https://static.crates.io/crates/json5/json5-0.4.1.crate",
+ "sha256": "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1",
+ "dest": "cargo/vendor/json5-0.4.1"
+ },
+ {
+ "type": "inline",
+ "contents": "{\"package\": \"96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1\", \"files\": {}}",
+ "dest": "cargo/vendor/json5-0.4.1",
+ "dest-filename": ".cargo-checksum.json"
+ },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -1702,19 +1793,6 @@
"dest": "cargo/vendor/lebe-0.5.1",
"dest-filename": ".cargo-checksum.json"
},
- {
- "type": "archive",
- "archive-type": "tar-gzip",
- "url": "https://static.crates.io/crates/lexical-core/lexical-core-0.7.6.crate",
- "sha256": "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe",
- "dest": "cargo/vendor/lexical-core-0.7.6"
- },
- {
- "type": "inline",
- "contents": "{\"package\": \"6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe\", \"files\": {}}",
- "dest": "cargo/vendor/lexical-core-0.7.6",
- "dest-filename": ".cargo-checksum.json"
- },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -1793,6 +1871,19 @@
"dest": "cargo/vendor/malloc_buf-0.0.6",
"dest-filename": ".cargo-checksum.json"
},
+ {
+ "type": "archive",
+ "archive-type": "tar-gzip",
+ "url": "https://static.crates.io/crates/maplit/maplit-1.0.2.crate",
+ "sha256": "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d",
+ "dest": "cargo/vendor/maplit-1.0.2"
+ },
+ {
+ "type": "inline",
+ "contents": "{\"package\": \"3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d\", \"files\": {}}",
+ "dest": "cargo/vendor/maplit-1.0.2",
+ "dest-filename": ".cargo-checksum.json"
+ },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -2053,19 +2144,6 @@
"dest": "cargo/vendor/nohash-hasher-0.2.0",
"dest-filename": ".cargo-checksum.json"
},
- {
- "type": "archive",
- "archive-type": "tar-gzip",
- "url": "https://static.crates.io/crates/nom/nom-5.1.2.crate",
- "sha256": "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af",
- "dest": "cargo/vendor/nom-5.1.2"
- },
- {
- "type": "inline",
- "contents": "{\"package\": \"ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af\", \"files\": {}}",
- "dest": "cargo/vendor/nom-5.1.2",
- "dest-filename": ".cargo-checksum.json"
- },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -2144,19 +2222,6 @@
"dest": "cargo/vendor/num-rational-0.4.0",
"dest-filename": ".cargo-checksum.json"
},
- {
- "type": "archive",
- "archive-type": "tar-gzip",
- "url": "https://static.crates.io/crates/num-traits/num-traits-0.1.43.crate",
- "sha256": "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31",
- "dest": "cargo/vendor/num-traits-0.1.43"
- },
- {
- "type": "inline",
- "contents": "{\"package\": \"92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31\", \"files\": {}}",
- "dest": "cargo/vendor/num-traits-0.1.43",
- "dest-filename": ".cargo-checksum.json"
- },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -2261,6 +2326,19 @@
"dest": "cargo/vendor/once_cell-1.10.0",
"dest-filename": ".cargo-checksum.json"
},
+ {
+ "type": "archive",
+ "archive-type": "tar-gzip",
+ "url": "https://static.crates.io/crates/opaque-debug/opaque-debug-0.2.3.crate",
+ "sha256": "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c",
+ "dest": "cargo/vendor/opaque-debug-0.2.3"
+ },
+ {
+ "type": "inline",
+ "contents": "{\"package\": \"2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c\", \"files\": {}}",
+ "dest": "cargo/vendor/opaque-debug-0.2.3",
+ "dest-filename": ".cargo-checksum.json"
+ },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -2313,6 +2391,19 @@
"dest": "cargo/vendor/openssl-sys-0.9.73",
"dest-filename": ".cargo-checksum.json"
},
+ {
+ "type": "archive",
+ "archive-type": "tar-gzip",
+ "url": "https://static.crates.io/crates/ordered-multimap/ordered-multimap-0.4.3.crate",
+ "sha256": "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a",
+ "dest": "cargo/vendor/ordered-multimap-0.4.3"
+ },
+ {
+ "type": "inline",
+ "contents": "{\"package\": \"ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a\", \"files\": {}}",
+ "dest": "cargo/vendor/ordered-multimap-0.4.3",
+ "dest-filename": ".cargo-checksum.json"
+ },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -2391,6 +2482,19 @@
"dest": "cargo/vendor/parking_lot_core-0.9.3",
"dest-filename": ".cargo-checksum.json"
},
+ {
+ "type": "archive",
+ "archive-type": "tar-gzip",
+ "url": "https://static.crates.io/crates/pathdiff/pathdiff-0.2.1.crate",
+ "sha256": "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd",
+ "dest": "cargo/vendor/pathdiff-0.2.1"
+ },
+ {
+ "type": "inline",
+ "contents": "{\"package\": \"8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd\", \"files\": {}}",
+ "dest": "cargo/vendor/pathdiff-0.2.1",
+ "dest-filename": ".cargo-checksum.json"
+ },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -2404,6 +2508,58 @@
"dest": "cargo/vendor/percent-encoding-2.1.0",
"dest-filename": ".cargo-checksum.json"
},
+ {
+ "type": "archive",
+ "archive-type": "tar-gzip",
+ "url": "https://static.crates.io/crates/pest/pest-2.1.3.crate",
+ "sha256": "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53",
+ "dest": "cargo/vendor/pest-2.1.3"
+ },
+ {
+ "type": "inline",
+ "contents": "{\"package\": \"10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53\", \"files\": {}}",
+ "dest": "cargo/vendor/pest-2.1.3",
+ "dest-filename": ".cargo-checksum.json"
+ },
+ {
+ "type": "archive",
+ "archive-type": "tar-gzip",
+ "url": "https://static.crates.io/crates/pest_derive/pest_derive-2.1.0.crate",
+ "sha256": "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0",
+ "dest": "cargo/vendor/pest_derive-2.1.0"
+ },
+ {
+ "type": "inline",
+ "contents": "{\"package\": \"833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0\", \"files\": {}}",
+ "dest": "cargo/vendor/pest_derive-2.1.0",
+ "dest-filename": ".cargo-checksum.json"
+ },
+ {
+ "type": "archive",
+ "archive-type": "tar-gzip",
+ "url": "https://static.crates.io/crates/pest_generator/pest_generator-2.1.3.crate",
+ "sha256": "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55",
+ "dest": "cargo/vendor/pest_generator-2.1.3"
+ },
+ {
+ "type": "inline",
+ "contents": "{\"package\": \"99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55\", \"files\": {}}",
+ "dest": "cargo/vendor/pest_generator-2.1.3",
+ "dest-filename": ".cargo-checksum.json"
+ },
+ {
+ "type": "archive",
+ "archive-type": "tar-gzip",
+ "url": "https://static.crates.io/crates/pest_meta/pest_meta-2.1.3.crate",
+ "sha256": "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d",
+ "dest": "cargo/vendor/pest_meta-2.1.3"
+ },
+ {
+ "type": "inline",
+ "contents": "{\"package\": \"54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d\", \"files\": {}}",
+ "dest": "cargo/vendor/pest_meta-2.1.3",
+ "dest-filename": ".cargo-checksum.json"
+ },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -2511,14 +2667,14 @@
{
"type": "archive",
"archive-type": "tar-gzip",
- "url": "https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.38.crate",
- "sha256": "9027b48e9d4c9175fa2218adf3557f91c1137021739951d4932f5f8268ac48aa",
- "dest": "cargo/vendor/proc-macro2-1.0.38"
+ "url": "https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.39.crate",
+ "sha256": "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f",
+ "dest": "cargo/vendor/proc-macro2-1.0.39"
},
{
"type": "inline",
- "contents": "{\"package\": \"9027b48e9d4c9175fa2218adf3557f91c1137021739951d4932f5f8268ac48aa\", \"files\": {}}",
- "dest": "cargo/vendor/proc-macro2-1.0.38",
+ "contents": "{\"package\": \"c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f\", \"files\": {}}",
+ "dest": "cargo/vendor/proc-macro2-1.0.39",
"dest-filename": ".cargo-checksum.json"
},
{
@@ -2651,32 +2807,6 @@
"dest": "cargo/vendor/redox_syscall-0.2.13",
"dest-filename": ".cargo-checksum.json"
},
- {
- "type": "archive",
- "archive-type": "tar-gzip",
- "url": "https://static.crates.io/crates/regex/regex-1.5.5.crate",
- "sha256": "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286",
- "dest": "cargo/vendor/regex-1.5.5"
- },
- {
- "type": "inline",
- "contents": "{\"package\": \"1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286\", \"files\": {}}",
- "dest": "cargo/vendor/regex-1.5.5",
- "dest-filename": ".cargo-checksum.json"
- },
- {
- "type": "archive",
- "archive-type": "tar-gzip",
- "url": "https://static.crates.io/crates/regex-syntax/regex-syntax-0.6.25.crate",
- "sha256": "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b",
- "dest": "cargo/vendor/regex-syntax-0.6.25"
- },
- {
- "type": "inline",
- "contents": "{\"package\": \"f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b\", \"files\": {}}",
- "dest": "cargo/vendor/regex-syntax-0.6.25",
- "dest-filename": ".cargo-checksum.json"
- },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -2706,14 +2836,27 @@
{
"type": "archive",
"archive-type": "tar-gzip",
- "url": "https://static.crates.io/crates/rust-ini/rust-ini-0.13.0.crate",
- "sha256": "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2",
- "dest": "cargo/vendor/rust-ini-0.13.0"
+ "url": "https://static.crates.io/crates/ron/ron-0.7.0.crate",
+ "sha256": "1b861ecaade43ac97886a512b360d01d66be9f41f3c61088b42cedf92e03d678",
+ "dest": "cargo/vendor/ron-0.7.0"
},
{
"type": "inline",
- "contents": "{\"package\": \"3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2\", \"files\": {}}",
- "dest": "cargo/vendor/rust-ini-0.13.0",
+ "contents": "{\"package\": \"1b861ecaade43ac97886a512b360d01d66be9f41f3c61088b42cedf92e03d678\", \"files\": {}}",
+ "dest": "cargo/vendor/ron-0.7.0",
+ "dest-filename": ".cargo-checksum.json"
+ },
+ {
+ "type": "archive",
+ "archive-type": "tar-gzip",
+ "url": "https://static.crates.io/crates/rust-ini/rust-ini-0.18.0.crate",
+ "sha256": "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df",
+ "dest": "cargo/vendor/rust-ini-0.18.0"
+ },
+ {
+ "type": "inline",
+ "contents": "{\"package\": \"f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df\", \"files\": {}}",
+ "dest": "cargo/vendor/rust-ini-0.18.0",
"dest-filename": ".cargo-checksum.json"
},
{
@@ -2833,19 +2976,6 @@
"dest": "cargo/vendor/security-framework-sys-2.6.1",
"dest-filename": ".cargo-checksum.json"
},
- {
- "type": "archive",
- "archive-type": "tar-gzip",
- "url": "https://static.crates.io/crates/serde/serde-0.8.23.crate",
- "sha256": "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8",
- "dest": "cargo/vendor/serde-0.8.23"
- },
- {
- "type": "inline",
- "contents": "{\"package\": \"9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8\", \"files\": {}}",
- "dest": "cargo/vendor/serde-0.8.23",
- "dest-filename": ".cargo-checksum.json"
- },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -2859,19 +2989,6 @@
"dest": "cargo/vendor/serde-1.0.137",
"dest-filename": ".cargo-checksum.json"
},
- {
- "type": "archive",
- "archive-type": "tar-gzip",
- "url": "https://static.crates.io/crates/serde-hjson/serde-hjson-0.9.1.crate",
- "sha256": "6a3a4e0ea8a88553209f6cc6cfe8724ecad22e1acf372793c27d995290fe74f8",
- "dest": "cargo/vendor/serde-hjson-0.9.1"
- },
- {
- "type": "inline",
- "contents": "{\"package\": \"6a3a4e0ea8a88553209f6cc6cfe8724ecad22e1acf372793c27d995290fe74f8\", \"files\": {}}",
- "dest": "cargo/vendor/serde-hjson-0.9.1",
- "dest-filename": ".cargo-checksum.json"
- },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -2911,6 +3028,19 @@
"dest": "cargo/vendor/serde_urlencoded-0.7.1",
"dest-filename": ".cargo-checksum.json"
},
+ {
+ "type": "archive",
+ "archive-type": "tar-gzip",
+ "url": "https://static.crates.io/crates/sha-1/sha-1-0.8.2.crate",
+ "sha256": "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df",
+ "dest": "cargo/vendor/sha-1-0.8.2"
+ },
+ {
+ "type": "inline",
+ "contents": "{\"package\": \"f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df\", \"files\": {}}",
+ "dest": "cargo/vendor/sha-1-0.8.2",
+ "dest-filename": ".cargo-checksum.json"
+ },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -3080,19 +3210,6 @@
"dest": "cargo/vendor/sqlite3-sys-0.13.0",
"dest-filename": ".cargo-checksum.json"
},
- {
- "type": "archive",
- "archive-type": "tar-gzip",
- "url": "https://static.crates.io/crates/static_assertions/static_assertions-1.1.0.crate",
- "sha256": "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f",
- "dest": "cargo/vendor/static_assertions-1.1.0"
- },
- {
- "type": "inline",
- "contents": "{\"package\": \"a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f\", \"files\": {}}",
- "dest": "cargo/vendor/static_assertions-1.1.0",
- "dest-filename": ".cargo-checksum.json"
- },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -3148,27 +3265,27 @@
{
"type": "archive",
"archive-type": "tar-gzip",
- "url": "https://static.crates.io/crates/syn/syn-1.0.94.crate",
- "sha256": "a07e33e919ebcd69113d5be0e4d70c5707004ff45188910106854f38b960df4a",
- "dest": "cargo/vendor/syn-1.0.94"
+ "url": "https://static.crates.io/crates/syn/syn-1.0.96.crate",
+ "sha256": "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf",
+ "dest": "cargo/vendor/syn-1.0.96"
},
{
"type": "inline",
- "contents": "{\"package\": \"a07e33e919ebcd69113d5be0e4d70c5707004ff45188910106854f38b960df4a\", \"files\": {}}",
- "dest": "cargo/vendor/syn-1.0.94",
+ "contents": "{\"package\": \"0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf\", \"files\": {}}",
+ "dest": "cargo/vendor/syn-1.0.96",
"dest-filename": ".cargo-checksum.json"
},
{
"type": "archive",
"archive-type": "tar-gzip",
- "url": "https://static.crates.io/crates/sysinfo/sysinfo-0.23.12.crate",
- "sha256": "56b1e20ee77901236c389ff74618a899ff5fd34719a7ff0fd1d64f0acca5179a",
- "dest": "cargo/vendor/sysinfo-0.23.12"
+ "url": "https://static.crates.io/crates/sysinfo/sysinfo-0.24.2.crate",
+ "sha256": "9a2809487b962344ca55d9aea565f9ffbcb6929780802217acc82561f6746770",
+ "dest": "cargo/vendor/sysinfo-0.24.2"
},
{
"type": "inline",
- "contents": "{\"package\": \"56b1e20ee77901236c389ff74618a899ff5fd34719a7ff0fd1d64f0acca5179a\", \"files\": {}}",
- "dest": "cargo/vendor/sysinfo-0.23.12",
+ "contents": "{\"package\": \"9a2809487b962344ca55d9aea565f9ffbcb6929780802217acc82561f6746770\", \"files\": {}}",
+ "dest": "cargo/vendor/sysinfo-0.24.2",
"dest-filename": ".cargo-checksum.json"
},
{
@@ -3278,14 +3395,14 @@
{
"type": "archive",
"archive-type": "tar-gzip",
- "url": "https://static.crates.io/crates/tokio/tokio-1.18.2.crate",
- "sha256": "4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395",
- "dest": "cargo/vendor/tokio-1.18.2"
+ "url": "https://static.crates.io/crates/tokio/tokio-1.19.2.crate",
+ "sha256": "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439",
+ "dest": "cargo/vendor/tokio-1.19.2"
},
{
"type": "inline",
- "contents": "{\"package\": \"4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395\", \"files\": {}}",
- "dest": "cargo/vendor/tokio-1.18.2",
+ "contents": "{\"package\": \"c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439\", \"files\": {}}",
+ "dest": "cargo/vendor/tokio-1.19.2",
"dest-filename": ".cargo-checksum.json"
},
{
@@ -3418,6 +3535,32 @@
"dest": "cargo/vendor/ttf-parser-0.15.0",
"dest-filename": ".cargo-checksum.json"
},
+ {
+ "type": "archive",
+ "archive-type": "tar-gzip",
+ "url": "https://static.crates.io/crates/typenum/typenum-1.15.0.crate",
+ "sha256": "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987",
+ "dest": "cargo/vendor/typenum-1.15.0"
+ },
+ {
+ "type": "inline",
+ "contents": "{\"package\": \"dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987\", \"files\": {}}",
+ "dest": "cargo/vendor/typenum-1.15.0",
+ "dest-filename": ".cargo-checksum.json"
+ },
+ {
+ "type": "archive",
+ "archive-type": "tar-gzip",
+ "url": "https://static.crates.io/crates/ucd-trie/ucd-trie-0.1.3.crate",
+ "sha256": "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c",
+ "dest": "cargo/vendor/ucd-trie-0.1.3"
+ },
+ {
+ "type": "inline",
+ "contents": "{\"package\": \"56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c\", \"files\": {}}",
+ "dest": "cargo/vendor/ucd-trie-0.1.3",
+ "dest-filename": ".cargo-checksum.json"
+ },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -3431,6 +3574,19 @@
"dest": "cargo/vendor/unicode-bidi-0.3.8",
"dest-filename": ".cargo-checksum.json"
},
+ {
+ "type": "archive",
+ "archive-type": "tar-gzip",
+ "url": "https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.0.crate",
+ "sha256": "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee",
+ "dest": "cargo/vendor/unicode-ident-1.0.0"
+ },
+ {
+ "type": "inline",
+ "contents": "{\"package\": \"d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee\", \"files\": {}}",
+ "dest": "cargo/vendor/unicode-ident-1.0.0",
+ "dest-filename": ".cargo-checksum.json"
+ },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -3444,19 +3600,6 @@
"dest": "cargo/vendor/unicode-normalization-0.1.19",
"dest-filename": ".cargo-checksum.json"
},
- {
- "type": "archive",
- "archive-type": "tar-gzip",
- "url": "https://static.crates.io/crates/unicode-xid/unicode-xid-0.2.3.crate",
- "sha256": "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04",
- "dest": "cargo/vendor/unicode-xid-0.2.3"
- },
- {
- "type": "inline",
- "contents": "{\"package\": \"957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04\", \"files\": {}}",
- "dest": "cargo/vendor/unicode-xid-0.2.3",
- "dest-filename": ".cargo-checksum.json"
- },
{
"type": "archive",
"archive-type": "tar-gzip",
diff --git a/flatpak/io.github.philipk.boilr.appdata.xml b/flatpak/io.github.philipk.boilr.appdata.xml
index 9e2f022..06256db 100644
--- a/flatpak/io.github.philipk.boilr.appdata.xml
+++ b/flatpak/io.github.philipk.boilr.appdata.xml
@@ -25,8 +25,13 @@ https://hughsie.github.io/oars/index.html
-->
-
-
+
+
+
+ - Update all dependencies to latest versions
+
+
+
@@ -34,7 +39,6 @@ https://hughsie.github.io/oars/index.html
-
diff --git a/src/settings.rs b/src/settings.rs
index 90df663..fe06056 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -30,45 +30,36 @@ pub struct Settings {
impl Settings {
pub fn new() -> Result {
- let mut s = Config::new();
-
let default_str = include_str!("defaultconfig.toml");
- s.merge(File::from_str(default_str, config::FileFormat::Toml))?;
-
let config_file = get_config_file();
let config_file = config_file.to_string_lossy();
-
- // Start off by merging in the "default" configuration file
- s.merge(File::with_name(config_file.as_ref()).required(false))?;
-
- // Add in the current environment file
- // Default to 'development' env
- // Note that this file is _optional_
let env = env::var("RUN_MODE").unwrap_or_else(|_| "development".into());
- s.merge(File::with_name(&format!("config/{}", env)).required(false))?;
- // Add in a local configuration file
- // This file shouldn't be checked in to git
- s.merge(File::with_name("local.toml").required(false))?;
-
- // Add in settings from the environment (with a prefix of STEAMSYNC)
- // Eg.. `STEAMSYNC_DEBUG=1 ./target/app` would set the `debug` key
- s.merge(Environment::with_prefix("boilr").separator("-"))?;
-
- let mut result: Result = s.try_into();
-
- sanitize_auth_key(&mut result);
-
- result
+ let config = Config::builder()
+ .add_source(File::from_str(default_str, config::FileFormat::Toml))
+ // Start off by merging in the "default" configuration file
+ .add_source(File::with_name(config_file.as_ref()).required(false))
+ // Add in the current environment file
+ // Default to 'development' env
+ // Note that this file is _optional_
+ .add_source(File::with_name(&format!("config/{}", env)).required(false))
+ // Add in a local configuration file
+ // This file shouldn't be checked in to git
+ .add_source(File::with_name("local.toml").required(false))
+ // Add in settings from the environment (with a prefix of STEAMSYNC)
+ // Eg.. `STEAMSYNC_DEBUG=1 ./target/app` would set the `debug` key
+ .add_source(Environment::with_prefix("boilr").separator("-"))
+ .build()?;
+ let mut settings = config.try_deserialize::()?;
+ sanitize_auth_key(&mut settings);
+ Ok(settings)
}
}
-fn sanitize_auth_key(result: &mut Result) {
- if let Ok(result) = result.as_mut() {
- if let Some(auth_key) = result.steamgrid_db.auth_key.as_ref() {
- if auth_key == "Write your authentication key between these quotes" {
- result.steamgrid_db.auth_key = None;
- }
+fn sanitize_auth_key(result: &mut Settings) {
+ if let Some(auth_key) = result.steamgrid_db.auth_key.as_ref() {
+ if auth_key == "Write your authentication key between these quotes" {
+ result.steamgrid_db.auth_key = None;
}
}
}