Skip to content

match table formatting to python's #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: rust-cli
Choose a base branch
from
Open

match table formatting to python's #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/rust-cli/network.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use anyhow::{bail, Context};
use base64::{engine::general_purpose, Engine as _};
use clap::Subcommand;
use jsonrpsee::core::params::ObjectParams;
use prettytable::{cell, Row, Table};
use prettytable::{cell, format::consts::FORMAT_BOX_CHARS, Row, Table};
use serde_json::Value;
use std::path::PathBuf;

Expand Down Expand Up @@ -59,6 +59,7 @@ fn handle_network_start_response(data: serde_json::Value) -> anyhow::Result<()>
// warnet table
if let Some(warnet_headers) = data["warnet_headers"].as_array() {
let mut table = Table::new();
table.set_format(*FORMAT_BOX_CHARS);
let headers: Vec<_> = warnet_headers
.iter()
.map(|header| header.as_str().unwrap_or(""))
Expand Down Expand Up @@ -88,6 +89,7 @@ fn handle_network_start_response(data: serde_json::Value) -> anyhow::Result<()>
// tanks table
if let Some(tank_headers) = data["tank_headers"].as_array() {
let mut table = Table::new();
table.set_format(*FORMAT_BOX_CHARS);
let headers: Vec<_> = tank_headers
.iter()
.map(|header| header.as_str().unwrap_or(""))
Expand Down
4 changes: 3 additions & 1 deletion src/rust-cli/scenarios.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use anyhow::{bail, Context};
use base64::{engine::general_purpose, Engine as _};
use clap::Subcommand;
use jsonrpsee::core::params::ObjectParams;
use prettytable::{row, Table};
use prettytable::{format::consts::FORMAT_BOX_CHARS, row, Table};
use std::path::PathBuf;

#[derive(Subcommand, Debug)]
Expand Down Expand Up @@ -38,6 +38,7 @@ async fn handle_available(params: ObjectParams) -> anyhow::Result<()> {
.context("Making RPC to fetch available scenarios")?;
if let serde_json::Value::Array(scenarios) = data {
let mut table = Table::new();
table.set_format(*FORMAT_BOX_CHARS);
table.add_row(row!["Scenario", "Description"]);
for scenario in scenarios {
if let serde_json::Value::Array(details) = scenario {
Expand Down Expand Up @@ -99,6 +100,7 @@ async fn handle_active(params: ObjectParams) -> anyhow::Result<()> {
.context("Making RPC call to list running scenarios")?;
if let serde_json::Value::Array(scenarios) = data {
let mut table = Table::new();
table.set_format(*FORMAT_BOX_CHARS);
table.add_row(row!["PID", "Command", "Network", "Active"]);
for scenario in scenarios {
if let serde_json::Value::Object(details) = scenario {
Expand Down