holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1058 from jonathandturner/edit_insert_core

Browse Source 
Move edit and insert to core
This commit is contained in:
Jonathan Turner 2019-12-05 12:42:19 -08:00 committed by GitHub
commit a2a5b30568
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 138 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.toml
View File

@ -154,14 +154,6 @@ path = "src/plugins/average.rs"
name = "nu_plugin_embed"
path = "src/plugins/embed.rs"
[[bin]]
name = "nu_plugin_insert"
path = "src/plugins/insert.rs"
[[bin]]
name = "nu_plugin_edit"
path = "src/plugins/edit.rs"
[[bin]]
name = "nu_plugin_format"
path = "src/plugins/format.rs"

2
src/cli.rs
View File

@ -288,6 +288,8 @@ pub async fn cli() -> Result<(), Box<dyn Error>> {
per_item_command(Post),
per_item_command(Where),
per_item_command(Echo),
per_item_command(Edit),
per_item_command(Insert),
whole_stream_command(Config),
whole_stream_command(Compact),
whole_stream_command(Default),

4
src/commands.rs
View File

@ -19,6 +19,7 @@ pub(crate) mod date;
pub(crate) mod debug;
pub(crate) mod default;
pub(crate) mod echo;
pub(crate) mod edit;
pub(crate) mod enter;
pub(crate) mod env;
#[allow(unused)]
@ -43,6 +44,7 @@ pub(crate) mod group_by;
pub(crate) mod help;
pub(crate) mod histogram;
pub(crate) mod history;
pub(crate) mod insert;
pub(crate) mod last;
pub(crate) mod lines;
pub(crate) mod ls;
@ -108,6 +110,7 @@ pub(crate) use date::Date;
pub(crate) use debug::Debug;
pub(crate) use default::Default;
pub(crate) use echo::Echo;
pub(crate) use edit::Edit;
pub(crate) use enter::Enter;
pub(crate) use env::Env;
#[allow(unused)]
@ -134,6 +137,7 @@ pub(crate) use group_by::GroupBy;
pub(crate) use help::Help;
pub(crate) use histogram::Histogram;
pub(crate) use history::History;
pub(crate) use insert::Insert;
pub(crate) use last::Last;
pub(crate) use lines::Lines;
pub(crate) use ls::LS;

69
src/commands/edit.rs Normal file
View File

@ -0,0 +1,69 @@
use crate::commands::PerItemCommand;
use crate::context::CommandRegistry;
use crate::prelude::*;
use nu_errors::ShellError;
use nu_protocol::{CallInfo, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value};
pub struct Edit;
impl PerItemCommand for Edit {
fn name(&self) -> &str {
"edit"
}
fn signature(&self) -> Signature {
Signature::build("edit")
.required(
"Field",
SyntaxShape::ColumnPath,
"the name of the column to edit",
)
.required(
"Value",
SyntaxShape::String,
"the new value to give the cell(s)",
)
}
fn usage(&self) -> &str {
"Edit an existing column to have a new value."
}
fn run(
&self,
call_info: &CallInfo,
_registry: &CommandRegistry,
_raw_args: &RawCommandArgs,
value: Value,
) -> Result<OutputStream, ShellError> {
let value_tag = value.tag();
let field = call_info.args.expect_nth(0)?.as_column_path().unwrap();
let replacement = call_info.args.expect_nth(1)?.tagged_unknown();
let stream = match value {
obj @ Value {
value: UntaggedValue::Row(_),
..
} => match obj.replace_data_at_column_path(&field, replacement.item.clone()) {
Some(v) => VecDeque::from(vec![Ok(ReturnSuccess::Value(v))]),
None => {
return Err(ShellError::labeled_error(
"edit could not find place to insert column",
"column name",
&field.tag,
))
}
},
_ => {
return Err(ShellError::labeled_error(
"Unrecognized type in stream",
"original value",
value_tag,
))
}
};
Ok(stream.to_output_stream())
}
}

63
src/commands/insert.rs Normal file
View File

@ -0,0 +1,63 @@
use crate::commands::PerItemCommand;
use crate::context::CommandRegistry;
use crate::prelude::*;
use nu_errors::ShellError;
use nu_protocol::{CallInfo, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value};
pub struct Insert;
impl PerItemCommand for Insert {
fn name(&self) -> &str {
"insert"
}
fn signature(&self) -> Signature {
Signature::build("insert")
.required(
"column",
SyntaxShape::ColumnPath,
"the column name to insert",
)
.required(
"value",
SyntaxShape::String,
"the value to give the cell(s)",
)
}
fn usage(&self) -> &str {
"Edit an existing column to have a new value."
}
fn run(
&self,
call_info: &CallInfo,
_registry: &CommandRegistry,
_raw_args: &RawCommandArgs,
value: Value,
) -> Result<OutputStream, ShellError> {
let value_tag = value.tag();
let field = call_info.args.expect_nth(0)?.as_column_path().unwrap();
let replacement = call_info.args.expect_nth(1)?.tagged_unknown();
let stream = match value {
obj @ Value {
value: UntaggedValue::Row(_),
..
} => match obj.insert_data_at_column_path(&field, replacement.item.clone()) {
Ok(v) => VecDeque::from(vec![Ok(ReturnSuccess::Value(v))]),
Err(err) => return Err(err),
},
_ => {
return Err(ShellError::labeled_error(
"Unrecognized type in stream",
"original value",
value_tag,
))
}
};
Ok(stream.to_output_stream())
}
}

102
src/plugins/edit.rs
View File

@ -1,102 +0,0 @@
use nu::{serve_plugin, Plugin, ValueExt};
use nu_errors::ShellError;
use nu_protocol::{
CallInfo, ColumnPath, Primitive, ReturnSuccess, ReturnValue, Signature, SpannedTypeName,
SyntaxShape, UntaggedValue, Value,
};
use nu_source::Tagged;
struct Edit {
field: Option<Tagged<ColumnPath>>,
value: Option<UntaggedValue>,
}
impl Edit {
fn new() -> Edit {
Edit {
field: None,
value: None,
}
}
fn edit(&self, value: Value) -> Result<Value, ShellError> {
let value_tag = value.tag();
match (value, self.value.clone()) {
(
obj @ Value {
value: UntaggedValue::Row(_),
..
},
Some(v),
) => match &self.field {
Some(f) => {
match obj.replace_data_at_column_path(&f, v.clone().into_untagged_value()) {
Some(v) => return Ok(v),
None => {
return Err(ShellError::labeled_error(
"edit could not find place to insert column",
"column name",
&f.tag,
))
}
}
}
None => Err(ShellError::untagged_runtime_error(
"edit needs a column when changing a value in a table",
)),
},
_ => Err(ShellError::labeled_error(
"Unrecognized type in stream",
"original value",
value_tag,
)),
}
}
}
impl Plugin for Edit {
fn config(&mut self) -> Result<Signature, ShellError> {
Ok(Signature::build("edit")
.desc("Edit an existing column to have a new value.")
.required(
"Field",
SyntaxShape::ColumnPath,
"the name of the column to edit",
)
.required(
"Value",
SyntaxShape::String,
"the new value to give the cell(s)",
)
.filter())
}
fn begin_filter(&mut self, call_info: CallInfo) -> Result<Vec<ReturnValue>, ShellError> {
if let Some(args) = call_info.args.positional {
match &args[0] {
table @ Value {
value: UntaggedValue::Primitive(Primitive::ColumnPath(_)),
..
} => {
self.field = Some(table.as_column_path()?);
}
value => return Err(ShellError::type_error("table", value.spanned_type_name())),
}
match &args[1] {
Value { value: v, .. } => {
self.value = Some(v.clone());
}
}
}
Ok(vec![])
}
fn filter(&mut self, input: Value) -> Result<Vec<ReturnValue>, ShellError> {
Ok(vec![ReturnSuccess::value(self.edit(input)?)])
}
}
fn main() {
serve_plugin(&mut Edit::new());
}

84
src/plugins/insert.rs
View File

@ -1,84 +0,0 @@
use nu::{serve_plugin, Plugin, ValueExt};
use nu_errors::ShellError;
use nu_protocol::{
CallInfo, ColumnPath, Primitive, ReturnSuccess, ReturnValue, ShellTypeName, Signature,
SpannedTypeName, SyntaxShape, UntaggedValue, Value,
};
use nu_source::SpannedItem;
struct Insert {
field: Option<ColumnPath>,
value: Option<Value>,
}
impl Insert {
fn new() -> Insert {
Insert {
field: None,
value: None,
}
}
fn insert(&self, value: Value) -> Result<Value, ShellError> {
let value_tag = value.tag();
match (&value, &self.value, &self.field) {
(
obj @ Value {
value: UntaggedValue::Row(_),
..
},
Some(v),
Some(field),
) => obj.clone().insert_data_at_column_path(field, v.clone()),
(value, ..) => Err(ShellError::type_error(
"row",
value.type_name().spanned(value_tag),
)),
}
}
}
impl Plugin for Insert {
fn config(&mut self) -> Result<Signature, ShellError> {
Ok(Signature::build("insert")
.desc("Insert a new column to the table.")
.required(
"column",
SyntaxShape::ColumnPath,
"the column name to insert",
)
.required(
"value",
SyntaxShape::String,
"the value to give the cell(s)",
)
.filter())
}
fn begin_filter(&mut self, call_info: CallInfo) -> Result<Vec<ReturnValue>, ShellError> {
if let Some(args) = call_info.args.positional {
match &args[0] {
table @ Value {
value: UntaggedValue::Primitive(Primitive::ColumnPath(_)),
..
} => {
self.field = Some(table.as_column_path()?.item);
}
value => return Err(ShellError::type_error("table", value.spanned_type_name())),
}
self.value = Some(args[1].clone());
}
Ok(vec![])
}
fn filter(&mut self, input: Value) -> Result<Vec<ReturnValue>, ShellError> {
Ok(vec![ReturnSuccess::value(self.insert(input)?)])
}
}
fn main() {
serve_plugin(&mut Insert::new());
}