mirrors
/
nnn
mirror of https://github.com/jarun/nnn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify commands as plugins 

Remove restrictions on $nnn

Update the plugin README
This commit is contained in:
KlzXS 2023-01-25 17:15:38 +01:00
parent 6b94911bc9
commit 827e84a56f
No known key found for this signature in database
GPG Key ID: 721F7586CEB48D6A
2 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
plugins/README.md
View File

@ -119,7 +119,7 @@ If the plugins list gets too long, try breaking them up into sections:
``` ```
NNN_PLUG_PERSONAL='g:personal/convert2zoom;p:personal/echo' NNN_PLUG_PERSONAL='g:personal/convert2zoom;p:personal/echo'
NNN_PLUG_WORK='j:work/prettyjson;d:work/foobar' NNN_PLUG_WORK='j:work/prettyjson;d:work/foobar'
NNN_PLUG_INLINE='e:!go run $nnn*' NNN_PLUG_INLINE='e:!go run "$nnn"*'
NNN_PLUG_DEFAULT='1:ipinfo;p:preview-tui;o:fzz;b:nbak' NNN_PLUG_DEFAULT='1:ipinfo;p:preview-tui;o:fzz;b:nbak'
NNN_PLUG="$NNN_PLUG_PERSONAL;$NNN_PLUG_WORK;$NNN_PLUG_DEFAULT;$NNN_PLUG_INLINE" NNN_PLUG="$NNN_PLUG_PERSONAL;$NNN_PLUG_WORK;$NNN_PLUG_DEFAULT;$NNN_PLUG_INLINE"
export NNN_PLUG export NNN_PLUG
@ -144,7 +144,7 @@ export NNN_PLUG='p:-plugin'
To assign keys to arbitrary non-background cli commands and invoke like plugins, add `!` (underscore) before the command. To assign keys to arbitrary non-background cli commands and invoke like plugins, add `!` (underscore) before the command.
```sh ```sh
export NNN_PLUG='x:!chmod +x $nnn;g:!git log;s:!smplayer $nnn' export NNN_PLUG='x:!chmod +x "$nnn";g:!git log;s:!smplayer "$nnn"'
``` ```
Now <kbd>;x</kbd> can be used to make a file executable, <kbd>;g</kbd> can be used to the git log of a git project directory, <kbd>;s</kbd> can be used to preview a partially downloaded media file. Now <kbd>;x</kbd> can be used to make a file executable, <kbd>;g</kbd> can be used to the git log of a git project directory, <kbd>;s</kbd> can be used to preview a partially downloaded media file.
@ -154,56 +154,52 @@ Now <kbd>;x</kbd> can be used to make a file executable, <kbd>;g</kbd> can be us
`nnn` waits for user confirmation (the prompt `Press Enter to continue`) after it executes a command as plugin (unlike plugins which can add a `read` to wait). To skip this, add a `*` after the command. `nnn` waits for user confirmation (the prompt `Press Enter to continue`) after it executes a command as plugin (unlike plugins which can add a `read` to wait). To skip this, add a `*` after the command.
```sh ```sh
export NNN_PLUG='s:!smplayer $nnn*;n:-!vim /home/vaio/Dropbox/Public/synced_note*' export NNN_PLUG='s:!smplayer "$nnn"*;n:-!vim /home/vaio/Dropbox/Public/synced_note*'
``` ```
Now there will be no prompt after <kbd>;s</kbd> and <kbd>;n</kbd>. Now there will be no prompt after <kbd>;s</kbd> and <kbd>;n</kbd>.
Note: Do not use `*` with programs those run and exit e.g. cat. Note: Do not use `*` with programs that run and exit e.g. cat.
#### Run a GUI app as plugin [`&`] #### Run a GUI app as plugin [`&`]
To run a GUI app as plugin, add a `&` after `!`. To run a GUI app as plugin, add a `&` after `!`.
```sh ```sh
export NNN_PLUG='m:-!&mousepad $nnn' export NNN_PLUG='m:-!&mousepad "$nnn"'
``` ```
`$nnn` must be the last argument in this case.
#### Page non-interactive command output [`|`] #### Page non-interactive command output [`|`]
To show the output of run-and-exit commands which do not need user input, add `|` (pipe) after `!`. To show the output of run-and-exit commands which do not need user input, add `|` (pipe) after `!`.
```sh ```sh
export NNN_PLUG='m:-!|mediainfo $nnn;t:-!|tree -ps;l:-!|ls -lah --group-directories-first' export NNN_PLUG='m:-!|mediainfo "$nnn";t:-!|tree -ps;l:-!|ls -lah --group-directories-first'
``` ```
This option is incompatible with `&` (terminal output is masked for GUI programs) and ignores `*` (output is already paged for user). This option is incompatible with `&` (terminal output is masked for GUI programs) and ignores `*` (output is already paged for user).
`$nnn` must be the last argument in this case as well.
Notes: Notes:
1. Use single quotes for `$NNN_PLUG` so `$nnn` is not interpreted 1. Use single quotes for `$NNN_PLUG` so `"$nnn"` is not interpreted
2. `$nnn` must be the last argument (if used) to run a _GUI app as plugin_ or to page non-interactive command output 2. (_Again_) add `!` before the command
3. (_Again_) add `!` before the command 3. To disable directory refresh after running a _command as plugin_, prefix with `-!`
4. To disable directory refresh after running a _command as plugin_, prefix with `-!`
#### Some useful key-command examples #### Some useful key-command examples
| Key:Command | Description | | Key:Command | Description |
|---|---| |---|---|
| `c:!convert $nnn png:- \| xclip -sel clipboard -t image/png*` | Copy image to clipboard | | `c:!convert "$nnn" png:- \| xclip -sel clipboard -t image/png*` | Copy image to clipboard |
| `C:!cp -rv "$nnn" "$nnn".cp` | Create a copy of the hovered file | | `C:!cp -rv "$nnn" "$nnn".cp` | Create a copy of the hovered file |
| `e:-!sudo -E vim $nnn*` | Edit file as root in vim | | `e:-!sudo -E vim "$nnn"*` | Edit file as root in vim |
| `g:-!git diff` | Show git diff | | `g:-!git diff` | Show git diff |
| `h:-!hx $nnn*` | Open hovered file in [hx](https://github.com/krpors/hx) hex editor | | `h:-!hx "$nnn"*` | Open hovered file in [hx](https://github.com/krpors/hx) hex editor |
| `k:-!fuser -kiv $nnn*` | Interactively kill process(es) using hovered file | | `k:-!fuser -kiv "$nnn"*` | Interactively kill process(es) using hovered file |
| `l:-!git log` | Show git log | | `l:-!git log` | Show git log |
| `n:-!vi /home/user/Dropbox/dir/note*` | Take quick notes in a synced file/dir of notes | | `n:-!vi /home/user/Dropbox/dir/note*` | Take quick notes in a synced file/dir of notes |
| `p:-!less -iR $nnn*` | Page through hovered file in less | | `p:-!less -iR "$nnn"*` | Page through hovered file in less |
| `s:-!&smplayer -minigui $nnn` | Play hovered media file, even unfinished download | | `s:-!&smplayer -minigui "$nnn"` | Play hovered media file, even unfinished download |
| `x:!chmod +x $nnn` | Make the hovered file executable | | `x:!chmod +x "$nnn"` | Make the hovered file executable |
| `y:-!sync*` | Flush cached writes | | `y:-!sync*` | Flush cached writes |
## Access level of plugins ## Access level of plugins

14
src/nnn.c
View File

@ -5172,17 +5172,19 @@ static void run_cmd_as_plugin(const char *file, char *runfile, uchar_t flags)
--len; --len;
} }
if ((flags & F_PAGE) || (flags & F_NOTRACE)) { /* This is to catch the old way of doing things so we don't break users' configs */
if (is_suffix(g_buf, " $nnn")) if ((flags & (F_PAGE | F_NOTRACE)) && is_suffix(g_buf, " $nnn")) {
g_buf[len - 5] = '\0'; g_buf[len - 5] = '\0';
else
runfile = NULL;
if (flags & F_PAGE) if (flags & F_PAGE)
get_output(g_buf, runfile, NULL, -1, TRUE, TRUE); get_output(g_buf, runfile, NULL, -1, TRUE, TRUE);
else // F_NOTRACE else // F_NOTRACE
spawn(g_buf, runfile, NULL, NULL, flags); spawn(g_buf, runfile, NULL, NULL, flags);
} else }
if (flags & F_PAGE)
get_output(utils[UTIL_SH_EXEC], g_buf, NULL, -1, TRUE);
else
spawn(utils[UTIL_SH_EXEC], g_buf, NULL, NULL, flags); spawn(utils[UTIL_SH_EXEC], g_buf, NULL, NULL, flags);
} }