|
[-]
[+]
|
Changed |
_service:tar_git:ncdu.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/sailfishos-chum/ncdu</param>
<param name="branch"></param>
- <param name="revision">1.18.1+git1</param>
+ <param name="revision">1.19+git1</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:ncdu-1.19+git1.tar.gz/upstream/ChangeLog
^
|
| @@ -1,3 +1,8 @@
+1.19 - 2023-09-11
+ - Fix typo in --exclude-from argument
+ - Add --(enable|disable)-natsort options
+ - Add indicator to apparent size/disk usage selection in the footer
+
1.18.1 - 2023-02-12
- Fix build on non-Linux platforms
|
|
[-]
[+]
|
Changed |
_service:tar_git:ncdu-1.19+git1.tar.gz/upstream/README
^
|
| @@ -1,5 +1,5 @@
-ncdu 1.18.1
-===========
+ncdu 1.19
+=========
DESCRIPTION
|
|
[-]
[+]
|
Changed |
_service:tar_git:ncdu-1.19+git1.tar.gz/upstream/configure.ac
^
|
| @@ -1,5 +1,5 @@
-AC_INIT([ncdu],[1.18.1],[projects@yorhel.nl])
+AC_INIT([ncdu],[1.19],[projects@yorhel.nl])
AC_CONFIG_SRCDIR([src/global.h])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign std-options subdir-objects])
|
|
[-]
[+]
|
Changed |
_service:tar_git:ncdu-1.19+git1.tar.gz/upstream/doc/ncdu.pod
^
|
| @@ -238,6 +238,10 @@
ascending or descending, respectively. e.g. C<--sort=name-desc> will sort by
name in descending order.
+=item B<--enable-natsort>, B<--disable-natsort>
+
+Enable (default) or disable natural sort when sorting by file name.
+
=item B<--group-directories-first>, B<--no-group-directories-first>
Sort (or not) directories before files.
|
|
[-]
[+]
|
Changed |
_service:tar_git:ncdu-1.19+git1.tar.gz/upstream/src/browser.c
^
|
| @@ -289,15 +289,18 @@
mvhline(winrows-1, 0, ' ', wincols);
if(t) {
if(!show_as) attron(A_BOLD);
- mvaddstr(winrows-1, 0, " Total disk usage: ");
+ mvaddchc(UIC_HD, winrows-1, 0, show_as ? ' ' : '*');
+ addstr("Total disk usage: ");
if(!show_as) attroff(A_BOLD);
printsize(UIC_HD, t->parent->size);
if(show_as) attron(A_BOLD);
- addstrc(UIC_HD, " Apparent size: ");
+ addstrc(UIC_HD, " ");
+ addchc(UIC_HD, show_as ? '*' : ' ');
+ addstrc(UIC_HD, "Apparent size: ");
if(show_as) attroff(A_BOLD);
uic_set(UIC_NUM_HD);
printsize(UIC_HD, t->parent->asize);
- addstrc(UIC_HD, " Items: ");
+ addstrc(UIC_HD, " Items: ");
uic_set(UIC_NUM_HD);
printw("%d", t->parent->items);
} else
|
|
[-]
[+]
|
Changed |
_service:tar_git:ncdu-1.19+git1.tar.gz/upstream/src/dirlist.c
^
|
| @@ -39,7 +39,8 @@
int dirlist_sort_desc = 1,
dirlist_sort_col = DL_COL_SIZE,
dirlist_sort_df = 0,
- dirlist_hidden = 0;
+ dirlist_hidden = 0,
+ dirlist_natsort = 1;
/* private state vars */
static struct dir *parent_alloc, *head, *head_real, *selected, *top = NULL;
@@ -80,7 +81,7 @@
*
* Note that the method used below is supposed to be fast, not readable :-)
*/
-#define CMP_NAME strnatcmp(x->name, y->name)
+#define CMP_NAME (dirlist_natsort ? strnatcmp(x->name, y->name) : strcmp(x->name, y->name))
#define CMP_SIZE (x->size > y->size ? 1 : (x->size == y->size ? 0 : -1))
#define CMP_ASIZE (x->asize > y->asize ? 1 : (x->asize == y->asize ? 0 : -1))
#define CMP_ITEMS (x->items > y->items ? 1 : (x->items == y->items ? 0 : -1))
|
|
[-]
[+]
|
Changed |
_service:tar_git:ncdu-1.19+git1.tar.gz/upstream/src/dirlist.h
^
|
| @@ -78,6 +78,8 @@
/* set with dirlist_set_hidden() */
extern int dirlist_hidden;
+extern int dirlist_natsort;
+
/* maximum size of an item in the opened dir */
extern int64_t dirlist_maxs, dirlist_maxa;
|
|
[-]
[+]
|
Changed |
_service:tar_git:ncdu-1.19+git1.tar.gz/upstream/src/main.c
^
|
| @@ -219,6 +219,8 @@
else if(OPT("--hide-percent")) graph &= 1;
else if(OPT("--group-directories-first")) dirlist_sort_df = 1;
else if(OPT("--no-group-directories-first")) dirlist_sort_df = 0;
+ else if(OPT("--enable-natsort")) dirlist_natsort = 1;
+ else if(OPT("--disable-natsort")) dirlist_natsort = 0;
else if(OPT("--sort")) {
arg = ARG;
tmp = strrchr(arg, '-');
@@ -252,7 +254,7 @@
else if(OPT("-L") || OPT("--follow-symlinks")) follow_symlinks = 1;
else if(OPT("--no-follow-symlinks")) follow_symlinks = 0;
else if(OPT("--exclude")) exclude_add(ARG);
- else if(OPT("-X") || OPT("--exclude-form")) {
+ else if(OPT("-X") || OPT("--exclude-from")) {
arg = ARG;
if(exclude_addfile(arg)) die("Can't open %s: %s\n", arg, strerror(errno));
} else if(OPT("--exclude-caches")) cachedir_tags = 1;
|
|
[-]
[+]
|
Changed |
_service:tar_git:ncdu.yaml
^
|
| @@ -1,7 +1,7 @@
Name: ncdu
Summary: NCurses Disk Usage
# Careful: 2.x versions are written in zig, not C.
-Version: 1.18.1
+Version: 1.19
Release: 0
Group: Applications
URL: https://dev.yorhel.nl/ncdu
|
