[PATCH] Emacs CVS: find-file.el - Line up all columns in output

[PATCH] Emacs CVS: find-file.el - Line up all columns in output

[Jari Aalto]

Patch against CVS 2007-10-07 22:15 UTC

Current output of M-x find-file:

  -rw-r--r-- 1 root None 123166 Sep 30 00:23 dir/test.tst
  -rw-r--r-- 1 root None 18 Oct  7 17:49 tmp/1

After the "line up" fix, where the size columns are placed evenly
to make the rest of the line, namely the file names, line up.

  -rw-r--r-- 1 root None 123166 Sep 30 00:23 dir/test.tst
  -rw-r--r-- 1 root None  18 Oct  7 17:49 tmp/1

2007-10-08  Jari Aalto  <jari.aalto AT cante.net>

        * find-dired.el (find-dired-filter): Make output line up by
        adjusting the position of file sizes at column 5.

diff --git a/find-dired.el b/find-dired.el
index 0a3de85..79b0c13 100644
--- a/find-dired.el
+++ b/find-dired.el
@@ -232,7 +232,12 @@ Thus ARG can also contain additional grep options."
 (defun find-dired-filter (proc string)
   ;; Filter for \\[find-dired] processes.
   (let ((buf (process-buffer proc))
-	(inhibit-read-only t))
+        (inhibit-read-only t)
+        (l-opt  (and (consp find-ls-option)
+                     (string-match "l" (cdr find-ls-option))))
+        (size-regexp (concat
+                      "^ *[^ \t\r\n]+ +[^ \t\r\n]+ +"
+                      "[^ \t\r\n]+ +[^ \t\r\n]+ +\\([0-9]+\\)")))
     (if (buffer-name buf)		; not killed?
 	(save-excursion
 	  (set-buffer buf)
@@ -246,6 +251,7 @@ Thus ARG can also contain additional grep options."
 		(goto-char end)
 		(or (looking-at "^")
 		    (forward-line 1))
+                (goto-char (line-beginning-position))
 		(while (looking-at "^")
 		  (insert "  ")
 		  (forward-line 1))
@@ -255,6 +261,19 @@ Thus ARG can also contain additional grep options."
 		(goto-char (- end 3))	; no error if < 0
 		(while (search-forward " ./" nil t)
 		  (delete-region (point) (- (point) 2)))
+                ;; Make output "line up" by adjusting the file size at column 5
+                ;; -rw-r----x 1 foo foo 2425 Dec  5  2005 file.txt
+                ;; -rw-r----x 1 foo foo   25 Dec  5  2005 test.tmp
+                (if l-opt
+                    (progn
+                      (goto-char (- end 3))
+                      (if (re-search-forward size-regexp nil t)
+                          (replace-match
+                           (format "%6s" (match-string 1))
+                           (not 'fixcase)
+                           (not 'literal)
+                           (not 'string)
+                           1))))
 		;; Find all the complete lines in the unprocessed
 		;; output and process it to add text properties.
 		(goto-char (point-max))

Re: [PATCH] Emacs CVS: find-file.el - Line up all columns in output

[Richard Stallman]

I don't think this change fully does the job, because file sizes
can be more than 6 digits.

Re: [PATCH] Emacs CVS: find-file.el - Line up all columns in output

[Jari Aalto]

* Mon 2007-10-08 Richard Stallman <rms AT gnu.org> INBOX
> I don't think this change fully does the job, because file sizes
> can be more than 6 digits.

I increased the size to 10 digits, which accomodates up to 9G. The
format is now also user configurable.

Jari

etc/ChangeLog

2007-10-09  Jari Aalto  <jari.aalto AT cante.net>

        * NEWS: Document new variable `find-dired-file-size-format'


diff --git a/NEWS b/NEWS
index b2e185b..3951639 100644
--- a/NEWS
+++ b/NEWS
@@ -238,6 +238,9 @@ saving changes.
 
 *** The new command `eshell/info' runs info in an eshell buffer.
 
+*** The new variable `find-dired-file-size-format' controls the placement
+of file sizes in command `find-dired'.
+
 \f
 * Changes in Emacs 23.1 on non-free operating systems
 


lisp/Changelog


2007-10-08  Jari Aalto  <jari.aalto AT cante.net>

        * find-dired.el (find-dired-filter): Make output line up by
        adjusting the position of file sizes at column 5.
        (find-dired-file-size-format): New customizable variable.

diff --git a/find-dired.el b/find-dired.el
index 0a3de85..0c0c031 100644
--- a/find-dired.el
+++ b/find-dired.el
@@ -77,6 +77,9 @@ On other systems, the closest you can come is to use `-l'."
   :type 'string
   :group 'find-dired)
 
+(defcustom find-dired-file-size-format "%10s" ;; Up to 1-9G file size
+  "*Format spec of `find-dired' listing for file sizes.")
+
 (defvar find-args nil
   "Last arguments given to `find' by \\[find-dired].")
 
@@ -232,7 +235,12 @@ Thus ARG can also contain additional grep options."
 (defun find-dired-filter (proc string)
   ;; Filter for \\[find-dired] processes.
   (let ((buf (process-buffer proc))
-	(inhibit-read-only t))
+        (inhibit-read-only t)
+        (l-opt  (and (consp find-ls-option)
+                     (string-match "l" (cdr find-ls-option))))
+        (size-regexp (concat
+                      "^ *[^ \t\r\n]+ +[^ \t\r\n]+ +"
+                      "[^ \t\r\n]+ +[^ \t\r\n]+ +\\([0-9]+\\)")))
     (if (buffer-name buf)		; not killed?
 	(save-excursion
 	  (set-buffer buf)
@@ -255,6 +263,20 @@ Thus ARG can also contain additional grep options."
 		(goto-char (- end 3))	; no error if < 0
 		(while (search-forward " ./" nil t)
 		  (delete-region (point) (- (point) 2)))
+                ;; Make output line up by adjusting the file size at column 5
+                ;; -rw-r----x 1 foo foo 2425 Dec  5  2005 file.txt
+                ;; -rw-r----x 1 foo foo   25 Dec  5  2005 test.tmp
+                (if l-opt
+                    (progn
+                      (goto-char (- end 3))
+                      (if (re-search-forward size-regexp nil t)
+                          (replace-match
+                           (format find-dired-file-size-format
+                                   (match-string 1))
+                           (not 'fixcase)
+                           (not 'literal)
+                           (not 'string)
+                           1))))
 		;; Find all the complete lines in the unprocessed
 		;; output and process it to add text properties.
 		(goto-char (point-max))