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

added raw to date for string output (#2075)

Browse Source
This commit is contained in:
Darren Schroeder 2020-06-28 09:01:13 -05:00 committed by GitHub
parent 821d44af54
commit 8d91d151bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
crates/nu-cli/src/commands/date.rs
View File

@ -27,6 +27,7 @@ impl WholeStreamCommand for Date {
"report datetime in supplied strftime format", "report datetime in supplied strftime format",
Some('f'), Some('f'),
) )
.switch("raw", "print date without tables", Some('r'))
} }
fn usage(&self) -> &str { fn usage(&self) -> &str {
@ -54,14 +55,27 @@ impl WholeStreamCommand for Date {
result: None, result: None,
}, },
Example { Example {
description: "Get the current time and date and reports in raw format", description: "Get the current time and date and report it based on format",
example: "date --format '%Y-%m-%d %H:%M:%S.%f %z'", example: "date --format '%Y-%m-%d %H:%M:%S.%f %z'",
result: None, result: None,
}, },
Example {
description: "Get the current time and date and report it without a table",
example: "date --format '%Y-%m-%d %H:%M:%S.%f %z' --raw",
result: None,
},
] ]
} }
} }
pub fn date_to_value_raw<T: TimeZone>(dt: DateTime<T>, dt_format: String) -> String
where
T::Offset: Display,
{
let result = dt.format(&dt_format);
format!("{}", result)
}
pub fn date_to_value<T: TimeZone>(dt: DateTime<T>, tag: Tag, dt_format: String) -> Value pub fn date_to_value<T: TimeZone>(dt: DateTime<T>, tag: Tag, dt_format: String) -> Value
where where
T::Offset: Display, T::Offset: Display,
@ -116,8 +130,8 @@ pub async fn date(
) -> Result<OutputStream, ShellError> { ) -> Result<OutputStream, ShellError> {
let registry = registry.clone(); let registry = registry.clone();
let args = args.evaluate_once(&registry).await?; let args = args.evaluate_once(&registry).await?;
let tag = args.call_info.name_tag.clone(); let tag = args.call_info.name_tag.clone();
let raw = args.has("raw");
let dt_fmt = if args.has("format") { let dt_fmt = if args.has("format") {
if let Some(dt_fmt) = args.get("format") { if let Some(dt_fmt) = args.get("format") {
@ -131,10 +145,18 @@ pub async fn date(
let value = if args.has("utc") { let value = if args.has("utc") {
let utc: DateTime<Utc> = Utc::now(); let utc: DateTime<Utc> = Utc::now();
date_to_value(utc, tag, dt_fmt) if raw {
UntaggedValue::string(date_to_value_raw(utc, dt_fmt)).into_untagged_value()
} else {
date_to_value(utc, tag, dt_fmt)
}
} else { } else {
let local: DateTime<Local> = Local::now(); let local: DateTime<Local> = Local::now();
date_to_value(local, tag, dt_fmt) if raw {
UntaggedValue::string(date_to_value_raw(local, dt_fmt)).into_untagged_value()
} else {
date_to_value(local, tag, dt_fmt)
}
}; };
Ok(OutputStream::one(value)) Ok(OutputStream::one(value))