mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2025-01-23 09:16:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

User control to disable prompt after run cmd as plugin

Browse source
This commit is contained in:
Arun Prakash Jana 2019-12-17 20:55:17 +05:30
parent 7b06480147
commit fb2c548e86
No known key found for this signature in database
GPG key ID: A75979F35C080412
2 changed files with 49 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/README.md
View file

@ -79,12 +79,20 @@ Now plugin `fzopen` can be run with the keybind <kbd>;o</kbd>, `mocplay` can be
## Running commands as plugin
To assign keys to arbitrary non-background cli commands (non-shell-interpreted) and invoke like plugins, add `_` (underscore) before the command. For example:
To assign keys to arbitrary non-background cli commands (non-shell-interpreted) and invoke like plugins, add `_` (underscore) before the command.
For example:
export NNN_PLUG='x:_chmod +x $nnn;g:_git log;s:_smplayer $nnn;o:fzopen'
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.
`nnn` waits for user confirmation when it executes a command as plugin (unline plugins which can add a `read` to wait). If you do not need to wait for user confirmation after the command has executed, add a `*` after the command. For example:
export NNN_PLUG='x:_chmod +x $nnn;g:_git log;s:_smplayer $nnn*;o:fzopen'
Now there will be no prompt after <kbd>;s</kbd>.
Notes:
1. Use single quotes for `$NNN_PLUG` so `$nnn` is not interpreted

59
src/nnn.c
View file

@ -3552,6 +3552,37 @@ static void show_help(const char *path)
unlink(g_tmpfpath);
}
static bool run_cmd_as_plugin(const char *path, char *file, char *newpath, char *runfile)
{
uchar flags = F_CLI | F_CONFIRM;
size_t len;
DPRINTF_S(file);
/* Get rid of preceding _ */
++file;
if (!*file)
return FALSE;
len = strlen(file);
if (len > 1 && file[len - 1] == '*') {
flags &= ~F_CONFIRM; /* GUI case */
file[len - 1] = '\0'; /* Get rid of trailing nowait symbol */
--len;
}
xstrlcpy(newpath, file, PATH_MAX);
if (is_suffix(file, " $nnn")) {
/* Set `\0` to clear ' $nnn' suffix */
newpath[len - 5] = '\0';
} else
runfile = NULL;
spawn(newpath, runfile, NULL, path, flags);
return TRUE;
}
static bool plctrl_init(void)
{
snprintf(g_buf, CMD_LEN_MAX, "nnn-pipe.%d", getpid());
@ -3567,11 +3598,14 @@ static bool plctrl_init(void)
return _SUCCESS;
}
static bool run_selected_plugin(char **path, const char *file, char *newpath, char *runfile, char **lastname, char **lastdir)
static bool run_selected_plugin(char **path, char *file, char *newpath, char *runfile, char **lastname, char **lastdir)
{
int fd;
size_t len;
if (*file == '_')
return run_cmd_as_plugin(*path, file, newpath, runfile);
if (!g_plinit) {
plctrl_init();
g_plinit = TRUE;
@ -5214,24 +5248,11 @@ nochange:
goto nochange;
}
if (tmp[0] == '_' && tmp[1]) {
xstrlcpy(newpath, ++tmp, PATH_MAX);
if (is_suffix(newpath, " $nnn")) {
tmp = (ndents ? dents[cur].name : NULL);
/* Set `\0` to clear ' $nnn' suffix */
newpath[strlen(newpath) - 5] = '\0';
} else
tmp = NULL;
spawn(newpath, tmp, NULL, path, F_CLI | F_CONFIRM);
} else {
if (!run_selected_plugin(&path, tmp, newpath,
(ndents ? dents[cur].name : NULL),
&lastname, &lastdir)) {
printwait(messages[MSG_FAILED],
&presel);
goto nochange;
}
if (!run_selected_plugin(&path, tmp, newpath,
(ndents ? dents[cur].name : NULL),
&lastname, &lastdir)) {
printwait(messages[MSG_FAILED], &presel);
goto nochange;
}
if (ndents)