diff --git a/owmods_gui/backend/src/logging.rs b/owmods_gui/backend/src/logging.rs index bf030cb7..dbecbb1c 100644 --- a/owmods_gui/backend/src/logging.rs +++ b/owmods_gui/backend/src/logging.rs @@ -4,6 +4,7 @@ use std::{ sync::{Arc, Mutex}, }; +use crate::format_description; use anyhow::Result; use log::{warn, Level, STATIC_MAX_LEVEL}; use owmods_core::file::get_app_path; @@ -11,7 +12,6 @@ use owmods_core::progress::ProgressPayload; use serde::Serialize; use std::fs::create_dir_all; use tauri::{async_runtime, AppHandle, Manager}; -use crate::format_description; use time::OffsetDateTime; use typeshare::typeshare; diff --git a/xtask/src/gui_disable_updater.rs b/xtask/src/gui_disable_updater.rs index e547c5ba..2e814d48 100644 --- a/xtask/src/gui_disable_updater.rs +++ b/xtask/src/gui_disable_updater.rs @@ -1,9 +1,8 @@ - use std::process::Command; use anyhow::Result; -use serde_json::{Value, from_str}; -use toml_edit::{Document, value}; +use serde_json::{from_str, Value}; +use toml_edit::{value, Document}; const GUI_TAURI_CONF_PATH: &str = "owmods_gui/backend/tauri.conf.json"; const GUI_CARGO_TOML_PATH: &str = "owmods_gui/backend/Cargo.toml"; @@ -13,14 +12,19 @@ pub fn disable_updater() -> Result<()> { // tauri.conf.json let tauri_conf = std::fs::read_to_string(GUI_TAURI_CONF_PATH)?; let mut tauri_conf: Value = from_str(&tauri_conf)?; - tauri_conf["tauri"]["updater"]["active"] = false.into(); + tauri_conf["tauri"]["updater"]["active"] = false.into(); // Cargo.toml let cargo_toml = std::fs::read_to_string(GUI_CARGO_TOML_PATH)?; let mut cargo_toml = cargo_toml.parse::()?; - let mut features = cargo_toml["dependencies"]["tauri"]["features"].as_array_mut().unwrap(); + let mut features = cargo_toml["dependencies"]["tauri"]["features"] + .as_array_mut() + .unwrap(); features.retain(|f| f.as_str().unwrap() != "updater"); // Write to files - std::fs::write(GUI_TAURI_CONF_PATH, serde_json::to_string_pretty(&tauri_conf)?)?; + std::fs::write( + GUI_TAURI_CONF_PATH, + serde_json::to_string_pretty(&tauri_conf)?, + )?; std::fs::write(GUI_CARGO_TOML_PATH, cargo_toml.to_string())?; println!("Refetching dependencies..."); diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 7689c44d..276c87da 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -2,17 +2,16 @@ use std::path::PathBuf; use anyhow::Result; use cli_tasks::{generate_cli_pkg_build, generate_completions, generate_man_files, print_version}; -use gui_tasks::generate_gui_pkg_build; use gui_disable_updater::disable_updater; +use gui_tasks::generate_gui_pkg_build; use regex::RegexBuilder; mod cli_tasks; -mod gui_tasks; mod gui_disable_updater; +mod gui_tasks; mod log_client; mod log_spammer; - pub fn get_out_dir() -> Result { let out_dir = std::path::PathBuf::from(std::env::var_os("CARGO_MANIFEST_DIR").unwrap()) .parent()