mm-util.el: Just return the image directories, not all directories in the path in...

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 4ad4fe4e11773869e32f2bbacc0b923fe788e440..c18cf19aaedce249889b5985ac303e3cb67a30dc 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,15 @@
+2010-09-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * nnmh.el (nnmh-request-list-1): Optimize for speed.
+
 2010-09-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * mm-util.el (mm-image-load-path): Just return the image directories,
+       not all directories in the path in addition to the image directories.
+       (mm-image-load-path): Maintain a cache of the image directories so that
+       the `g' command in Gnus doesn't have to stat dozens of directories each
+       time.
+
        * gnus-html.el (gnus-html-put-image): Allow images to be removed.
        (gnus-html-wash-tags): Add a new `i' command to insert images.
        (gnus-html-insert-image): New command and keystroke.

diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index da5d96d51f2e381611676c55893c9d20f22e9571..588915a1ab792bb1777a1702ad909d1c24fdacbd 100644 (file)
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -1429,16 +1429,23 @@ If SUFFIX is non-nil, add that at the end of the file name."
        ;; Reset the umask.
        (set-default-file-modes umask)))))
 
+(defvar mm-image-load-path-cache nil)
+
 (defun mm-image-load-path (&optional package)
-  (let (dir result)
-    (dolist (path load-path (nreverse result))
-      (when (and path
-                (file-directory-p
-                 (setq dir (concat (file-name-directory
-                                    (directory-file-name path))
-                                   "etc/images/" (or package "gnus/")))))
-       (push dir result))
-      (push path result))))
+  (if (and mm-image-load-path-cache
+          (equal load-path (car mm-image-load-path-cache)))
+      (cdr mm-image-load-path-cache)
+    (let (dir result)
+      (dolist (path load-path)
+       (when (and path
+                  (file-directory-p
+                   (setq dir (concat (file-name-directory
+                                      (directory-file-name path))
+                                     "etc/images/" (or package "gnus/")))))
+         (push dir result)))
+      (setq result (nreverse result)
+           mm-image-load-path-cache (cons load-path result))
+      result)))
 
 ;; Fixme: This doesn't look useful where it's used.
 (if (fboundp 'detect-coding-region)

diff --git a/lisp/gnus/nnmh.el b/lisp/gnus/nnmh.el
index 05eb669fa0bdbbf79daee253afa622b3af6ea381..86f751c76699460fff0d32822ae41652bb1772e2 100644 (file)
--- a/lisp/gnus/nnmh.el
+++ b/lisp/gnus/nnmh.el
@@ -207,21 +207,29 @@ as unread by Gnus.")
 (defun nnmh-request-list-1 (dir)
   (setq dir (expand-file-name dir))
   ;; Recurse down all directories.
-  (let ((dirs (and (file-readable-p dir)
-                  (nnheader-directory-files dir t nil t)))
-       rdir)
+  (let ((files (nnheader-directory-files dir t nil t))
+       (max 0)
+       min rdir attributes num)
     ;; Recurse down directories.
-    (while (setq rdir (pop dirs))
-      (when (and (file-directory-p rdir)
+    (dolist (rdir files)
+      (setq attributes (file-attributes rdir))
+      (when (null (nth 0 attributes))
+       (setq file (file-name-nondirectory rdir))
+       (when (string-match "^[0-9]+$" file)
+         (setq num (string-to-number file))
+         (setq max (max max num))
+         (when (or (null min)
+                   (< num min))
+           (setq min num))))
+      (when (and (eq (nth 0 attributes) t) ; Is a directory
+                (> (nth 1 attributes) 2)  ; Has sub-directories
                 (file-readable-p rdir)
                 (not (equal (file-truename rdir)
                             (file-truename dir))))
-       (nnmh-request-list-1 rdir))))
-  ;; For each directory, generate an active file line.
-  (unless (string= (expand-file-name nnmh-toplev) dir)
-    (let ((files (mapcar 'string-to-number
-                        (directory-files dir nil "^[0-9]+$" t))))
-      (when files
+       (nnmh-request-list-1 rdir)))
+    ;; For each directory, generate an active file line.
+    (unless (string= (expand-file-name nnmh-toplev) dir)
+      (when min
        (with-current-buffer nntp-server-buffer
          (goto-char (point-max))
          (insert
@@ -233,14 +241,13 @@ as unread by Gnus.")
                (file-truename (file-name-as-directory
                                (expand-file-name nnmh-toplev))))
               dir)
-             (mm-string-to-multibyte   ;Why?  Isn't it multibyte already?
+             (mm-string-to-multibyte ;Why?  Isn't it multibyte already?
               (mm-encode-coding-string
                (nnheader-replace-chars-in-string
                 (substring dir (match-end 0))
                 ?/ ?.)
                nnmail-pathname-coding-system)))
-           (apply 'max files)
-           (apply 'min files)))))))
+           max min))))))
   t)
 
 (deffoo nnmh-request-newgroups (date &optional server)