kristoferssolo/traxor
1
0
Fork 0
mirror of https://github.com/kristoferssolo/traxor.git synced 2025-10-21 20:10:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor(units): update format functions

Browse Source
This commit is contained in:
Kristofers Solo 2025-07-09 17:12:59 +03:00
parent 973b4657fe
commit 095b102ecf
Signed by: kristoferssolo
GPG Key ID: 8687F2D3EEE6F0ED
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/app/utils/mod.rs
View File

@ -4,6 +4,7 @@ pub mod unit;
use filesize::FileSize; use filesize::FileSize;
use netspeed::NetSpeed; use netspeed::NetSpeed;
use std::fmt::Display;
use transmission_rpc::types::{ use transmission_rpc::types::{
ErrorType, IdleMode, Priority, RatioMode, Torrent, TorrentGetField, TorrentStatus, ErrorType, IdleMode, Priority, RatioMode, Torrent, TorrentGetField, TorrentStatus,
}; };
@ -284,18 +285,16 @@ impl Wrapper for TorrentGetField {
} }
} }
fn format_option_string<T: ToString>(value: Option<T>) -> String { fn format_option_string<T: Display>(value: Option<T>) -> String {
value.map(|v| v.to_string()).unwrap_or_default() value.map(|v| v.to_string()).unwrap_or_default()
} }
fn format_eta(value: Option<i64>) -> String { fn format_eta(value: Option<i64>) -> String {
value match value {
.map(|v| match v { Some(-2) => "?".into(),
-1 => "".into(), None | Some(-1) | Some(..0) => String::new(),
-2 => "?".into(), Some(v) => format!("{} s", v),
_ => format!("{} s", v), }
})
.unwrap_or("".into())
} }
trait Formatter { trait Formatter {
@ -311,7 +310,7 @@ impl Formatter for Option<f32> {
impl<T> Formatter for Option<Vec<T>> { impl<T> Formatter for Option<Vec<T>> {
fn format(&self) -> String { fn format(&self) -> String {
self.as_ref() self.as_ref()
.map(|v| format!("{}", v.len())) .map(|v| v.len().to_string())
.unwrap_or_default() .unwrap_or_default()
} }
} }
@ -320,7 +319,7 @@ macro_rules! impl_enum_formatter {
($enum_type:ty, { $($variant:pat => $str:expr),* $(,)? }) => { ($enum_type:ty, { $($variant:pat => $str:expr),* $(,)? }) => {
impl Formatter for Option<$enum_type> { impl Formatter for Option<$enum_type> {
fn format(&self) -> String { fn format(&self) -> String {
self.map(|v| match v { $($variant => $str,)* }).unwrap_or("N/A").into() self.map_or("N/A".to_string(),|v| match v { $($variant => $str,)* }.to_string())
} }
} }
}; };