* imap.el: Add compiler directives.

[gnus] / lisp / nneething.el

diff --git a/lisp/nneething.el b/lisp/nneething.el
index 700dad8..bf9e1c6 100644 (file)
--- a/lisp/nneething.el
+++ b/lisp/nneething.el
@@ -1,8 +1,10 @@
 ;;; nneething.el --- arbitrary file access for Gnus
 ;;; nneething.el --- arbitrary file access for Gnus

-;; Copyright (C) 1995,96,97,98 Free Software Foundation, Inc.
+
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+;;     Free Software Foundation, Inc.

 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>

-;;     Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
+;;     Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>

 ;; Keywords: news, mail
 
 ;; This file is part of GNU Emacs.
 ;; Keywords: news, mail
 
 ;; This file is part of GNU Emacs.


@@ -45,6 +47,11 @@
   "Regexp saying what files to exclude from the group.
 If this variable is nil, no files will be excluded.")
 
   "Regexp saying what files to exclude from the group.
 If this variable is nil, no files will be excluded.")
 

+(defvoo nneething-include-files nil
+  "Regexp saying what files to include in the group.
+If this variable is non-nil, only files matching this regexp will be
+included.")
+

 \f
 
 ;;; Internal variables.
 \f
 
 ;;; Internal variables.


@@ -57,7 +64,6 @@ If this variable is nil, no files will be excluded.")
 
 (defvoo nneething-status-string "")
 
 
 (defvoo nneething-status-string "")
 

-(defvoo nneething-message-id-number 0)

 (defvoo nneething-work-buffer " *nneething work*")
 
 (defvoo nneething-group nil)
 (defvoo nneething-work-buffer " *nneething work*")
 
 (defvoo nneething-group nil)


@@ -102,7 +108,7 @@ If this variable is nil, no files will be excluded.")
          (and large
               (zerop (% count 20))
               (nnheader-message 5 "nneething: Receiving headers... %d%%"
          (and large
               (zerop (% count 20))
               (nnheader-message 5 "nneething: Receiving headers... %d%%"

-                       (/ (* count 100) number))))
+                                (/ (* count 100) number))))

 
        (when large
          (nnheader-message 5 "nneething: Receiving headers...done"))
 
        (when large
          (nnheader-message 5 "nneething: Receiving headers...done"))


@@ -115,14 +121,27 @@ If this variable is nil, no files will be excluded.")
   (let ((file (unless (stringp id)
                (nneething-file-name id)))
        (nntp-server-buffer (or buffer nntp-server-buffer)))
   (let ((file (unless (stringp id)
                (nneething-file-name id)))
        (nntp-server-buffer (or buffer nntp-server-buffer)))

-    (and (stringp file)                        ; We did not request by Message-ID.
+    (and (stringp file)                   ; We did not request by Message-ID.

         (file-exists-p file)           ; The file exists.
         (not (file-directory-p file))  ; It's not a dir.
         (save-excursion
         (file-exists-p file)           ; The file exists.
         (not (file-directory-p file))  ; It's not a dir.
         (save-excursion

-          (nnmail-find-file file)      ; Insert the file in the nntp buf.
+          (let ((nnmail-file-coding-system 'binary))
+            (nnmail-find-file file))   ; Insert the file in the nntp buf.

           (unless (nnheader-article-p) ; Either it's a real article...
           (unless (nnheader-article-p) ; Either it's a real article...

-            (goto-char (point-min))
-            (nneething-make-head file (current-buffer)) ; ... or we fake some headers.
+            (let ((type
+                   (unless (file-directory-p file)
+                     (or (cdr (assoc (concat "." (file-name-extension file))
+                                     mailcap-mime-extensions))
+                         "text/plain")))
+                  (charset
+                   (mm-detect-mime-charset-region (point-min) (point-max)))
+                  (encoding))
+              (unless (string-match "\\`text/" type)
+                (base64-encode-region (point-min) (point-max))
+                (setq encoding "base64"))
+              (goto-char (point-min))
+              (nneething-make-head file (current-buffer)
+                                   nil type charset encoding))

             (insert "\n"))
           t))))
 
             (insert "\n"))
           t))))
 


@@ -211,17 +230,27 @@ If this variable is nil, no files will be excluded.")
                  (setq files (cdr files)))
              (setq prev f))
            (setq f (cdr f)))))
                  (setq files (cdr files)))
              (setq prev f))
            (setq f (cdr f)))))

+      ;; Remove files not matching the inclusion regexp.
+      (when nneething-include-files
+       (let ((f files)
+             prev)
+         (while f
+           (if (not (string-match nneething-include-files (car f)))
+               (if prev (setcdr prev (cdr f))
+                 (setq files (cdr files)))
+             (setq prev f))
+           (setq f (cdr f)))))

       ;; Remove deleted files from the map.
       (let ((map nneething-map)
            prev)
        (while map
       ;; Remove deleted files from the map.
       (let ((map nneething-map)
            prev)
        (while map

-         (if (and (member (cadar map) files)
-                  ;; We also remove files that have changed mod times.
+         (if (and (member (cadr (car map)) files)
+                 ;; We also remove files that have changed mod times.

                   (equal (nth 5 (file-attributes
                   (equal (nth 5 (file-attributes

-                                 (nneething-file-name (cadar map))))
-                         (caddar map)))
+                                 (nneething-file-name (cadr (car map)))))
+                         (cadr (cdar map))))

              (progn
              (progn

-               (push (cadar map) map-files)
+               (push (cadr (car map)) map-files)

                (setq prev map))
            (setq touched t)
            (if prev
                (setq prev map))
            (setq touched t)
            (if prev


@@ -254,13 +283,42 @@ If this variable is nil, no files will be excluded.")
     (insert-buffer-substring nneething-work-buffer)
     (goto-char (point-max))))
 
     (insert-buffer-substring nneething-work-buffer)
     (goto-char (point-max))))
 

-(defun nneething-make-head (file &optional buffer)
+(defun nneething-encode-file-name (file &optional coding-system)
+  "Encode the name of the FILE in CODING-SYSTEM."
+  (let ((pos 0) buf)
+    (setq file (mm-encode-coding-string
+               file (or coding-system nnmail-pathname-coding-system)))
+    (while (string-match "[^-0-9a-zA-Z_:/.]" file pos)
+      (setq buf (cons (format "%%%02x" (aref file (match-beginning 0)))
+                     (cons (substring file pos (match-beginning 0)) buf))
+           pos (match-end 0)))
+    (apply (function concat)
+          (nreverse (cons (substring file pos) buf)))))
+
+(defun nneething-decode-file-name (file &optional coding-system)
+  "Decode the name of the FILE is encoded in CODING-SYSTEM."
+  (let ((pos 0) buf)
+    (while (string-match "%\\([0-9a-fA-F][0-9a-fA-F]\\)" file pos)
+      (setq buf (cons (string (string-to-number (match-string 1 file) 16))
+                     (cons (substring file pos (match-beginning 0)) buf))
+           pos (match-end 0)))
+    (decode-coding-string
+     (apply (function concat)
+           (nreverse (cons (substring file pos) buf)))
+     (or coding-system nnmail-pathname-coding-system))))
+
+(defun nneething-get-file-name (id)
+  "Extract the file name from the message ID string."
+  (when (string-match "\\`<nneething-\\([^@]+\\)@.*>\\'" id)
+    (nneething-decode-file-name (match-string 1 id))))
+
+(defun nneething-make-head (file &optional buffer extra-msg
+                                mime-type mime-charset mime-encoding)

   "Create a head by looking at the file attributes of FILE."
   (let ((atts (file-attributes file)))
     (insert
   "Create a head by looking at the file attributes of FILE."
   (let ((atts (file-attributes file)))
     (insert

-     "Subject: " (file-name-nondirectory file) "\n"
-     "Message-ID: <nneething-"
-     (int-to-string (incf nneething-message-id-number))
+     "Subject: " (file-name-nondirectory file) (or extra-msg "") "\n"
+     "Message-ID: <nneething-" (nneething-encode-file-name file)

      "@" (system-name) ">\n"
      (if (equal '(0 0) (nth 5 atts)) ""
        (concat "Date: " (current-time-string (nth 5 atts)) "\n"))
      "@" (system-name) ">\n"
      (if (equal '(0 0) (nth 5 atts)) ""
        (concat "Date: " (current-time-string (nth 5 atts)) "\n"))


@@ -280,7 +338,19 @@ If this variable is nil, no files will be excluded.")
                              (count-lines (point-min) (point-max)))
                   "\n"))
        "")
                              (count-lines (point-min) (point-max)))
                   "\n"))
        "")

-     )))
+     (if mime-type
+        (concat "Content-Type: " mime-type
+                (if mime-charset
+                    (concat "; charset="
+                            (if (stringp mime-charset)
+                                mime-charset
+                              (symbol-name mime-charset)))
+                  "")
+                (if mime-encoding
+                    (concat "\nContent-Transfer-Encoding: " mime-encoding)
+                  "")
+                "\nMIME-Version: 1.0\n")
+       ""))))

 
 (defun nneething-from-line (uid &optional file)
   "Return a From header based of UID."
 
 (defun nneething-from-line (uid &optional file)
   "Return a From header based of UID."


@@ -300,7 +370,8 @@ If this variable is nil, no files will be excluded.")
                       (substring file
                                  (match-beginning 1)
                                  (match-end 1))
                       (substring file
                                  (match-beginning 1)
                                  (match-end 1))

-                    (when (string-match "/\\(users\\|home\\)/\\([^/]+\\)/" file)
+                    (when (string-match
+                           "/\\(users\\|home\\)/\\([^/]+\\)/" file)

                       (setq login (substring file
                                              (match-beginning 2)
                                              (match-end 2))
                       (setq login (substring file
                                              (match-beginning 2)
                                              (match-end 2))


@@ -326,26 +397,33 @@ If this variable is nil, no files will be excluded.")
       (nneething-make-head file) t)
      (t
       ;; We examine the file.
       (nneething-make-head file) t)
      (t
       ;; We examine the file.

-      (nnheader-insert-head file)
-      (if (nnheader-article-p)
-         (delete-region
-          (progn
-            (goto-char (point-min))
-            (or (and (search-forward "\n\n" nil t)
-                     (1- (point)))
-                (point-max)))
-          (point-max))
-       (goto-char (point-min))
-       (nneething-make-head file (current-buffer))
-       (delete-region (point) (point-max)))
+      (condition-case ()
+         (progn
+           (nnheader-insert-head file)
+           (if (nnheader-article-p)
+               (delete-region
+                (progn
+                  (goto-char (point-min))
+                  (or (and (search-forward "\n\n" nil t)
+                           (1- (point)))
+                      (point-max)))
+                (point-max))
+             (goto-char (point-min))
+             (nneething-make-head file (current-buffer))
+             (delete-region (point) (point-max))))
+       (file-error
+        (nneething-make-head file (current-buffer) " (unreadable)")))

       t))))
 
 (defun nneething-file-name (article)
   "Return the file name of ARTICLE."
       t))))
 
 (defun nneething-file-name (article)
   "Return the file name of ARTICLE."

-  (concat (file-name-as-directory nneething-address)
-         (if (numberp article)
-             (cadr (assq article nneething-map))
-           article)))
+  (let ((dir (file-name-as-directory nneething-address))
+       fname)
+    (if (numberp article)
+       (if (setq fname (cadr (assq article nneething-map)))
+           (expand-file-name fname dir)
+         (make-temp-name (expand-file-name "nneething" dir)))
+      (expand-file-name article dir))))

 
 (provide 'nneething)
 
 
 (provide 'nneething)