From 5ffa83983f6183c033feecdb1a6643d9bcc6a7d4 Mon Sep 17 00:00:00 2001 From: "NGnius (Graham)" Date: Sat, 4 Feb 2023 16:19:00 -0500 Subject: [PATCH] Fix UI not updating when profile changes --- backend/limits_core/Cargo.lock | 4 +- backend/limits_srv/Cargo.lock | 142 ++++++++++----------- backend/src/api/handler.rs | 2 +- backend/src/main.rs | 2 +- backend/src/settings/detect/auto_detect.rs | 11 +- backend/src/settings/driver.rs | 13 +- backend/src/settings/general.rs | 16 ++- src/backend.ts | 4 + src/components/battery.tsx | 4 +- src/components/cpus.tsx | 4 +- src/components/debug.tsx | 2 +- src/components/gpu.tsx | 4 +- src/index.tsx | 12 +- 13 files changed, 114 insertions(+), 106 deletions(-) diff --git a/backend/limits_core/Cargo.lock b/backend/limits_core/Cargo.lock index 9eb5c72..80828d9 100644 --- a/backend/limits_core/Cargo.lock +++ b/backend/limits_core/Cargo.lock @@ -18,9 +18,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" dependencies = [ "unicode-ident", ] diff --git a/backend/limits_srv/Cargo.lock b/backend/limits_srv/Cargo.lock index 0bb3b66..97b4593 100644 --- a/backend/limits_srv/Cargo.lock +++ b/backend/limits_srv/Cargo.lock @@ -47,9 +47,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cfg-if" @@ -112,9 +112,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" dependencies = [ "futures-core", "futures-sink", @@ -122,27 +122,27 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" dependencies = [ "futures-core", "futures-sink", @@ -225,9 +225,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" dependencies = [ "libc", ] @@ -268,9 +268,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.23" +version = "0.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" dependencies = [ "bytes", "futures-channel", @@ -321,15 +321,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "libc" -version = "0.2.137" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "limits_core" @@ -412,9 +412,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ "hermit-abi", "libc", @@ -422,9 +422,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" [[package]] name = "percent-encoding" @@ -472,9 +472,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" dependencies = [ "unicode-ident", ] @@ -487,9 +487,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] @@ -553,9 +553,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" [[package]] name = "safemem" @@ -571,18 +571,18 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "serde" -version = "1.0.148" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.148" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55492425aa53521babf6137309e7d34c20bbfbbfcfe2c7f3a047fd1f6b92c0c" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", @@ -591,9 +591,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" dependencies = [ "itoa", "ryu", @@ -655,9 +655,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.104" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", @@ -680,18 +680,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", @@ -709,15 +709,15 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.22.0" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3" +checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" dependencies = [ "autocfg", "bytes", @@ -728,14 +728,14 @@ dependencies = [ "pin-project-lite", "socket2", "tokio-macros", - "winapi", + "windows-sys", ] [[package]] name = "tokio-macros" -version = "1.8.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2", "quote", @@ -808,9 +808,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "tungstenite" @@ -842,9 +842,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicase" @@ -857,15 +857,15 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "unicode-normalization" @@ -985,42 +985,42 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" diff --git a/backend/src/api/handler.rs b/backend/src/api/handler.rs index dc7d1e8..d4ec832 100644 --- a/backend/src/api/handler.rs +++ b/backend/src/api/handler.rs @@ -296,7 +296,7 @@ impl ApiMessageHandler { true } ApiMessage::LoadSystemSettings => { - settings.load_system_default(); + settings.load_system_default(settings.general.get_name().to_owned()); true }, ApiMessage::GetLimits(cb) => { diff --git a/backend/src/main.rs b/backend/src/main.rs index f335223..a1d598a 100644 --- a/backend/src/main.rs +++ b/backend/src/main.rs @@ -60,7 +60,7 @@ fn main() -> Result<(), ()> { let mut loaded_settings = persist::SettingsJson::open(utility::settings_dir().join(DEFAULT_SETTINGS_FILE)) .map(|settings| settings::Settings::from_json(settings, DEFAULT_SETTINGS_FILE.into())) - .unwrap_or_else(|_| settings::Settings::system_default(DEFAULT_SETTINGS_FILE.into())); + .unwrap_or_else(|_| settings::Settings::system_default(DEFAULT_SETTINGS_FILE.into(), DEFAULT_SETTINGS_NAME.into())); log::debug!("Settings: {:?}", loaded_settings); diff --git a/backend/src/settings/detect/auto_detect.rs b/backend/src/settings/detect/auto_detect.rs index d048b8a..1dae5ca 100644 --- a/backend/src/settings/detect/auto_detect.rs +++ b/backend/src/settings/detect/auto_detect.rs @@ -28,7 +28,7 @@ fn get_limits() -> limits_core::json::Base { #[inline] pub fn auto_detect_provider() -> DriverJson { - let provider = auto_detect0(None, crate::utility::settings_dir().join("autodetect.json")) + let provider = auto_detect0(None, crate::utility::settings_dir().join("autodetect.json"), "".to_owned()) .battery .provider(); //log::info!("Detected device automatically, compatible driver: {:?}", provider); @@ -36,8 +36,8 @@ pub fn auto_detect_provider() -> DriverJson { } /// Device detection logic -pub fn auto_detect0(settings_opt: Option, json_path: std::path::PathBuf) -> Driver { - let mut builder = DriverBuilder::new(json_path); +pub fn auto_detect0(settings_opt: Option, json_path: std::path::PathBuf, name: String) -> Driver { + let mut builder = DriverBuilder::new(json_path, name); let cpu_info: String = usdpl_back::api::files::read_single("/proc/cpuinfo").unwrap_or_default(); log::debug!("Read from /proc/cpuinfo:\n{}", cpu_info); @@ -92,6 +92,7 @@ pub fn auto_detect0(settings_opt: Option, json_path: std::path::Pa if matches { if let Some(settings) = &settings_opt { *builder.general.persistent() = true; + builder.general.name(settings.name.clone()); for limit in conf.limits { match limit { Limits::Cpu(cpus) => { @@ -175,12 +176,12 @@ struct DriverBuilder { } impl DriverBuilder { - fn new(json_path: std::path::PathBuf) -> Self { + fn new(json_path: std::path::PathBuf, profile_name: String) -> Self { Self { general: Box::new(General { persistent: false, path: json_path, - name: crate::consts::DEFAULT_SETTINGS_NAME.to_owned(), + name: profile_name, driver: DriverJson::AutoDetect, }), cpus: None, diff --git a/backend/src/settings/driver.rs b/backend/src/settings/driver.rs index 59deec3..7ff742d 100644 --- a/backend/src/settings/driver.rs +++ b/backend/src/settings/driver.rs @@ -27,6 +27,7 @@ impl Driver { } fn version0(settings: SettingsJson, json_path: std::path::PathBuf) -> Result { + let name = settings.name.clone(); if let Some(provider) = &settings.provider { match provider { DriverJson::SteamDeck => Ok(Self { @@ -52,17 +53,17 @@ impl Driver { gpu: Box::new(super::steam_deck::Gpu::from_json(settings.gpu, settings.version)), battery: Box::new(super::steam_deck::Battery::from_json(settings.battery, settings.version)), }), - DriverJson::Generic | DriverJson::GenericAMD => Ok(super::detect::auto_detect0(Some(settings), json_path)), - DriverJson::Unknown => Ok(super::detect::auto_detect0(Some(settings), json_path)), - DriverJson::AutoDetect => Ok(super::detect::auto_detect0(Some(settings), json_path)), + DriverJson::Generic | DriverJson::GenericAMD => Ok(super::detect::auto_detect0(Some(settings), json_path, name)), + DriverJson::Unknown => Ok(super::detect::auto_detect0(Some(settings), json_path, name)), + DriverJson::AutoDetect => Ok(super::detect::auto_detect0(Some(settings), json_path, name)), } } else { - Ok(super::detect::auto_detect0(Some(settings), json_path)) + Ok(super::detect::auto_detect0(Some(settings), json_path, name)) } } - pub fn system_default(json_path: std::path::PathBuf) -> Self { - auto_detect0(None, json_path) + pub fn system_default(json_path: std::path::PathBuf, name: String) -> Self { + auto_detect0(None, json_path, name) } } diff --git a/backend/src/settings/general.rs b/backend/src/settings/general.rs index 42eecfa..2279f4f 100644 --- a/backend/src/settings/general.rs +++ b/backend/src/settings/general.rs @@ -103,6 +103,7 @@ impl OnSet for Settings { impl Settings { #[inline] pub fn from_json(other: SettingsJson, json_path: PathBuf) -> Self { + let name_bup = other.name.clone(); match super::Driver::init(other, json_path.clone()) { Ok(x) => { log::info!("Loaded settings with drivers general:{:?},cpus:{:?},gpu:{:?},battery:{:?}", x.general.provider(), x.cpus.provider(), x.gpu.provider(), x.battery.provider()); @@ -115,13 +116,13 @@ impl Settings { }, Err(e) => { log::error!("Driver init error: {}", e); - Self::system_default(json_path) + Self::system_default(json_path, name_bup) } } } - pub fn system_default(json_path: PathBuf) -> Self { - let driver = super::Driver::system_default(json_path); + pub fn system_default(json_path: PathBuf, name: String) -> Self { + let driver = super::Driver::system_default(json_path, name); Self { general: driver.general, cpus: driver.cpus, @@ -130,8 +131,8 @@ impl Settings { } } - pub fn load_system_default(&mut self) { - let driver = super::Driver::system_default(self.general.get_path().to_owned()); + pub fn load_system_default(&mut self, name: String) { + let driver = super::Driver::system_default(self.general.get_path().to_owned(), name); self.cpus = driver.cpus; self.gpu = driver.gpu; self.battery = driver.battery; @@ -168,10 +169,11 @@ impl Settings { } } else { if system_defaults { - self.load_system_default(); + self.load_system_default(name); + } else { + self.general.name(name); } *self.general.persistent() = false; - self.general.name(name); } self.general.path(json_path); Ok(*self.general.persistent()) diff --git a/src/backend.ts b/src/backend.ts index 55d05c8..f1bada4 100644 --- a/src/backend.ts +++ b/src/backend.ts @@ -41,6 +41,10 @@ export async function initBackend() { //setReady(true); } +export type IdcProps = { + idc: any; +} + // API limit types export type RangeLimit = { diff --git a/src/components/battery.tsx b/src/components/battery.tsx index 7008156..3534fdf 100644 --- a/src/components/battery.tsx +++ b/src/components/battery.tsx @@ -22,8 +22,8 @@ import { } from "../consts"; import { set_value, get_value} from "usdpl-front"; -export class Battery extends Component<{}> { - constructor(props: {}) { +export class Battery extends Component { + constructor(props: backend.IdcProps) { super(props); this.state = { reloadThingy: "/shrug", diff --git a/src/components/cpus.tsx b/src/components/cpus.tsx index 2b9a60d..778f821 100644 --- a/src/components/cpus.tsx +++ b/src/components/cpus.tsx @@ -30,8 +30,8 @@ interface CpuState { let advancedMode = false; let advancedCpu = 1; -export class Cpus extends Component<{}, CpuState> { - constructor(props: {}) { +export class Cpus extends Component { + constructor(props: backend.IdcProps) { super(props); this.state = { reloadThingy: "/shrug", diff --git a/src/components/debug.tsx b/src/components/debug.tsx index d942200..f76a7e4 100644 --- a/src/components/debug.tsx +++ b/src/components/debug.tsx @@ -17,7 +17,7 @@ import { get_value, target_usdpl, version_usdpl} from "usdpl-front"; let eggCount = 0; -export class Debug extends Component<{}> { +export class Debug extends Component { render() { return buildDebug(); } diff --git a/src/components/gpu.tsx b/src/components/gpu.tsx index 7e432c7..e9569c8 100644 --- a/src/components/gpu.tsx +++ b/src/components/gpu.tsx @@ -18,8 +18,8 @@ import { } from "../consts"; import { set_value, get_value} from "usdpl-front"; -export class Gpu extends Component<{}> { - constructor(props: {}) { +export class Gpu extends Component { + constructor(props: backend.IdcProps) { super(props); this.state = { reloadThingy: "/shrug", diff --git a/src/index.tsx b/src/index.tsx index ea9eee3..4b0d5cb 100755 --- a/src/index.tsx +++ b/src/index.tsx @@ -115,7 +115,7 @@ const reload = function() { set_value(ONLINE_STATUS_CPUS, statii); const count = countCpus(statii); set_value(ONLINE_CPUS, count); - set_value(SMT_CPU, statii.length > 3 && statii[0] == statii[1] && statii[2] == statii[3]); + //set_value(SMT_CPU, statii.length > 3 && statii[0] == statii[1] && statii[2] == statii[3]); }); backend.resolve(backend.getCpuSmt(), (smt: boolean) => { set_value(SMT_CPU, smt); @@ -198,7 +198,7 @@ const periodicals = function() { const Content: VFC<{ serverAPI: ServerAPI }> = ({}) => { - const [_idc, reloadGUI] = useState("/shrug"); + const [idc, reloadGUI] = useState("/shrug"); if (periodicHook != null) { clearInterval(periodicHook); @@ -212,11 +212,11 @@ const Content: VFC<{ serverAPI: ServerAPI }> = ({}) => { return ( - + - + - + {/* Persistence */} @@ -244,7 +244,7 @@ const Content: VFC<{ serverAPI: ServerAPI }> = ({}) => { - +