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

Refactor cp, mv, cp-mv as, rm

Browse source
This commit is contained in:
Arun Prakash Jana 2019-10-19 13:25:50 +05:30
parent 95e9151c90
commit 1b3b9f503d
No known key found for this signature in database
GPG key ID: A75979F35C080412
2 changed files with 52 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/.clang-tidy
View file

@ -11,5 +11,5 @@ CheckOptions:
- key: fuchsia-restrict-system-includes.Includes - key: fuchsia-restrict-system-includes.Includes
value: '*,-stdint.h,-stdbool.h' value: '*,-stdint.h,-stdbool.h'
- key: readability-function-size.StatementThreshold - key: readability-function-size.StatementThreshold
value: '1000' value: '950'
... ...

89
src/nnn.c
View file

@ -1360,6 +1360,55 @@ finish:
return ret; return ret;
} }
static bool cpmvrm_selection(enum action sel, char *path, int *presel)
{
int r;
endselection();
if (!selsafe()) {
*presel = MSGWAIT;
return FALSE;
}
switch (sel) {
case SEL_CP:
opstr(g_buf, cp);
break;
case SEL_MV:
opstr(g_buf, mv);
break;
case SEL_CPMVAS:
r = get_input("'c'p / 'm'v as?");
if (r != 'c' && r != 'm') {
if (cfg.filtermode)
*presel = FILTER;
return FALSE;
}
if (!cpmv_rename(r, path)) {
printwait(messages[OPERATION_FAILED], presel);
return FALSE;
}
break;
default: /* SEL_RMMUL */
rmmulstr(g_buf);
break;
}
if (sel != SEL_CPMVAS)
spawn(utils[SH_EXEC], g_buf, NULL, path, F_CLI);
/* Clear selection on move or delete */
if (sel != SEL_CP)
clearselection();
if (cfg.filtermode)
*presel = FILTER;
return TRUE;
}
static bool batch_rename(const char *path) static bool batch_rename(const char *path)
{ {
int fd1, fd2, i; int fd1, fd2, i;
@ -4592,49 +4641,11 @@ nochange:
case SEL_CPMVAS: // fallthrough case SEL_CPMVAS: // fallthrough
case SEL_RMMUL: case SEL_RMMUL:
{ {
endselection(); if (!cpmvrm_selection(sel, path, &presel))
if (!selsafe()) {
presel = MSGWAIT;
goto nochange; goto nochange;
}
switch (sel) {
case SEL_CP:
opstr(g_buf, cp);
break;
case SEL_MV:
opstr(g_buf, mv);
break;
case SEL_CPMVAS:
r = get_input("'c'p / 'm'v as?");
if (r != 'c' && r != 'm') {
if (cfg.filtermode)
presel = FILTER;
goto nochange;
}
if (!cpmv_rename(r, path)) {
printwait(messages[OPERATION_FAILED], &presel);
goto nochange;
}
break;
default: /* SEL_RMMUL */
rmmulstr(g_buf);
break;
}
if (sel != SEL_CPMVAS)
spawn(utils[SH_EXEC], g_buf, NULL, path, F_CLI);
/* Clear selection on move or delete */
if (sel != SEL_CP)
clearselection();
if (ndents) if (ndents)
copycurname(); copycurname();
if (cfg.filtermode)
presel = FILTER;
goto begin; goto begin;
} }
case SEL_RM: case SEL_RM: