From a9a965462a74922c67daa4a8550fb0b8aba8f78c Mon Sep 17 00:00:00 2001 From: futile Date: Fri, 5 Sep 2025 13:24:16 +0100 Subject: [PATCH] random small fixes --- src/gui/app.rs | 8 ++------ src/gui/run.rs | 2 +- src/util/codeberg.rs | 8 +++++++- src/util/log.rs | 2 +- src/util/meta.rs | 13 +++++-------- 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/gui/app.rs b/src/gui/app.rs index c277724..eba534a 100644 --- a/src/gui/app.rs +++ b/src/gui/app.rs @@ -1,10 +1,6 @@ use crate::{ features, - gui::{ - settings::{Settings, Theme}, - tools, - ui_ext::UiExt, - }, + gui::{settings::Settings, tools, ui_ext::UiExt}, util::{consts::game::WINDOW_TITLE, meta::Meta, persistent_state::PersistentState, win}, }; use eframe::egui; @@ -217,7 +213,7 @@ impl App { ui.label("with "); ui.hyperlink_to("❤", "https://codeberg.org/futile/gta-tools"); ui.label(" from "); - ui.hyperlink_to("futile", "http://futile.eu"); + ui.hyperlink_to("futile", "https://futile.eu"); }); ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { ui.label(format!( diff --git a/src/gui/run.rs b/src/gui/run.rs index 41a852f..50cef21 100644 --- a/src/gui/run.rs +++ b/src/gui/run.rs @@ -10,7 +10,7 @@ use eframe::egui; fn panic_hook(panic_info: &std::panic::PanicHookInfo<'_>) { let backtrace = std::backtrace::Backtrace::capture(); let message = format!("{panic_info}\nstack backtrace:\n{backtrace}\n"); - log::log(log::LogLevel::Panic, message); + log::log(log::LogLevel::Panic, &message); } fn app_creator( diff --git a/src/util/codeberg.rs b/src/util/codeberg.rs index f5d4e1a..585da62 100644 --- a/src/util/codeberg.rs +++ b/src/util/codeberg.rs @@ -1,5 +1,6 @@ use semver::Version; use serde::Deserialize; +use std::time::Duration; const APP_USER_AGENT: &str = concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION")); const CODEBERG_ENDPOINT_ROOT: &str = "https://codeberg.org/api/v1"; @@ -32,7 +33,12 @@ struct Asset { pub fn get_latest_release() -> Result> { let request_url = format!("{CODEBERG_ENDPOINT_ROOT}/repos/futile/gta-tools/releases/latest"); - let mut response = ureq::get(request_url).header("User-Agent", APP_USER_AGENT).call()?; + let mut response = ureq::get(request_url) + .config() + .timeout_global(Some(Duration::from_secs(10))) + .user_agent(APP_USER_AGENT) + .build() + .call()?; let body = response.body_mut(); let json = body.read_json::()?; let tag_name = json.tag_name; diff --git a/src/util/log.rs b/src/util/log.rs index 906d824..d0e8d42 100644 --- a/src/util/log.rs +++ b/src/util/log.rs @@ -8,7 +8,7 @@ pub enum LogLevel { Panic, } -pub fn log(level: LogLevel, message: String) { +pub fn log(level: LogLevel, message: &str) { let mut file = File::options() .create(true) .append(true) diff --git a/src/util/meta.rs b/src/util/meta.rs index 59fa5f0..c3d4f28 100644 --- a/src/util/meta.rs +++ b/src/util/meta.rs @@ -11,14 +11,11 @@ pub struct Meta { impl Default for Meta { fn default() -> Self { let current_version = Version::parse(env!("CARGO_PKG_VERSION")).unwrap(); - let latest_release = match codeberg::get_latest_release() { - Ok(release) => release, - Err(why) => { - let message = format!("failed to get latest codeberg release:\n{why}"); - log::log(log::LogLevel::Error, message); - codeberg::Release::default() - } - }; + let latest_release = codeberg::get_latest_release().unwrap_or_else(|why| { + let message = format!("failed to get latest codeberg release:\n{why}"); + log::log(log::LogLevel::Error, &message); + codeberg::Release::default() + }); let newer_version_available = matches!( ¤t_version.cmp_precedence(&latest_release.version), std::cmp::Ordering::Less