bug#29803: [PATCH] Fix output alignment in find-dired

bug#29803: [PATCH] Fix output alignment in find-dired

[Sebastian Reuße]

* lisp/find-dired.el (find-dired-filter): Fix alignment of the file size
column when the user is using human file sizes as per ‘find-ls-option’.
---
 lisp/find-dired.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 3b0613b280..4501da991b 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -295,7 +295,7 @@ specifies what to use in place of \"-ls\" as the final argument."
 		    (l-opt (and (consp find-ls-option)
 				(string-match "l" (cdr find-ls-option))))
 		    (ls-regexp (concat "^ +[^ \t\r\n]+\\( +[^ \t\r\n]+\\) +"
-				       "[^ \t\r\n]+ +[^ \t\r\n]+\\( +[0-9]+\\)")))
+				       "[^ \t\r\n]+ +[^ \t\r\n]+\\( +[0-9]+[kMGT]?\\)")))
 		(goto-char beg)
 		(insert string)
 		(goto-char beg)
-- 
2.15.1

bug#29803: [PATCH] Fix output alignment in find-dired

[Sebastian Reuße]

* lisp/find-dired.el (find-dired-filter): Fix alignment of the file size
column when the user is using human file sizes as per ‘find-ls-option’.
---
 lisp/find-dired.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 3b0613b280..0179860a60 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -295,7 +295,7 @@ specifies what to use in place of \"-ls\" as the final argument."
 		    (l-opt (and (consp find-ls-option)
 				(string-match "l" (cdr find-ls-option))))
 		    (ls-regexp (concat "^ +[^ \t\r\n]+\\( +[^ \t\r\n]+\\) +"
-				       "[^ \t\r\n]+ +[^ \t\r\n]+\\( +[0-9]+\\)")))
+				       "[^ \t\r\n]+ +[^ \t\r\n]+\\( +[0-9.,]+[kMGT]?\\)")))
 		(goto-char beg)
 		(insert string)
 		(goto-char beg)
-- 
2.15.1

bug#29803: [PATCH] Fix output alignment in find-dired

[Sebastian Reuße]

Sebastian Reuße <seb@wirrsal.net> writes:

> * lisp/find-dired.el (find-dired-filter): Fix alignment of the file size
> column when the user is using human file sizes as per ‘find-ls-option’.

Sorry, forgot to amend an additional change from my working directory
before mailing the patch. This supersedes the original patch.

Kind regards,
SR

bug#29803: [PATCH] Fix output alignment in find-dired

[Eli Zaretskii]

> From: Sebastian Reuße <seb@wirrsal.net>
> Date: Thu, 21 Dec 2017 19:08:11 +0100
> Cc: Sebastian Reuße <seb@wirrsal.net>
> 
> * lisp/find-dired.el (find-dired-filter): Fix alignment of the file size
> column when the user is using human file sizes as per ‘find-ls-option’.

Thanks.  Could you please provide a minimum example to demonstrate the
current code's mis-alignment and how your patch fixes that?

bug#29803: [PATCH] Fix output alignment in find-dired

[Sebastian Reuße]

Hello Eli,

Eli Zaretskii <eliz@gnu.org> writes:

> Thanks.  Could you please provide a minimum example to demonstrate the
> current code's mis-alignment and how your patch fixes that?

You can reproduce the alignment issue when using the example from the
`find-ls-option` docs:

    (let ((find-ls-option '("-exec ls -ldh {} +" . "-ldh")))
      (find-dired "/tmp" "-type f"))

E.g., for me, this yields:

  -rw-------   1 seb users      226K 22. Dez 14:59 emacs-trustFuURayKH
  -rw-------   1 seb users      226K 22. Dez 14:59 emacs-trustI8LaIFbp
  -rw-------   1 seb users      156 22. Dez 14:58 serverauth.Zq2gEantga
  -r--r--r--   1 seb users       11 22. Dez 14:58 .X0-lock

find-dired uses a regex group to align the size column. This group
currently does not include the size suffix, so when using
human-formatted output, the remaining columns are misaligned.

When we include the suffix in the capture group, we get the desired
alignment:

  -rw-------   1 seb users      226K 22. Dez 14:59 emacs-trustFuURayKH
  -rw-------   1 seb users      226K 22. Dez 14:59 emacs-trustI8LaIFbp
  -rw-------   1 seb users       156 22. Dez 14:58 serverauth.Zq2gEantga
  -r--r--r--   1 seb users        11 22. Dez 14:58 .X0-lock

Actually, it now occurs to me that the suffix might vary in case, e.g.
when using ‘--si’ output. I’d propose we instead have the group capture
all consecutive non-whitespace (cf. superseding patch). This would then
also cover the decimal and thousands separators.

Kind regards,
SR

--
Insane cobra split the wood
Trader of the lowland breed
Call a jittney, drive away
In the slipstream we will stay

bug#29803: [PATCH] Fix output alignment in find-dired

[Sebastian Reuße]

* lisp/find-dired.el (find-dired-filter): Fix alignment of the file size
column when the user is using human file sizes as per ‘find-ls-option’.
---
 lisp/find-dired.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 3b0613b280..bf815d500d 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -295,7 +295,7 @@ specifies what to use in place of \"-ls\" as the final argument."
 		    (l-opt (and (consp find-ls-option)
 				(string-match "l" (cdr find-ls-option))))
 		    (ls-regexp (concat "^ +[^ \t\r\n]+\\( +[^ \t\r\n]+\\) +"
-				       "[^ \t\r\n]+ +[^ \t\r\n]+\\( +[0-9]+\\)")))
+				       "[^ \t\r\n]+ +[^ \t\r\n]+\\( +[^[:space:]]+\\)")))
 		(goto-char beg)
 		(insert string)
 		(goto-char beg)
-- 
2.15.1

bug#29803: [PATCH] Fix output alignment in find-dired

[Eli Zaretskii]

> From: Sebastian Reuße <seb@wirrsal.net>
> Date: Fri, 22 Dec 2017 16:24:24 +0100
> Cc: Sebastian Reuße <seb@wirrsal.net>
> 
> * lisp/find-dired.el (find-dired-filter): Fix alignment of the file size
> column when the user is using human file sizes as per ‘find-ls-option’.

Thanks, pushed to the master branch.