From 3debcb5e731715bd0ec7f33a36f497d67fa4605c Mon Sep 17 00:00:00 2001 From: Raytwo Date: Fri, 11 Oct 2024 17:12:00 +0200 Subject: [PATCH] Disable updater for the time being --- Cargo.toml | 12 +++++++++--- crates/config/src/lib.rs | 2 -- src/lib.rs | 27 +++++++++++++-------------- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5d3ed03e6..11f9b52a7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "arcropolis" -version = "4.0.3" +version = "4.0.4" authors = ["Raytwo , blujay , jam1garner , CoolSonicKirby "] edition = "2018" @@ -22,7 +22,7 @@ walkdir = "2.3.3" thiserror = "1.0.43" camino = "1" # Switch utilities -skyline = { git = "https://github.com/Raytwo/skyline-rs", branch="preview" } +skyline = { git = "https://github.com/ultimate-research/skyline-rs" } skyline-config = { git = "https://github.com/skyline-rs/skyline-config" } # For the updater zip = { version = "0.6", default-features = false, features = ["deflate"], optional = true } @@ -70,7 +70,7 @@ menus = { path = "crates/menus", optional = true } native-tls = { git = "https://github.com/skyline-rs/rust-native-tls", rev = "f202fca" } [features] -default = ["online", "ui"] +default = ["ui"] online = ["zip", "gh-updater", "minreq"] ui = ["menus"] @@ -80,3 +80,9 @@ panic = "abort" [profile.release] panic = "abort" lto = true +opt-level = 1 +incremental = true +debug = 1 + +[profile.release.package."*"] +opt-level = 3 \ No newline at end of file diff --git a/crates/config/src/lib.rs b/crates/config/src/lib.rs index cb5f48257..839901883 100644 --- a/crates/config/src/lib.rs +++ b/crates/config/src/lib.rs @@ -1,5 +1,3 @@ -#![feature(lazy_cell)] - use std::{ collections::{HashMap, HashSet}, path::PathBuf, diff --git a/src/lib.rs b/src/lib.rs index 3a0857616..63421bbb0 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -7,7 +7,6 @@ #![feature(string_remove_matches)] // #![feature(fs_try_exists)] #![feature(int_roundings)] -#![feature(lazy_cell)] use std::{ collections::HashMap, fmt, io::{BufWriter, Write}, path::{Path, PathBuf}, str::FromStr, sync::{LazyLock, RwLock} @@ -238,17 +237,17 @@ fn initial_loading(_ctx: &InlineCtx) { check_for_changelog(); // Begin checking if there is an update to do. We do this in a separate thread so that we can install the hooks while we are waiting on GitHub response - #[cfg(feature = "online")] - let _updater = std::thread::Builder::new() - .stack_size(0x10000) - .spawn(|| { - unsafe { - let curr_thread = nn::os::GetCurrentThread(); - nn::os::ChangeThreadPriority(curr_thread, 16); - } - check_for_update(); - }) - .unwrap(); + // #[cfg(feature = "online")] + // let _updater = std::thread::Builder::new() + // .stack_size(0x10000) + // .spawn(|| { + // unsafe { + // let curr_thread = nn::os::GetCurrentThread(); + // nn::os::ChangeThreadPriority(curr_thread, 16); + // } + // check_for_update(); + // }) + // .unwrap(); // Commented out until we get an actual news server // #[cfg(feature = "online")] @@ -287,8 +286,8 @@ fn initial_loading(_ctx: &InlineCtx) { fuse::mods::install_mod_fs(); api::event::send_event(Event::ModFilesystemMounted); - #[cfg(feature = "online")] - _updater.join().unwrap(); + // #[cfg(feature = "online")] + // _updater.join().unwrap(); } #[skyline::hook(offset = offsets::title_screen_version())]