mirror of
https://github.com/nushell/nushell.git
synced 2025-03-31 03:08:14 +02:00
# Description This PR fixes the breaking changes to the reedline API due to https://github.com/nushell/reedline/pull/562. It does not implement any new features but just gets nushell back to compiling again. # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> # Tests + Formatting <!-- Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass - `cargo run -- crates/nu-std/tests/run.nu` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` --> # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. -->
265 lines
8.9 KiB
Rust
265 lines
8.9 KiB
Rust
use nu_protocol::ast::Call;
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
use nu_protocol::{
|
|
Category, Example, HistoryFileFormat, IntoInterruptiblePipelineData, PipelineData, ShellError,
|
|
Signature, Span, Type, Value,
|
|
};
|
|
use reedline::{
|
|
FileBackedHistory, History as ReedlineHistory, HistoryItem, SearchDirection, SearchQuery,
|
|
SqliteBackedHistory,
|
|
};
|
|
|
|
#[derive(Clone)]
|
|
pub struct History;
|
|
|
|
impl Command for History {
|
|
fn name(&self) -> &str {
|
|
"history"
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Get the command history."
|
|
}
|
|
|
|
fn signature(&self) -> nu_protocol::Signature {
|
|
Signature::build("history")
|
|
.input_output_types(vec![
|
|
(Type::Nothing, Type::Table(vec![])),
|
|
(Type::Nothing, Type::Nothing),
|
|
])
|
|
.allow_variants_without_examples(true)
|
|
.switch("clear", "Clears out the history entries", Some('c'))
|
|
.switch(
|
|
"long",
|
|
"Show long listing of entries for sqlite history",
|
|
Some('l'),
|
|
)
|
|
.category(Category::Misc)
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
_stack: &mut Stack,
|
|
call: &Call,
|
|
_input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let head = call.head;
|
|
|
|
// todo for sqlite history this command should be an alias to `open ~/.config/nushell/history.sqlite3 | get history`
|
|
if let Some(config_path) = nu_path::config_dir() {
|
|
let clear = call.has_flag("clear");
|
|
let long = call.has_flag("long");
|
|
let ctrlc = engine_state.ctrlc.clone();
|
|
|
|
let mut history_path = config_path;
|
|
history_path.push("nushell");
|
|
match engine_state.config.history_file_format {
|
|
HistoryFileFormat::Sqlite => {
|
|
history_path.push("history.sqlite3");
|
|
}
|
|
HistoryFileFormat::PlainText => {
|
|
history_path.push("history.txt");
|
|
}
|
|
}
|
|
|
|
if clear {
|
|
let _ = std::fs::remove_file(history_path);
|
|
// TODO: FIXME also clear the auxiliary files when using sqlite
|
|
Ok(PipelineData::empty())
|
|
} else {
|
|
let history_reader: Option<Box<dyn ReedlineHistory>> =
|
|
match engine_state.config.history_file_format {
|
|
HistoryFileFormat::Sqlite => SqliteBackedHistory::with_file(history_path)
|
|
.map(|inner| {
|
|
let boxed: Box<dyn ReedlineHistory> = Box::new(inner);
|
|
boxed
|
|
})
|
|
.ok(),
|
|
|
|
HistoryFileFormat::PlainText => FileBackedHistory::with_file(
|
|
engine_state.config.max_history_size as usize,
|
|
history_path,
|
|
)
|
|
.map(|inner| {
|
|
let boxed: Box<dyn ReedlineHistory> = Box::new(inner);
|
|
boxed
|
|
})
|
|
.ok(),
|
|
};
|
|
|
|
match engine_state.config.history_file_format {
|
|
HistoryFileFormat::PlainText => Ok(history_reader
|
|
.and_then(|h| {
|
|
h.search(SearchQuery::everything(SearchDirection::Forward, None))
|
|
.ok()
|
|
})
|
|
.map(move |entries| {
|
|
entries
|
|
.into_iter()
|
|
.enumerate()
|
|
.map(move |(idx, entry)| Value::Record {
|
|
cols: vec!["command".to_string(), "index".to_string()],
|
|
vals: vec![
|
|
Value::String {
|
|
val: entry.command_line,
|
|
span: head,
|
|
},
|
|
Value::int(idx as i64, head),
|
|
],
|
|
span: head,
|
|
})
|
|
})
|
|
.ok_or(ShellError::FileNotFound(head))?
|
|
.into_pipeline_data(ctrlc)),
|
|
HistoryFileFormat::Sqlite => Ok(history_reader
|
|
.and_then(|h| {
|
|
h.search(SearchQuery::everything(SearchDirection::Forward, None))
|
|
.ok()
|
|
})
|
|
.map(move |entries| {
|
|
entries.into_iter().enumerate().map(move |(idx, entry)| {
|
|
create_history_record(idx, entry, long, head)
|
|
})
|
|
})
|
|
.ok_or(ShellError::FileNotFound(head))?
|
|
.into_pipeline_data(ctrlc)),
|
|
}
|
|
}
|
|
} else {
|
|
Err(ShellError::FileNotFound(head))
|
|
}
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
example: "history | length",
|
|
description: "Get current history length",
|
|
result: None,
|
|
},
|
|
Example {
|
|
example: "history | last 5",
|
|
description: "Show last 5 commands you have ran",
|
|
result: None,
|
|
},
|
|
Example {
|
|
example: "history | wrap cmd | where cmd =~ cargo",
|
|
description: "Search all the commands from history that contains 'cargo'",
|
|
result: None,
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
fn create_history_record(idx: usize, entry: HistoryItem, long: bool, head: Span) -> Value {
|
|
//1. Format all the values
|
|
//2. Create a record of either short or long columns and values
|
|
|
|
let item_id_value = Value::Int {
|
|
val: match entry.id {
|
|
Some(id) => {
|
|
let ids = id.to_string();
|
|
match ids.parse::<i64>() {
|
|
Ok(i) => i,
|
|
_ => 0i64,
|
|
}
|
|
}
|
|
None => 0i64,
|
|
},
|
|
span: head,
|
|
};
|
|
let start_timestamp_value = Value::String {
|
|
val: match entry.start_timestamp {
|
|
Some(time) => time.to_string(),
|
|
None => "".into(),
|
|
},
|
|
span: head,
|
|
};
|
|
let command_value = Value::String {
|
|
val: entry.command_line,
|
|
span: head,
|
|
};
|
|
let session_id_value = Value::Int {
|
|
val: match entry.session_id {
|
|
Some(sid) => {
|
|
let sids = sid.to_string();
|
|
match sids.parse::<i64>() {
|
|
Ok(i) => i,
|
|
_ => 0i64,
|
|
}
|
|
}
|
|
None => 0i64,
|
|
},
|
|
span: head,
|
|
};
|
|
let hostname_value = Value::String {
|
|
val: match entry.hostname {
|
|
Some(host) => host,
|
|
None => "".into(),
|
|
},
|
|
span: head,
|
|
};
|
|
let cwd_value = Value::String {
|
|
val: match entry.cwd {
|
|
Some(cwd) => cwd,
|
|
None => "".into(),
|
|
},
|
|
span: head,
|
|
};
|
|
let duration_value = Value::Duration {
|
|
val: match entry.duration {
|
|
Some(d) => d.as_nanos().try_into().unwrap_or(0),
|
|
None => 0,
|
|
},
|
|
span: head,
|
|
};
|
|
let exit_status_value = Value::int(entry.exit_status.unwrap_or(0), head);
|
|
let index_value = Value::int(idx as i64, head);
|
|
if long {
|
|
Value::Record {
|
|
cols: vec![
|
|
"item_id".into(),
|
|
"start_timestamp".into(),
|
|
"command".to_string(),
|
|
"session_id".into(),
|
|
"hostname".into(),
|
|
"cwd".into(),
|
|
"duration".into(),
|
|
"exit_status".into(),
|
|
"idx".to_string(),
|
|
],
|
|
vals: vec![
|
|
item_id_value,
|
|
start_timestamp_value,
|
|
command_value,
|
|
session_id_value,
|
|
hostname_value,
|
|
cwd_value,
|
|
duration_value,
|
|
exit_status_value,
|
|
index_value,
|
|
],
|
|
span: head,
|
|
}
|
|
} else {
|
|
Value::Record {
|
|
cols: vec![
|
|
"start_timestamp".into(),
|
|
"command".to_string(),
|
|
"cwd".into(),
|
|
"duration".into(),
|
|
"exit_status".into(),
|
|
],
|
|
vals: vec![
|
|
start_timestamp_value,
|
|
command_value,
|
|
cwd_value,
|
|
duration_value,
|
|
exit_status_value,
|
|
],
|
|
span: head,
|
|
}
|
|
}
|
|
}
|