LordMZTE/mcstat
1
0
Fork 0
mirror of https://github.com/LordMZTE/mcstat.git synced 2024-04-25 02:05:31 +02:00
Code Issues Projects Releases Wiki Activity

mcstat cleanup

Browse source
This commit is contained in:
LordMZTE 2020-12-03 19:45:06 +01:00
parent 56f1f7ac9b
commit 82f65ed721
4 changed files with 119 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Cargo.toml
View file

@ -7,15 +7,16 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
clap = { version = "^2.33", features = ["yaml"] }
image-base64 = "0.1.0"
image = "0.23.9"
anyhow = "1.0.32"
asciify = "0.1.6"
async-minecraft-ping = { git = "https://github.com/LordMZTE/async-minecraft-ping.git", tag = "v0.2.4" }
tokio = { version = "0.2.22", features = ["full"] }
clap = { version = "^2.33", features = ["yaml"] }
image = "0.23.9"
image-base64 = "0.1.0"
itertools = "0.9.0"
termcolor = "1"
anyhow = "1.0.32"
serde_json = "1.0.58"
term_size = "0.3.2"
smart-default = "0.6.0"
term_size = "0.3.2"
termcolor = "1"
tokio = { version = "0.2.22", features = ["full"] }
unicode-width = "0.1.8"

40
src/lib.rs
View file

@ -3,6 +3,8 @@ extern crate smart_default;
use asciify::AsciiBuilder;
use itertools::Itertools;
use crate::output::Table;
use std::io::Cursor;
pub mod output;
@ -12,13 +14,15 @@ pub mod output;
/// trait
#[macro_export]
macro_rules! none_if_empty {
($x:expr) => {
if $x.is_empty() {
($x:expr) => {{
// let binding to avoid copying
let x = $x;
if x.is_empty() {
None
} else {
Some($x)
Some(x)
}
};
}};
}
pub struct AsciiConfig {
@ -58,23 +62,15 @@ pub fn get_table<'a>(
entries: impl Iterator<Item = (&'a str, &'a str)> + Clone,
second_column: bool,
) -> String {
// the width at which | characters should be placed this is the length of the
// longest entry
let max_width = if second_column {
entries.clone().map(|m| m.0.len()).max().unwrap_or_default()
if second_column {
let mut table = Table::new();
for entry in entries {
table.small_entry(entry.0, entry.1);
}
let mut cursor = Cursor::new(Vec::<u8>::new());
table.print(&mut cursor).unwrap();
String::from_utf8(cursor.into_inner()).unwrap()
} else {
// this will not be used in case second_column is off so we just use 0
0
};
entries
.map(|m| {
if second_column {
format!("{: <width$} | {}", m.0, m.1, width = max_width)
} else {
m.0.to_owned()
}
})
.intersperse("\n".to_owned())
.collect()
entries.map(|x| x.0).intersperse("\n").collect()
}
}

173
src/main.rs
View file

@ -1,6 +1,4 @@
use std::io::Cursor;
use time::Duration;
use tokio::time;
use anyhow::{anyhow, Context, Result};
use asciify::AsciiBuilder;
@ -8,11 +6,15 @@ use async_minecraft_ping::{ConnectionConfig, ServerDescription, StatusResponse};
use clap::{load_yaml, App};
use image::ImageFormat;
use itertools::Itertools;
use mcstat::{get_table, none_if_empty, output::Table, remove_formatting, AsciiConfig};
use termcolor::{Buffer, BufferWriter, ColorChoice, WriteColor};
use time::Duration;
use tokio::time;
use mcstat::{get_table, none_if_empty, output::Table, remove_formatting, AsciiConfig};
/// this message is used if getting a value from the arguments fails
const ARGUMENT_FAIL_MESSAGE: &str = "failed to get value from args";
#[tokio::main]
async fn main() -> Result<()> {
let yaml = load_yaml!("args.yml");
@ -93,88 +95,13 @@ async fn main() -> Result<()> {
println!("This server has mods. To show them use the -m argument\n")
}
let player_sample = response
.players
.sample
.as_ref()
.unwrap_or(&vec![])
.iter()
.map(|p| p.name.as_str())
.intersperse("\n")
.collect::<String>();
let mut table = Table::new();
if let Some((w, _)) = term_size::dimensions() {
table.max_block_width = w;
}
table.opt_big_entry(
"Description",
none_if_empty!(remove_formatting(&response.description.get_text())),
);
table.opt_big_entry("Extra Description", {
if let ServerDescription::Big(big_desc) = &response.description {
let desc = &big_desc.extra;
if desc.is_empty() {
None
} else {
Some(desc.into_iter().map(|p| p.text.clone()).collect::<String>())
}
} else {
None
}
});
table.opt_big_entry(
"Player Sample",
none_if_empty!(remove_formatting(&player_sample)),
);
table.blank();
table.opt_small_entry(
"Server Version",
none_if_empty!(remove_formatting(&response.version.name)),
);
table.small_entry("Online Players", &response.players.online);
table.small_entry("Max Players", &response.players.max);
table.small_entry("Protocol Version", &response.version.protocol);
table.blank();
table.opt_big_entry(
"Mods",
if let (Some(mod_list), true) = (response.forge_mod_info(), matches.is_present("mods")) {
Some(get_table(
mod_list
.iter()
.sorted_by(|a, b| a.modid.cmp(&b.modid))
.map(|m| (&*m.modid, &*m.version)),
matches.is_present("modversions"),
))
} else {
None
},
);
table.opt_big_entry(
"Forge Channels",
if let (true, Some(fd)) = (matches.is_present("channels"), response.forge_data) {
Some(get_table(
fd.channels
.iter()
.sorted_by(|a, b| a.res.cmp(&b.res))
.map(|c| (&*c.res, &*c.version)),
true,
))
} else {
None
},
);
table.stdout()?;
format_table(
&response,
matches.is_present("mods"),
matches.is_present("modversions"),
matches.is_present("channels"),
)
.stdout()?;
if let Some(img) = image {
println!("\n{}", img.await??);
@ -220,3 +147,79 @@ async fn asciify_base64_image(favicon: String, config: AsciiConfig) -> Result<St
Ok(out)
}
fn format_table(response: &StatusResponse, mods: bool, modversions: bool, channels: bool) -> Table {
let player_sample = response
.players
.sample
.as_ref()
.unwrap_or(&vec![])
.iter()
.map(|p| p.name.as_str())
.intersperse("\n")
.collect::<String>();
let mut table = Table::new();
if let Some((w, _)) = term_size::dimensions() {
table.max_block_width = w;
}
if let Some(s) = none_if_empty!(remove_formatting(&response.description.get_text())) {
table.big_entry("Description", s);
}
if let ServerDescription::Big(big_desc) = &response.description {
let desc = &big_desc.extra;
let txt = desc.into_iter().map(|p| p.text.clone()).collect::<String>();
if let Some(s) = none_if_empty!(txt) {
table.big_entry("Extra Description", s);
}
}
if let Some(s) = none_if_empty!(remove_formatting(&player_sample)) {
table.big_entry("Player Sample", s);
}
table.blank();
if let Some(s) = none_if_empty!(remove_formatting(&response.version.name)) {
table.small_entry("Server Version", s);
}
table.small_entry("Online Players", &response.players.online);
table.small_entry("Max Players", &response.players.max);
table.small_entry("Protocol Version", &response.version.protocol);
table.blank();
if let (Some(mod_list), true) = (response.forge_mod_info(), mods) {
let txt = get_table(
mod_list
.iter()
.sorted_by(|a, b| a.modid.cmp(&b.modid))
.map(|m| (&*m.modid, &*m.version)),
modversions,
);
if let Some(s) = none_if_empty!(txt) {
table.big_entry("Mods", s);
}
}
if let (true, Some(fd)) = (channels, &response.forge_data) {
let txt = get_table(
fd.channels
.iter()
.sorted_by(|a, b| a.res.cmp(&b.res))
.map(|c| (&*c.res, &*c.version)),
true,
);
if let Some(s) = none_if_empty!(txt) {
table.big_entry("Forge Channels", s);
}
}
table
}

48
src/output.rs
View file

@ -2,6 +2,7 @@ use std::{
cmp::{max, min},
io::{self, Write},
};
use unicode_width::UnicodeWidthStr;
#[derive(SmartDefault)]
pub struct Table {
@ -34,7 +35,7 @@ impl Table {
pub fn small_entry(&mut self, name: impl ToString, val: impl ToString) {
let name = name.to_string();
self.set_small_width(name.len());
self.set_small_width(name.width());
self.entries
.push(Box::new(SmallTableEntry(name, val.to_string())));
@ -48,21 +49,6 @@ impl Table {
)));
}
pub fn opt_small_entry(&mut self, name: impl ToString, val: Option<impl ToString>) {
let name = name.to_string();
self.set_small_width(name.len());
self.entries.push(Box::new(OptSmallTableEntry(
val.map(|t| SmallTableEntry(name, t.to_string())),
)));
}
pub fn opt_big_entry(&mut self, name: impl ToString, val: Option<impl ToString>) {
self.entries.push(Box::new(OptBigTableEntry(val.map(|t| {
BigTableEntry::new(name.to_string(), t.to_string(), self.max_block_width)
}))));
}
fn set_small_width(&mut self, width: usize) {
if width > self.small_entry_width {
self.small_entry_width = width;
@ -111,44 +97,20 @@ impl BigTableEntry {
pub fn new(name: String, val: String, maxwidth: usize) -> Self {
let val_width = min(
max(
val.lines().map(|s| s.len()).max().unwrap_or_default(),
name.len() + 4,
val.lines().map(|s| s.width()).max().unwrap_or_default(),
name.width() + 4,
),
maxwidth,
);
Self {
width: max(name.len(), val_width),
width: max(name.width(), val_width),
name,
val,
}
}
}
pub struct OptSmallTableEntry(Option<SmallTableEntry>);
impl TableEntry for OptSmallTableEntry {
fn print(&self, out: &mut dyn Write, table: &Table) -> io::Result<()> {
if let Some(entry) = &self.0 {
entry.print(out, table)
} else {
Ok(())
}
}
}
pub struct OptBigTableEntry(Option<BigTableEntry>);
impl TableEntry for OptBigTableEntry {
fn print(&self, out: &mut dyn Write, table: &Table) -> io::Result<()> {
if let Some(entry) = &self.0 {
entry.print(out, table)
} else {
Ok(())
}
}
}
pub struct BlankTableEntry;
impl TableEntry for BlankTableEntry {