Ecosystem/gupaxx
1
0
Fork 0
mirror of https://github.com/Cyrix126/gupaxx.git synced 2025-01-02 20:19:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: use human time on multiple lines for everything.

Browse source
This commit is contained in:
Cyrix126 2024-12-12 00:31:42 +01:00
parent 6ff16af175
commit f5b765c55f
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/app/panels/middle/about.rs
View file

@ -147,7 +147,7 @@ path_xmr: {:#?}\n
)); ));
} }
ui.label(format!( ui.label(format!(
"Gupaxx has been running for {}", "Gupaxx has been running for\n{}",
self.pub_sys.lock().unwrap().gupax_uptime self.pub_sys.lock().unwrap().gupax_uptime
)); ));
}); });

6
src/app/panels/middle/status/processes.rs
View file

@ -1,5 +1,4 @@
use egui::{ScrollArea, Ui}; use egui::{ScrollArea, Ui};
use readable::up::UptimeFull;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use crate::app::eframe_impl::ProcessStatesGui; use crate::app::eframe_impl::ProcessStatesGui;
@ -42,7 +41,6 @@ impl Status {
ui.set_width(width_column); ui.set_width(width_column);
ui.set_height(height_column); ui.set_height(height_column);
ui.vertical_centered(|ui| { ui.vertical_centered(|ui| {
// ui.set_min_width(ui.text_style_height(&TextStyle::Body) * 2.0);
gupax(ui, sys); gupax(ui, sys);
}); });
}); });
@ -242,7 +240,7 @@ fn xmrig_proxy(
let api = xmrig_proxy_api.lock().unwrap(); let api = xmrig_proxy_api.lock().unwrap();
ui.label(RichText::new("Uptime").underline().color(BONE)) ui.label(RichText::new("Uptime").underline().color(BONE))
.on_hover_text(STATUS_XMRIG_PROXY_UPTIME); .on_hover_text(STATUS_XMRIG_PROXY_UPTIME);
ui.label(UptimeFull::from(api.uptime).as_str()); ui.label(api.uptime.to_string());
ui.label( ui.label(
RichText::new("Hashrate\n(1m/10m/1h/12h/24h)") RichText::new("Hashrate\n(1m/10m/1h/12h/24h)")
.underline() .underline()
@ -284,7 +282,7 @@ fn xmrig(
let api = xmrig_api.lock().unwrap(); let api = xmrig_api.lock().unwrap();
ui.label(RichText::new("Uptime").underline().color(BONE)) ui.label(RichText::new("Uptime").underline().color(BONE))
.on_hover_text(STATUS_XMRIG_UPTIME); .on_hover_text(STATUS_XMRIG_UPTIME);
ui.label(UptimeFull::from(api.uptime).as_str()); ui.label(api.uptime.to_string());
ui.label(api.resources.to_string()); ui.label(api.resources.to_string());
ui.label( ui.label(
RichText::new("Hashrate\n(10s/1m/15m)") RichText::new("Hashrate\n(10s/1m/15m)")

7
src/helper/xrig/xmrig.rs
View file

@ -3,6 +3,7 @@ use crate::helper::xrig::update_xmrig_config;
use crate::helper::{Helper, ProcessName, ProcessSignal, ProcessState}; use crate::helper::{Helper, ProcessName, ProcessSignal, ProcessState};
use crate::helper::{Process, arc_mut, check_died, check_user_input, sleep, sleep_end_loop}; use crate::helper::{Process, arc_mut, check_died, check_user_input, sleep, sleep_end_loop};
use crate::helper::{PubXvbApi, XvbNode}; use crate::helper::{PubXvbApi, XvbNode};
use crate::human::HumanTime;
use crate::miscs::{client, output_console}; use crate::miscs::{client, output_console};
use crate::regex::{XMRIG_REGEX, contains_error, contains_usepool, detect_new_node_xmrig}; use crate::regex::{XMRIG_REGEX, contains_error, contains_usepool, detect_new_node_xmrig};
use crate::utils::human::HumanNumber; use crate::utils::human::HumanNumber;
@ -688,7 +689,7 @@ impl ImgXmrig {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct PubXmrigApi { pub struct PubXmrigApi {
pub output: String, pub output: String,
pub uptime: Duration, pub uptime: HumanTime,
pub worker_id: String, pub worker_id: String,
pub resources: String, pub resources: String,
pub hashrate: String, pub hashrate: String,
@ -711,7 +712,7 @@ impl PubXmrigApi {
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
output: String::new(), output: String::new(),
uptime: Duration::from_secs(0), uptime: HumanTime::new(),
worker_id: UNKNOWN_DATA.to_string(), worker_id: UNKNOWN_DATA.to_string(),
resources: UNKNOWN_DATA.to_string(), resources: UNKNOWN_DATA.to_string(),
hashrate: UNKNOWN_DATA.to_string(), hashrate: UNKNOWN_DATA.to_string(),
@ -755,7 +756,7 @@ impl PubXmrigApi {
public.output.push_str(&std::mem::take(&mut *output_pub)); public.output.push_str(&std::mem::take(&mut *output_pub));
} }
// Update uptime // Update uptime
public.uptime = elapsed; public.uptime = HumanTime::into_human(elapsed);
} }
drop(output_pub); drop(output_pub);

9
src/helper/xrig/xmrig_proxy.rs
View file

@ -8,10 +8,11 @@ use std::{
path::Path, path::Path,
sync::{Arc, Mutex}, sync::{Arc, Mutex},
thread, thread,
time::{Duration, Instant}, time::Instant,
}; };
use tokio::spawn; use tokio::spawn;
use crate::human::HumanTime;
use crate::miscs::client; use crate::miscs::client;
use crate::{ use crate::{
GUPAX_VERSION_UNDERSCORE, UNKNOWN_DATA, GUPAX_VERSION_UNDERSCORE, UNKNOWN_DATA,
@ -469,7 +470,7 @@ impl Helper {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct PubXmrigProxyApi { pub struct PubXmrigProxyApi {
pub output: String, pub output: String,
pub uptime: Duration, pub uptime: HumanTime,
pub accepted: u32, pub accepted: u32,
pub rejected: u32, pub rejected: u32,
pub hashrate_1m: f32, pub hashrate_1m: f32,
@ -489,7 +490,7 @@ impl PubXmrigProxyApi {
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
output: String::new(), output: String::new(),
uptime: Duration::from_secs(0), uptime: HumanTime::new(),
accepted: 0, accepted: 0,
rejected: 0, rejected: 0,
hashrate_1m: 0.0, hashrate_1m: 0.0,
@ -515,7 +516,7 @@ impl PubXmrigProxyApi {
public.output.push_str(&std::mem::take(&mut *output_pub)); public.output.push_str(&std::mem::take(&mut *output_pub));
} }
// Update uptime // Update uptime
public.uptime = elapsed; public.uptime = HumanTime::into_human(elapsed);
} }
drop(output_pub); drop(output_pub);