mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-24 11:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support archiving files in selection

Browse source
This commit is contained in:
Arun Prakash Jana 2019-01-31 06:59:57 +05:30
parent 2324e8e3e7
commit d9977c5ea1
No known key found for this signature in database
GPG key ID: A75979F35C080412
3 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -236,7 +236,7 @@ Press <kbd>?</kbd> in `nnn` to see the list anytime.
Y Select all Y Select all
P Copy selection X Delete selection P Copy selection X Delete selection
V Move selection ^X Delete entry V Move selection ^X Delete entry
f Archive entry F List archive f Archive files F List archive
^F Extract archive m M Brief/full media info ^F Extract archive m M Brief/full media info
e Edit in EDITOR p Open in PAGER e Edit in EDITOR p Open in PAGER
ORDER TOGGLES ORDER TOGGLES

2
nnn.1
View file

@ -113,7 +113,7 @@ Delete files from selection
.It Ic ^X .It Ic ^X
Delete entry Delete entry
.It Ic f .It Ic f
Archive entry Archive files
.It Ic F .It Ic F
List files in archive List files in archive
.It Ic ^F .It Ic ^F

22
src/nnn.c
View file

@ -2300,7 +2300,7 @@ static bool show_help(char *path)
"cY Select all\n" "cY Select all\n"
"cP Copy selection X Delete selection\n" "cP Copy selection X Delete selection\n"
"cV Move selection ^X Delete entry\n" "cV Move selection ^X Delete entry\n"
"cf Archive entry F List archive\n" "cf Archive files F List archive\n"
"b^F Extract archive m M Brief/full media info\n" "b^F Extract archive m M Brief/full media info\n"
"ce Edit in EDITOR p Open in PAGER\n" "ce Edit in EDITOR p Open in PAGER\n"
"1ORDER TOGGLES\n" "1ORDER TOGGLES\n"
@ -3512,7 +3512,7 @@ nochange:
{ {
switch (sel) { switch (sel) {
case SEL_ARCHIVE: case SEL_ARCHIVE:
tmp = xreadline(dents[cur].name, "name: "); tmp = xreadline(NULL, "archive name: ");
break; break;
case SEL_OPENWITH: case SEL_OPENWITH:
tmp = xreadline(NULL, "open with: "); tmp = xreadline(NULL, "open with: ");
@ -3545,10 +3545,24 @@ nochange:
/* newpath is used as temporary buffer */ /* newpath is used as temporary buffer */
if (!getutil(utils[APACK])) { if (!getutil(utils[APACK])) {
printmsg("utility missing"); printmsg("utility missing");
continue; goto nochange;
} }
spawn(utils[APACK], tmp, dents[cur].name, path, F_NORMAL); r = get_input("archive selection (else current)? [s]");
if (r == 's') {
if (!cpsafe())
goto nochange;
snprintf(g_buf, CMD_LEN_MAX,
#ifdef __linux__
"xargs -0 -a %s %s %s",
#else
"cat %s | xargs -0 -o %s %s",
#endif
g_cppath, utils[APACK], tmp);
spawn("sh", "-c", g_buf, path, F_NORMAL | F_SIGINT);
} else
spawn(utils[APACK], tmp, dents[cur].name, path, F_NORMAL);
break; break;
case SEL_OPENWITH: case SEL_OPENWITH:
dir = NULL; dir = NULL;