Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-26 13:03:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add simple to-html output and bump version (#1487)

Browse source
This commit is contained in:
Jonathan Turner 2020-03-15 16:04:44 +13:00 committed by GitHub
parent b6363f3ce1
commit 2d078849cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 145 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Cargo.lock generated
View file

@ -1489,6 +1489,12 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "023b39be39e3a2da62a94feb433e91e8bcd37676fbc8bea371daf52b7a769a3e" checksum = "023b39be39e3a2da62a94feb433e91e8bcd37676fbc8bea371daf52b7a769a3e"
[[package]]
name = "htmlescape"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163"
[[package]] [[package]]
name = "http" name = "http"
version = "0.1.21" version = "0.1.21"
@ -2232,7 +2238,7 @@ dependencies = [
[[package]] [[package]]
name = "nu" name = "nu"
version = "0.11.0" version = "0.11.1"
dependencies = [ dependencies = [
"clap", "clap",
"crossterm 0.16.0", "crossterm 0.16.0",
@ -2312,6 +2318,7 @@ dependencies = [
"git2", "git2",
"glob", "glob",
"hex 0.4.0", "hex 0.4.0",
"htmlescape",
"ichwh", "ichwh",
"indexmap", "indexmap",
"itertools 0.9.0", "itertools 0.9.0",

6
Cargo.toml
View file

@ -1,8 +1,8 @@
[package] [package]
name = "nu" name = "nu"
version = "0.11.0" version = "0.11.1"
authors = ["Yehuda Katz <wycats@gmail.com>", "Jonathan Turner <jonathan.d.turner@gmail.com>", "Andrés N. Robalino <andres@androbtech.com>"] authors = ["The Nu Authors"]
description = "A shell for the GitHub era" description = "A new kind of shell"
license = "MIT" license = "MIT"
edition = "2018" edition = "2018"
readme = "README.md" readme = "README.md"

1
crates/nu-cli/Cargo.toml
View file

@ -44,6 +44,7 @@ getset = "0.1.0"
git2 = { version = "0.11.0", default_features = false } git2 = { version = "0.11.0", default_features = false }
glob = "0.3.0" glob = "0.3.0"
hex = "0.4" hex = "0.4"
htmlescape = "0.3.1"
ichwh = "0.3" ichwh = "0.3"
indexmap = { version = "1.3.2", features = ["serde-1"] } indexmap = { version = "1.3.2", features = ["serde-1"] }
itertools = "0.9.0" itertools = "0.9.0"

1
crates/nu-cli/src/cli.rs
View file

@ -313,6 +313,7 @@ pub fn create_default_context(
// File format output // File format output
whole_stream_command(ToBSON), whole_stream_command(ToBSON),
whole_stream_command(ToCSV), whole_stream_command(ToCSV),
whole_stream_command(ToHTML),
whole_stream_command(ToJSON), whole_stream_command(ToJSON),
whole_stream_command(ToSQLite), whole_stream_command(ToSQLite),
whole_stream_command(ToDB), whole_stream_command(ToDB),

2
crates/nu-cli/src/commands.rs
View file

@ -87,6 +87,7 @@ pub(crate) mod table;
pub(crate) mod tags; pub(crate) mod tags;
pub(crate) mod to_bson; pub(crate) mod to_bson;
pub(crate) mod to_csv; pub(crate) mod to_csv;
pub(crate) mod to_html;
pub(crate) mod to_json; pub(crate) mod to_json;
pub(crate) mod to_sqlite; pub(crate) mod to_sqlite;
pub(crate) mod to_toml; pub(crate) mod to_toml;
@ -191,6 +192,7 @@ pub(crate) use table::Table;
pub(crate) use tags::Tags; pub(crate) use tags::Tags;
pub(crate) use to_bson::ToBSON; pub(crate) use to_bson::ToBSON;
pub(crate) use to_csv::ToCSV; pub(crate) use to_csv::ToCSV;
pub(crate) use to_html::ToHTML;
pub(crate) use to_json::ToJSON; pub(crate) use to_json::ToJSON;
pub(crate) use to_sqlite::ToDB; pub(crate) use to_sqlite::ToDB;
pub(crate) use to_sqlite::ToSQLite; pub(crate) use to_sqlite::ToSQLite;

101
crates/nu-cli/src/commands/to_html.rs Normal file
View file

@ -0,0 +1,101 @@
use crate::commands::WholeStreamCommand;
use crate::data::value::format_leaf;
use crate::prelude::*;
use futures::StreamExt;
use nu_errors::ShellError;
use nu_protocol::{Primitive, ReturnSuccess, Signature, UntaggedValue, Value};
use nu_source::AnchorLocation;
pub struct ToHTML;
impl WholeStreamCommand for ToHTML {
fn name(&self) -> &str {
"to-html"
}
fn signature(&self) -> Signature {
Signature::build("to-html")
}
fn usage(&self) -> &str {
"Convert table into simple HTML"
}
fn run(
&self,
args: CommandArgs,
registry: &CommandRegistry,
) -> Result<OutputStream, ShellError> {
to_html(args, registry)
}
}
fn to_html(args: CommandArgs, registry: &CommandRegistry) -> Result<OutputStream, ShellError> {
let args = args.evaluate_once(registry)?;
let name_tag = args.name_tag();
//let name_span = name_tag.span;
let stream = async_stream! {
let input: Vec<Value> = args.input.values.collect().await;
let headers = nu_protocol::merge_descriptors(&input);
let mut output_string = "<html><body>".to_string();
if !headers.is_empty() && (headers.len() > 1 || headers[0] != "<value>") {
output_string.push_str("<table>");
output_string.push_str("<tr>");
for header in &headers {
output_string.push_str("<th>");
output_string.push_str(&htmlescape::encode_minimal(&header));
output_string.push_str("</th>");
}
output_string.push_str("</tr>");
}
for row in input {
match row.value {
UntaggedValue::Primitive(Primitive::Binary(b)) => {
// This might be a bit much, but it's fun :)
match row.tag.anchor {
Some(AnchorLocation::Url(f)) |
Some(AnchorLocation::File(f)) => {
let extension = f.split('.').last().map(String::from);
match extension {
Some(s) if ["png", "jpg", "bmp", "gif", "tiff"].contains(&s.as_str()) => {
output_string.push_str("<img src=\"data:image/");
output_string.push_str(&s);
output_string.push_str(";base64,");
output_string.push_str(&base64::encode(&b));
output_string.push_str("\">");
}
_ => {}
}
}
_ => {}
}
}
UntaggedValue::Row(row) => {
output_string.push_str("<tr>");
for header in &headers {
let data = row.get_data(header);
output_string.push_str("<td>");
output_string.push_str(&format_leaf(data.borrow()).plain_string(100_000));
output_string.push_str("</td>");
}
output_string.push_str("</tr>");
}
p => {
output_string.push_str(&(htmlescape::encode_minimal(&format_leaf(&p).plain_string(100_000)).replace("\n", "<br>")));
}
}
}
if !headers.is_empty() && (headers.len() > 1 || headers[0] != "<value>") {
output_string.push_str("</table>");
}
output_string.push_str("</body></html>");
yield ReturnSuccess::value(UntaggedValue::string(output_string).into_value(name_tag));
};
Ok(stream.to_output_stream())
}

28
crates/nu-cli/tests/format_conversions/html.rs Normal file
View file

@ -0,0 +1,28 @@
use nu_test_support::{nu, pipeline};
#[test]
fn out_html_simple() {
let actual = nu!(
cwd: ".", pipeline(
r#"
echo 3 | to-html
"#
));
assert_eq!(actual, "<html><body>3</body></html>");
}
#[test]
fn out_html_table() {
let actual = nu!(
cwd: ".", pipeline(
r#"
echo '{"name": "jason"}' | from-json | to-html
"#
));
assert_eq!(
actual,
"<html><body><table><tr><th>name</th></tr><tr><td>jason</td></tr></table></body></html>"
);
}

1
crates/nu-cli/tests/format_conversions/mod.rs
View file

@ -1,5 +1,6 @@
mod bson; mod bson;
mod csv; mod csv;
mod html;
mod json; mod json;
mod ods; mod ods;
mod sqlite; mod sqlite;