]> Sergey Matveev's repositories - nnn.git/commitdiff
Uniform status bar for light and detail modes
authorArun Prakash Jana <engineerarun@gmail.com>
Sun, 15 Sep 2019 00:05:45 +0000 (05:35 +0530)
committerArun Prakash Jana <engineerarun@gmail.com>
Sun, 15 Sep 2019 00:05:58 +0000 (05:35 +0530)
src/nnn.c

index 5c086e38e3589f7fd4a1db9609cb59c1d268843a..1b5041e036f31104246cb70d6d8ef18b7c88f157 100644 (file)
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -3352,29 +3352,23 @@ static void redraw(char *path)
                        ptr = "\b";
 
                /* We need to show filename as it may be truncated in directory listing */
-               if (!cfg.showdetail && !cfg.blkorder) { /* light mode */
-                       /* Timestamp */
-                       strftime(buf, 18, "%F %R", localtime(&pent->t));
-
-                       mvprintw(lastln, 0, "%d/%d (%d) %s%s%s %s %s\n",
-                                cur + 1, ndents, nselected, selmode, sort, buf,
-                                get_lsperms(pent->mode), ptr);
-               } else if (!cfg.blkorder) { /* detail mode */
-                       /* Get the unescaped file name */
-                       base = unescape(pent->name, NAME_MAX, NULL);
-
-                       mvprintw(lastln, 0, "%d/%d (%d) %s%s%s [%s]\n",
-                                cur + 1, ndents, nselected, selmode, sort, ptr, base);
-               } else { /* du mode */
-                       /* Get the unescaped file name */
-                       base = unescape(pent->name, NAME_MAX, NULL);
+               /* Get the unescaped file name */
+               base = unescape(pent->name, NAME_MAX, NULL);
 
+               if (cfg.blkorder) { /* du mode */
                        xstrlcpy(buf, coolsize(dir_blocks << BLK_SHIFT), 12);
                        c = cfg.apparentsz ? 'a' : 'd';
 
                        mvprintw(lastln, 0, "%d/%d (%d) %s%cu: %s (%lu files) free: %s %s [%s]\n",
                                 cur + 1, ndents, nselected, selmode, c, buf, num_files,
                                 coolsize(get_fs_info(path, FREE)), ptr, base);
+               } else { /* light or detail mode */
+                       /* Timestamp */
+                       strftime(buf, 18, "%d/%b/%Y %R", localtime(&pent->t));
+
+                       mvprintw(lastln, 0, "%d/%d (%d) %s%s%s %s %s [%s]\n",
+                                cur + 1, ndents, nselected, selmode, sort, buf,
+                                get_lsperms(pent->mode), ptr, base);
                }
        } else
                printmsg("0/0");