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

Plugin option for shell (#517)

Browse Source 
* calling plugin without shell

* spelling error

* option on register to select a shell
This commit is contained in:
Fernando Herrera
2021-12-18 18:13:56 +00:00
committed by GitHub
parent b3b328d19d
commit 8933dde324
8 changed files with 108 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/nu-protocol/src/engine/command.rs
View File

@ -48,8 +48,9 @@ pub trait Command: Send + Sync + CommandClone {
self.name().contains(' ')
}
// Is a plugin command (returns plugin's path and encoding if yes)
fn is_plugin(&self) -> Option<(&PathBuf, &str)> {
// Is a plugin command (returns plugin's path, encoding and type of shell
// if the declaration is a plugin)
fn is_plugin(&self) -> Option<(&PathBuf, &str, &Option<PathBuf>)> {
None
}

27
crates/nu-protocol/src/engine/engine_state.rs
View File

@ -230,12 +230,33 @@ impl EngineState {
self.plugin_decls().try_for_each(|decl| {
// A successful plugin registration already includes the plugin filename
// No need to check the None option
let (path, encoding) = decl.is_plugin().expect("plugin should have file name");
let file_name = path.to_str().expect("path should be a str");
let (path, encoding, shell) =
decl.is_plugin().expect("plugin should have file name");
let file_name = path
.to_str()
.expect("path was checked during registration as a str");
serde_json::to_string_pretty(&decl.signature())
.map(|signature| {
format!("register {} -e {} {}\n\n", file_name, encoding, signature)
// Extracting the possible path to the shell used to load the plugin
let shell_str = match shell {
Some(path) => format!(
"-s {}",
path.to_str().expect(
"shell path was checked during registration as a str"
)
),
None => "".into(),
};
// Each signature is stored in the plugin file with the required
// encoding, shell and signature
// This information will be used when loading the plugin
// information when nushell starts
format!(
"register {} -e {} {} {}\n\n",
file_name, encoding, shell_str, signature
)
})
.map_err(|err| ShellError::PluginFailedToLoad(err.to_string()))
.and_then(|line| {