diff --git a/Cargo.lock b/Cargo.lock index ec499cf..9ee4537 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -381,12 +381,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "aster" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258989846dd255a1e0eeef92d425d345477c9999433cecc9f0879f4549d5e5c9" - [[package]] name = "async-trait" version = "0.1.89" @@ -1789,6 +1783,7 @@ dependencies = [ "iota-state", "iota-storage", "iota-terms", + "iota-updater", "iota-util", "json", "omikron-connector", @@ -1809,6 +1804,8 @@ version = "0.1.0" dependencies = [ "iota-state", "iota-util", + "json", + "once_cell", "ratatui", "ttp-core", ] @@ -1865,7 +1862,7 @@ dependencies = [ ] [[package]] -name = "iota-util" +name = "iota-updater" version = "0.1.0" dependencies = [ "aes-gcm", @@ -1873,15 +1870,16 @@ dependencies = [ "base64", "hex", "hkdf", + "iota-logger", "json", "once_cell", "pnet", "rand_core 0.6.4", "ratatui", "reqwest", + "self-replace", "semver", "serde", - "serde_macros", "sha2", "sysinfo", "tempfile", @@ -1894,6 +1892,27 @@ dependencies = [ "zip", ] +[[package]] +name = "iota-util" +version = "0.1.0" +dependencies = [ + "aes-gcm", + "base64", + "hex", + "hkdf", + "rand_core 0.6.4", + "reqwest", + "sha2", + "sysinfo", + "tokio", + "ttp-core", + "ttp-native", + "uuid", + "walkdir", + "x448", + "zip", +] + [[package]] name = "ipnet" version = "2.12.0" @@ -2821,30 +2840,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "quasi" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94a532453b931a4483a5b2e40f0fe04aee35b6bc2c0eeec876f1bd2358a134d3" - -[[package]] -name = "quasi_codegen" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb4a9a5410fdbdacbeda8063ddb8add9838dfd4cf50ac486db98abb762d8bd6" -dependencies = [ - "aster", -] - -[[package]] -name = "quasi_macros" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc2b36285ea5e54e4e267f83896267ff8c5aba4f66b2e7d186ed6d968f3715f" -dependencies = [ - "quasi_codegen", -] - [[package]] name = "quinn" version = "0.11.9" @@ -3394,6 +3389,17 @@ dependencies = [ "libc", ] +[[package]] +name = "self-replace" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03ec815b5eab420ab893f63393878d89c90fdd94c0bcc44c07abb8ad95552fb7" +dependencies = [ + "fastrand", + "tempfile", + "windows-sys 0.52.0", +] + [[package]] name = "semver" version = "1.0.28" @@ -3410,24 +3416,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde_codegen" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da68810d845f8e33a80243c28794650397056cbe7aea4c9c7516f55d1061c94e" -dependencies = [ - "aster", - "quasi", - "quasi_macros", - "serde_codegen_internals", -] - -[[package]] -name = "serde_codegen_internals" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b0115c5c602e81c61b787fb0f0fa76a614f8dbe9100b2b59b7d590155672c80" - [[package]] name = "serde_core" version = "1.0.228" @@ -3461,15 +3449,6 @@ dependencies = [ "zmij", ] -[[package]] -name = "serde_macros" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3cf1c01933271e1e72bb788e0499d1bca8af2c09efcc3ddc0b04ff22d080b83" -dependencies = [ - "serde_codegen", -] - [[package]] name = "serde_urlencoded" version = "0.7.1" diff --git a/iota-core/Cargo.toml b/iota-core/Cargo.toml index acb6c34..a1f6de1 100644 --- a/iota-core/Cargo.toml +++ b/iota-core/Cargo.toml @@ -9,6 +9,7 @@ iota-logger = { path = "../iota-logger" } iota-state = { path = "../iota-state" } iota-storage = { path = "../iota-storage" } iota-terms = { path = "../iota-terms" } +iota-updater = { path = "../iota-updater" } iota-util = { path = "../iota-util" } omikron-connector = { path = "../omikron-connector" } web-server = { path = "../web-server" } diff --git a/iota-core/src/main.rs b/iota-core/src/main.rs index 209518f..af76140 100644 --- a/iota-core/src/main.rs +++ b/iota-core/src/main.rs @@ -1,5 +1,5 @@ mod consent_state; -use iota_util::update_util::check_update; +use iota_updater::check_update; use pnet::datalink::NetworkInterface; use tokio::time::{Duration, sleep}; @@ -7,12 +7,11 @@ use iota_state::{ACTIVE_TASKS, APP_STATE, AppState, RELOAD, SHUTDOWN}; use iota_cli::screens::main_screen::MainScreen; use iota_cli::ui::start_tui; -use iota_logger as logger; +use iota_logger::{self as logger, language_creator}; use iota_logger::{log, log_t}; use iota_storage::users::user_manager; use iota_storage::util::config_util::CONFIG; use iota_util::file_util::{download_and_extract_zip, has_dir}; -use iota_util::langu::language_creator; use omikron_connector as omikron; #[tokio::main(flavor = "multi_thread", worker_threads = 16)] diff --git a/iota-logger/src/lib.rs b/iota-logger/src/lib.rs index 5e45c1e..afc9c0b 100644 --- a/iota-logger/src/lib.rs +++ b/iota-logger/src/lib.rs @@ -12,8 +12,8 @@ use ratatui::style::Color; use ttp_core::{CommunicationValue, DataTypes, DataValue}; use iota_state::{APP_STATE, UNIQUE, UiLogEntry}; -mod language_creator; -mod language_manager; +pub mod language_creator; +pub mod language_manager; static LOGGER: OnceLock> = OnceLock::new();