RE: patch for Dired second header line info

["Drew Adams" <drew.adams@oracle.com>]

[-- Attachment #1: Type: text/plain, Size: 1322 bytes --]

> > Attached: patch for this. The text is now:
> >
> >   files 420/694 space used 19646 available 56456000
> 
> The string `total' is the standard string printed by `ls' so maybe we
> should keep it.  Also what do you think about further compacting
> this line as:
> 
> total files 420/694 space 19646/56456000

I already said that I find "total" unclear and I prefer the form I proposed.

> or using the same function in `size-indication-mode' that displays the
> size in the mode line in human-readable format:
> 
> total files 420/694 space 19KB/56MB

That might be OK, but what's wrong with giving a more precise number? That's
typically what is given for this kind of thing.

> Also we could add a tooltip explaining what these numbers mean if they
> are not obvious.
> 
> > Meaning: 420 files shown now, out of 694 total in the 
> directory. Subdirs are
> > treated the same way.

Great minds think alike. I was already doing that - new patch attached.
(Also fixed a bug introduced in last patch.)

(The text should say nothing about subdirs, BTW - each subdir has its own
tooltip.)

> In your patch maybe better to move dired functionality to dired.el or
> dired-aux.el and rename `count-dired-files' to `dired-count-files'.

I'll leave that to others to decide. My proposal just leaves things where
they are now.


[-- Attachment #2: files-2008-03-02b.patch --]
[-- Type: application/octet-stream, Size: 4039 bytes --]

diff -c -w files-CVS-2008-02-29.el files-patched-2008-03-02b.el
*** files-CVS-2008-02-29.el	Fri Feb 29 14:59:08 2008
--- files-patched-2008-03-02b.el	Sun Mar  2 10:49:54 2008
***************
*** 5284,5302 ****
  		      (if val
  			  (put-text-property pos (point)
  					     'dired-filename t)))))))
! 
! 	  (if full-directory-p
! 	      ;; Try to insert the amount of free space.
  	      (save-excursion
  		(goto-char beg)
! 		;; First find the line to put it on.
! 		(when (re-search-forward "^ *\\(total\\)" nil t)
! 		  (let ((available (get-free-disk-space ".")))
  		    (when available
- 		      ;; Replace "total" with "used", to avoid confusion.
- 		      (replace-match "total used in directory" nil nil nil 1)
  		      (end-of-line)
! 		      (insert " available " available)))))))))))
  
  (defun insert-directory-adj-pos (pos error-lines)
    "Convert `ls --dired' file name position value POS to a buffer position.
--- 5284,5342 ----
  		      (if val
  			  (put-text-property pos (point)
  					     'dired-filename t)))))))
! 	  (when full-directory-p
              (save-excursion
                (goto-char beg)
!               (while (re-search-forward "^ *\\(total\\)" nil t)
!                 (beginning-of-line)
!                 (insert "files " (number-to-string (save-match-data
!                                                      (count-dired-files)))
!                         "/" (number-to-string
!                              (- (length (directory-files default-directory
!                                                          nil nil t)) 2))
!                         " ")
!                 (goto-char beg)
!                 (re-search-forward "^files [0-9]+/[0-9]+ \\(total\\)" nil t)
!                 (replace-match "space used" nil nil nil 1)
!                 (let ((available (and (fboundp 'get-free-disk-space)
!                                       (get-free-disk-space "."))))
                    (when available
                      (end-of-line)
!                     (insert " available " available)))
!                 (put-text-property (progn (beginning-of-line) (point))
!                                    (progn (end-of-line) (point))
!                                    'help-echo "Files shown, total files in \
! dir, Kbytes used in dir, Kbytes available on disk")))))))))
! 
! (defun count-dired-files ()
!   "Returns the number of files in the current Dired directory listing.
! This includes directory entries, as well as files, but it excludes `.'
! and `..'."
!   ;; Should we skip `#' files also, as in `dired-trivial-filenames'? Dunno.
!   (save-excursion
!     (re-search-backward "^$" nil 'to-bob)
!     (re-search-forward dired-move-to-filename-regexp nil t)
!     (let* ((beg (line-beginning-position))
!            (end (save-excursion (re-search-forward "^$" nil t)))
!            (dots-p (save-excursion      ; Is `..' present?
!                      (goto-char beg)
!                      (re-search-forward
!                       (concat directory-listing-before-filename-regexp
!                               "\\.\\./?$")
!                       end t))))
!       (if dots-p (- (count-lines beg end) 2) (count-lines beg end)))))
! 
! (add-hook 'dired-after-readin-hook 'update-dired-files-count)
! (defun update-dired-files-count ()
!   "Update file count in Dired header for each directory listed."
!   (let ((num-files (number-to-string (count-dired-files))))
!     (save-excursion
!       (goto-char (point-min))
!       (while (re-search-forward "^  files \\([0-9]+\\)" nil t)
!         (let ((buffer-read-only nil))
!           (replace-match (number-to-string (save-match-data (count-dired-files)))
!                          nil nil nil 1))
!         (set-buffer-modified-p nil)))))
  
  (defun insert-directory-adj-pos (pos error-lines)
    "Convert `ls --dired' file name position value POS to a buffer position.

Diff finished.  Sun Mar 02 10:53:36 2008

[-- Attachment #3: ls-lisp-2008-03-02b.patch --]
[-- Type: application/octet-stream, Size: 2360 bytes --]

diff -c -w ls-lisp-CVS-2008-02-29.el ls-lisp-patched-2008-03-02b.el
*** ls-lisp-CVS-2008-02-29.el	Fri Feb 29 14:58:50 2008
--- ls-lisp-patched-2008-03-02b.el	Sun Mar  2 10:51:18 2008
***************
*** 260,276 ****
  		  file switches (ls-lisp-time-index switches)
  		  nil full-directory-p))
  	     (signal (car err) (cdr err)))))
- 	;; Try to insert the amount of free space.
  	(save-excursion
  	  (goto-char (point-min))
! 	  ;; First find the line to put it on.
! 	  (when (re-search-forward "^total" nil t)
! 	    (let ((available (get-free-disk-space ".")))
  	      (when available
- 		;; Replace "total" with "total used", to avoid confusion.
- 		(replace-match "total used in directory")
  		(end-of-line)
! 		(insert " available " available)))))))))
  
  (defun ls-lisp-insert-directory
    (file switches time-index wildcard-regexp full-directory-p)
--- 260,287 ----
  		  file switches (ls-lisp-time-index switches)
  		  nil full-directory-p))
  	     (signal (car err) (cdr err)))))
  	(save-excursion
  	  (goto-char (point-min))
! 	  (while (re-search-forward "^total" nil t)
!             (beginning-of-line)
!             (insert "files " (number-to-string (save-match-data
!                                                  (count-dired-files)))
!                     "/" (number-to-string
!                          (- (length (directory-files default-directory
!                                                      nil nil t)) 2))
!                     " ")
!             (goto-char (point-min))
!             (re-search-forward "^files [0-9]+/[0-9]+ \\(total\\)" nil t)
!             (replace-match "space used" nil nil nil 1)
! 	    (let ((available (and (fboundp 'get-free-disk-space)
!                                   (get-free-disk-space "."))))
                (when available
                  (end-of-line)
!                 (insert " available " available)))
!             (put-text-property (progn (beginning-of-line) (point))
!                                (progn (end-of-line) (point))
!                                'help-echo "Files shown, total files in \
! dir, Kbytes used in dir, Kbytes available on disk")))))))
  
  (defun ls-lisp-insert-directory
    (file switches time-index wildcard-regexp full-directory-p)

Diff finished.  Sun Mar 02 10:51:42 2008