extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-03-26 15:26:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

filesize conversion (#5770)

Browse Source
This commit is contained in:
Fernando Herrera 2022-06-13 14:44:32 -05:00 committed by GitHub
parent 44979f3051
commit de554f8e5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
crates/nu-command/src/dataframe/values/nu_dataframe/conversion.rs
View File

@ -34,10 +34,6 @@ impl Column {
pub fn name(&self) -> &str {
self.name.as_str()
}
//pub fn iter(&self) -> impl Iterator<Item = &Value> {
// self.values.iter()
//}
}
impl IntoIterator for Column {
@ -72,6 +68,7 @@ pub enum InputType {
Object,
Date,
Duration,
Filesize,
}
#[derive(Debug)]
@ -616,6 +613,9 @@ pub fn insert_value(
Value::Duration { .. } => {
col_val.column_type = Some(InputType::Duration);
}
Value::Filesize { .. } => {
col_val.column_type = Some(InputType::Filesize);
}
_ => col_val.column_type = Some(InputType::Object),
}
col_val.values.push(value);
@ -628,6 +628,7 @@ pub fn insert_value(
| (Value::String { .. }, Value::String { .. })
| (Value::Bool { .. }, Value::Bool { .. })
| (Value::Date { .. }, Value::Date { .. })
| (Value::Filesize { .. }, Value::Filesize { .. })
| (Value::Duration { .. }, Value::Duration { .. }) => col_val.values.push(value),
_ => {
col_val.column_type = Some(InputType::Object);
@ -659,6 +660,12 @@ pub fn from_parsed_columns(column_values: ColumnMap) -> Result<NuDataFrame, Shel
let series = Series::new(&name, series_values?);
df_series.push(series)
}
InputType::Filesize => {
let series_values: Result<Vec<_>, _> =
column.values.iter().map(|v| v.as_i64()).collect();
let series = Series::new(&name, series_values?);
df_series.push(series)
}
InputType::String => {
let series_values: Result<Vec<_>, _> =
column.values.iter().map(|v| v.as_string()).collect();
@ -698,17 +705,10 @@ pub fn from_parsed_columns(column_values: ColumnMap) -> Result<NuDataFrame, Shel
df_series.push(res.into_series())
}
InputType::Duration => {
let it = column.values.iter().map(|v| {
if let Value::Duration { val, .. } = &v {
Some(*val)
} else {
None
}
});
let res = ChunkedArray::<Int64Type>::from_iter_options(&name, it);
df_series.push(res.into_series())
let series_values: Result<Vec<_>, _> =
column.values.iter().map(|v| v.as_i64()).collect();
let series = Series::new(&name, series_values?);
df_series.push(series)
}
}
}

2
crates/nu-protocol/src/value/from.rs
View File

@ -16,6 +16,8 @@ impl Value {
pub fn as_i64(&self) -> Result<i64, ShellError> {
match self {
Value::Int { val, .. } => Ok(*val),
Value::Filesize { val, .. } => Ok(*val),
Value::Duration { val, .. } => Ok(*val),
x => Err(ShellError::CantConvert(
"i64".into(),
x.get_type().to_string(),