2019-07-26 06:09:19 +02:00
|
|
|
use crate::prelude::*;
|
|
|
|
use chrono::{DateTime, Local, Utc};
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
use nu_errors::ShellError;
|
|
|
|
use nu_protocol::{Dictionary, Value};
|
2019-07-26 06:09:19 +02:00
|
|
|
|
2019-08-15 07:02:02 +02:00
|
|
|
use crate::commands::WholeStreamCommand;
|
2019-07-26 06:09:19 +02:00
|
|
|
use chrono::{Datelike, TimeZone, Timelike};
|
|
|
|
use core::fmt::Display;
|
|
|
|
use indexmap::IndexMap;
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
use nu_protocol::{Signature, UntaggedValue};
|
2019-07-26 06:09:19 +02:00
|
|
|
|
|
|
|
pub struct Date;
|
|
|
|
|
2019-08-15 07:02:02 +02:00
|
|
|
impl WholeStreamCommand for Date {
|
2019-08-30 00:52:32 +02:00
|
|
|
fn name(&self) -> &str {
|
|
|
|
"date"
|
|
|
|
}
|
|
|
|
|
|
|
|
fn signature(&self) -> Signature {
|
2019-10-28 06:15:35 +01:00
|
|
|
Signature::build("date")
|
2020-02-12 03:24:31 +01:00
|
|
|
.switch("utc", "use universal time (UTC)", Some('u'))
|
|
|
|
.switch("local", "use the local time", Some('l'))
|
2019-08-30 00:52:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
fn usage(&self) -> &str {
|
|
|
|
"Get the current datetime."
|
|
|
|
}
|
|
|
|
|
2019-08-09 06:51:21 +02:00
|
|
|
fn run(
|
|
|
|
&self,
|
|
|
|
args: CommandArgs,
|
|
|
|
registry: &CommandRegistry,
|
|
|
|
) -> Result<OutputStream, ShellError> {
|
|
|
|
date(args, registry)
|
2019-07-26 06:09:19 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-21 15:33:14 +01:00
|
|
|
pub fn date_to_value<T: TimeZone>(dt: DateTime<T>, tag: Tag) -> Value
|
2019-07-26 06:09:19 +02:00
|
|
|
where
|
|
|
|
T::Offset: Display,
|
|
|
|
{
|
|
|
|
let mut indexmap = IndexMap::new();
|
|
|
|
|
2019-12-04 20:52:31 +01:00
|
|
|
indexmap.insert(
|
|
|
|
"year".to_string(),
|
|
|
|
UntaggedValue::int(dt.year()).into_value(&tag),
|
|
|
|
);
|
|
|
|
indexmap.insert(
|
|
|
|
"month".to_string(),
|
|
|
|
UntaggedValue::int(dt.month()).into_value(&tag),
|
|
|
|
);
|
|
|
|
indexmap.insert(
|
|
|
|
"day".to_string(),
|
|
|
|
UntaggedValue::int(dt.day()).into_value(&tag),
|
|
|
|
);
|
|
|
|
indexmap.insert(
|
|
|
|
"hour".to_string(),
|
|
|
|
UntaggedValue::int(dt.hour()).into_value(&tag),
|
|
|
|
);
|
2019-11-21 15:33:14 +01:00
|
|
|
indexmap.insert(
|
|
|
|
"minute".to_string(),
|
2019-12-04 20:52:31 +01:00
|
|
|
UntaggedValue::int(dt.minute()).into_value(&tag),
|
2019-11-21 15:33:14 +01:00
|
|
|
);
|
|
|
|
indexmap.insert(
|
|
|
|
"second".to_string(),
|
2019-12-04 20:52:31 +01:00
|
|
|
UntaggedValue::int(dt.second()).into_value(&tag),
|
2019-11-21 15:33:14 +01:00
|
|
|
);
|
2019-07-26 06:09:19 +02:00
|
|
|
|
|
|
|
let tz = dt.offset();
|
|
|
|
indexmap.insert(
|
|
|
|
"timezone".to_string(),
|
2019-12-04 20:52:31 +01:00
|
|
|
UntaggedValue::string(format!("{}", tz)).into_value(&tag),
|
2019-07-26 06:09:19 +02:00
|
|
|
);
|
|
|
|
|
2019-11-21 15:33:14 +01:00
|
|
|
UntaggedValue::Row(Dictionary::from(indexmap)).into_value(&tag)
|
2019-07-26 06:09:19 +02:00
|
|
|
}
|
|
|
|
|
2019-08-09 06:51:21 +02:00
|
|
|
pub fn date(args: CommandArgs, registry: &CommandRegistry) -> Result<OutputStream, ShellError> {
|
|
|
|
let args = args.evaluate_once(registry)?;
|
|
|
|
|
2019-07-26 06:09:19 +02:00
|
|
|
let mut date_out = VecDeque::new();
|
2019-10-13 06:12:43 +02:00
|
|
|
let tag = args.call_info.name_tag.clone();
|
2019-07-26 06:09:19 +02:00
|
|
|
|
|
|
|
let value = if args.has("utc") {
|
|
|
|
let utc: DateTime<Utc> = Utc::now();
|
2019-09-14 18:30:24 +02:00
|
|
|
date_to_value(utc, tag)
|
2019-07-26 06:09:19 +02:00
|
|
|
} else {
|
|
|
|
let local: DateTime<Local> = Local::now();
|
2019-09-14 18:30:24 +02:00
|
|
|
date_to_value(local, tag)
|
2019-07-26 06:09:19 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
date_out.push_back(value);
|
|
|
|
|
Futures v0.3 upgrade (#1344)
* Upgrade futures, async-stream, and futures_codec
These were the last three dependencies on futures-preview. `nu` itself
is now fully dependent on `futures@0.3`, as opposed to `futures-preview`
alpha.
Because the update to `futures` from `0.3.0-alpha.19` to `0.3.0` removed
the `Stream` implementation of `VecDeque` ([changelog][changelog]), most
commands that convert a `VecDeque` to an `OutputStream` broke and had to
be fixed.
The current solution is to now convert `VecDeque`s to a `Stream` via
`futures::stream::iter`. However, it may be useful for `futures` to
create an `IntoStream` trait, implemented on the `std::collections` (or
really any `IntoIterator`). If something like this happends, it may be
worthwhile to update the trait implementations on `OutputStream` and
refactor these commands again.
While upgrading `futures_codec`, we remove a custom implementation of
`LinesCodec`, as one has been added to the library. There's also a small
refactor to make the stream output more idiomatic.
[changelog]: https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md#030---2019-11-5
* Upgrade sys & ps plugin dependencies
They were previously dependent on `futures-preview`, and `nu_plugin_ps`
was dependent on an old version of `futures-timer`.
* Remove dependency on futures-timer from nu
* Update Cargo.lock
* Fix formatting
* Revert fmt regressions
CI is still on 1.40.0, but the latest rustfmt v1.41.0 has changes to the
`val @ pattern` syntax, causing the linting job to fail.
* Fix clippy warnings
2020-02-06 04:46:48 +01:00
|
|
|
Ok(futures::stream::iter(date_out).to_output_stream())
|
2019-07-26 06:09:19 +02:00
|
|
|
}
|