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 archive "extract to..."

Browse source
This commit is contained in:
Arun Prakash Jana 2021-06-13 14:13:39 +05:30
parent 54258749e1
commit e256353fbf
No known key found for this signature in database
GPG key ID: A75979F35C080412
2 changed files with 94 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -84,7 +84,7 @@ It runs smoothly on the Pi, [Termux](https://www.youtube.com/embed/AbaauM7gUJw)
- File-specific colors (or minimal _dirs in context color_)
- Icons (customize and compile-in)
- Plugin for image, video and audio thumbnails
- Create, list, extract, mount (FUSE based) archives
- Create, list, extract (to), mount (FUSE based) archives
- Option to open all text files in `$EDITOR`
- Information
- Detailed file information

164
src/nnn.c
View file

@ -4187,76 +4187,6 @@ static size_t get_fs_info(const char *path, bool type)
return (size_t)svb.f_bavail << ffs((int)(svb.f_frsize >> 1));
}
/* List or extract archive */
static void handle_archive(char *fpath, char op)
{
char arg[] = "-tvf"; /* options for tar/bsdtar to list files */
char *util;
if (getutil(utils[UTIL_ATOOL])) {
util = utils[UTIL_ATOOL];
arg[1] = op;
arg[2] = '\0';
} else if (getutil(utils[UTIL_BSDTAR])) {
util = utils[UTIL_BSDTAR];
if (op == 'x')
arg[1] = op;
} else if (is_suffix(fpath, ".zip")) {
util = utils[UTIL_UNZIP];
arg[1] = (op == 'l') ? 'v' /* verbose listing */ : '\0';
arg[2] = '\0';
} else {
util = utils[UTIL_TAR];
if (op == 'x')
arg[1] = op;
}
if (op == 'x') /* extract */
spawn(util, arg, fpath, NULL, F_NORMAL);
else /* list */
get_output(util, arg, fpath, NULL, TRUE, TRUE);
}
static char *visit_parent(char *path, char *newpath, int *presel)
{
char *dir;
/* There is no going back */
if (istopdir(path)) {
/* Continue in type-to-nav mode, if enabled */
if (cfg.filtermode && presel)
*presel = FILTER;
return NULL;
}
/* Use a copy as xdirname() may change the string passed */
if (newpath)
xstrsncpy(newpath, path, PATH_MAX);
else
newpath = path;
dir = xdirname(newpath);
if (chdir(dir) == -1) {
printwarn(presel);
return NULL;
}
return dir;
}
static void valid_parent(char *path, char *lastname)
{
/* Save history */
xstrsncpy(lastname, xbasename(path), NAME_MAX + 1);
while (!istopdir(path))
if (visit_parent(path, NULL, NULL))
break;
printwarn(NULL);
xdelay(XDELAY_INTERVAL_MS);
}
/* Create non-existent parents and a file or dir */
static bool xmktree(char *path, bool dir)
{
@ -4324,6 +4254,95 @@ next:
return TRUE;
}
/* List or extract archive */
static bool handle_archive(char *fpath, char op)
{
char arg[] = "-tvf"; /* options for tar/bsdtar to list files */
char *util, *outdir;
bool x_to = FALSE;
if (op == 'x') {
outdir = xreadline(NULL, messages[MSG_NEW_PATH]);
if (outdir && *outdir && !(*outdir == '.' && outdir[1] == '\0')) {
if (!xmktree(outdir, TRUE) || (chdir(outdir) == -1)) {
printwarn(NULL);
return FALSE;
}
x_to = TRUE;
}
}
if (getutil(utils[UTIL_ATOOL])) {
util = utils[UTIL_ATOOL];
arg[1] = op;
arg[2] = '\0';
} else if (getutil(utils[UTIL_BSDTAR])) {
util = utils[UTIL_BSDTAR];
if (op == 'x')
arg[1] = op;
} else if (is_suffix(fpath, ".zip")) {
util = utils[UTIL_UNZIP];
arg[1] = (op == 'l') ? 'v' /* verbose listing */ : '\0';
arg[2] = '\0';
} else {
util = utils[UTIL_TAR];
if (op == 'x')
arg[1] = op;
}
if (op == 'x') /* extract */
spawn(util, arg, fpath, NULL, F_NORMAL | F_MULTI);
else /* list */
get_output(util, arg, fpath, NULL, TRUE, TRUE);
if (x_to && (chdir(xdirname(fpath)) == -1)) {
printwarn(NULL);
return FALSE;
}
return TRUE;
}
static char *visit_parent(char *path, char *newpath, int *presel)
{
char *dir;
/* There is no going back */
if (istopdir(path)) {
/* Continue in type-to-nav mode, if enabled */
if (cfg.filtermode && presel)
*presel = FILTER;
return NULL;
}
/* Use a copy as xdirname() may change the string passed */
if (newpath)
xstrsncpy(newpath, path, PATH_MAX);
else
newpath = path;
dir = xdirname(newpath);
if (chdir(dir) == -1) {
printwarn(presel);
return NULL;
}
return dir;
}
static void valid_parent(char *path, char *lastname)
{
/* Save history */
xstrsncpy(lastname, xbasename(path), NAME_MAX + 1);
while (!istopdir(path))
if (visit_parent(path, NULL, NULL))
break;
printwarn(NULL);
xdelay(XDELAY_INTERVAL_MS);
}
static bool archive_mount(char *newpath)
{
char *str = "install archivemount";
@ -6491,7 +6510,10 @@ nochange:
r = get_input(messages[MSG_ARCHIVE_OPTS]);
if (r == 'l' || r == 'x') {
mkpath(path, pent->name, newpath);
handle_archive(newpath, r);
if (!handle_archive(newpath, r)) {
presel = MSGWAIT;
goto nochange;
}
if (r == 'l') {
statusbar(path);
goto nochange;