extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-17 18:41:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add support for primitive values to sort-by (#1241)

Browse Source 
* Remove redundant clone

* Add support for primitive values to sort-by #1238
This commit is contained in:
Koenraad Verheyden
2020-01-19 20:08:37 +01:00
committed by Jonathan Turner
parent 47d987d37f
commit e059c74a06
2 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/commands/sort_by.rs
View File

@ -1,7 +1,7 @@
use crate::commands::WholeStreamCommand;
use crate::prelude::*;
use nu_errors::ShellError;
use nu_protocol::{Signature, SyntaxShape, Value};
use nu_protocol::{Signature, SyntaxShape, UntaggedValue, Value};
use nu_source::Tagged;
use nu_value_ext::get_data_by_key;
@ -41,12 +41,26 @@ fn sort_by(
Ok(OutputStream::new(async_stream! {
let mut vec = context.input.drain_vec().await;
let calc_key = |item: &Value| {
rest.iter()
.map(|f| get_data_by_key(item, f.borrow_spanned()).map(|i| i.clone()))
.collect::<Vec<Option<Value>>>()
if vec.is_empty() {
return;
}
match &vec[0] {
Value {
value: UntaggedValue::Primitive(_),
..
} => {
vec.sort();
},
_ => {
let calc_key = |item: &Value| {
rest.iter()
.map(|f| get_data_by_key(item, f.borrow_spanned()))
.collect::<Vec<Option<Value>>>()
};
vec.sort_by_cached_key(calc_key);
},
};
vec.sort_by_cached_key(calc_key);
for item in vec {
yield item.into();