diff --git a/egui_client/Cargo.lock b/egui_client/Cargo.lock index 6be625e..cf31503 100644 --- a/egui_client/Cargo.lock +++ b/egui_client/Cargo.lock @@ -1432,7 +1432,6 @@ dependencies = [ name = "rusty_hub" version = "0.1.0" dependencies = [ - "confy", "exe", "registry", "serde", @@ -1444,6 +1443,7 @@ dependencies = [ name = "rusty_hub_egui" version = "0.1.0" dependencies = [ + "confy", "eframe", "image", "rusty_hub", diff --git a/egui_client/Cargo.toml b/egui_client/Cargo.toml index cb2220b..803a02b 100644 --- a/egui_client/Cargo.toml +++ b/egui_client/Cargo.toml @@ -14,6 +14,7 @@ opt-level = 2 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +confy = "^0.5.0" eframe = "0.19.0" rusty_hub = { path="../rusty_hub" } image = { version = "0.24.0", default-features = false, features = ["png"] } \ No newline at end of file diff --git a/egui_client/src/main.rs b/egui_client/src/main.rs index 4d04f11..64ad55d 100644 --- a/egui_client/src/main.rs +++ b/egui_client/src/main.rs @@ -1,5 +1,5 @@ #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release - +extern crate confy; use eframe::{egui, IconData, NativeOptions}; use rusty_hub::hub::Hub; use std::io::Cursor; @@ -70,7 +70,7 @@ impl MyApp { fn new(cc: &eframe::CreationContext<'_>) -> Self { setup_custom_fonts(&cc.egui_ctx); Self { - hub: Hub::default(), + hub: confy::load("lwa_unity_hub", "config").unwrap(), } } } diff --git a/rusty_hub/Cargo.lock b/rusty_hub/Cargo.lock index b15ad7a..9c11174 100644 --- a/rusty_hub/Cargo.lock +++ b/rusty_hub/Cargo.lock @@ -44,12 +44,6 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -71,18 +65,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "confy" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5069e3065d9ad485706017d12bb4b4318170b8087358c163c2dfce50b6b38275" -dependencies = [ - "directories", - "serde", - "thiserror", - "toml", -] - [[package]] name = "core-foundation-sys" version = "0.8.3" @@ -107,27 +89,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "directories" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c" -dependencies = [ - "cfg-if 0.1.10", - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - [[package]] name = "exe" version = "0.5.4" @@ -156,17 +117,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "getrandom" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - [[package]] name = "hex" version = "0.4.3" @@ -207,7 +157,7 @@ version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -290,26 +240,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom", - "redox_syscall", - "thiserror", -] - [[package]] name = "registry" version = "1.2.2" @@ -327,7 +257,6 @@ dependencies = [ name = "rusty_hub" version = "0.1.0" dependencies = [ - "confy", "exe", "registry", "serde", @@ -368,7 +297,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ "block-buffer", - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", "opaque-debug", @@ -381,7 +310,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer", - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", "opaque-debug", @@ -425,19 +354,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", - "wasi 0.10.0+wasi-snapshot-preview1", + "wasi", "winapi", ] -[[package]] -name = "toml" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -dependencies = [ - "serde", -] - [[package]] name = "typenum" version = "1.15.0" @@ -479,19 +399,13 @@ version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - [[package]] name = "wasm-bindgen" version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] diff --git a/rusty_hub/Cargo.toml b/rusty_hub/Cargo.toml index abda01b..e6dc475 100644 --- a/rusty_hub/Cargo.toml +++ b/rusty_hub/Cargo.toml @@ -14,7 +14,6 @@ opt-level = 2 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -confy = "^0.5.0" serde = "^1.0" serde_derive = "^1.0" walkdir = "^2.3.2" diff --git a/rusty_hub/src/lib.rs b/rusty_hub/src/lib.rs index 379f6fb..3ea922f 100644 --- a/rusty_hub/src/lib.rs +++ b/rusty_hub/src/lib.rs @@ -1,6 +1,5 @@ #[macro_use] extern crate serde_derive; -extern crate confy; pub mod config; pub mod hub;