* shr.el (shr-insert): Don't insert double spaces.

[gnus] / lisp / nneething.el

diff --git a/lisp/nneething.el b/lisp/nneething.el
index 1723cfe..2de2dca 100644 (file)
--- a/lisp/nneething.el
+++ b/lisp/nneething.el
@@ -1,16 +1,18 @@
-;;; nneething.el --- random file access for Gnus
-;; Copyright (C) 1995,96,97 Free Software Foundation, Inc.
+;;; nneething.el --- arbitrary file access for Gnus

 
 

-;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
-;;     Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
+;;     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.
 

-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify

 ;; it under the terms of the GNU General Public License as published by
 ;; it under the terms of the GNU General Public License as published by

-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.

 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -18,23 +20,24 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License

-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.

 
 ;;; Commentary:
 
 ;;; Code:
 
 
 ;;; Commentary:
 
 ;;; Code:
 

+(eval-when-compile (require 'cl))
+
+(require 'mailcap)

 (require 'nnheader)
 (require 'nnmail)
 (require 'nnoo)
 (require 'gnus-util)
 (require 'nnheader)
 (require 'nnmail)
 (require 'nnoo)
 (require 'gnus-util)

-(require 'cl)

 
 (nnoo-declare nneething)
 
 
 (nnoo-declare nneething)
 

-(defvoo nneething-map-file-directory "~/.nneething/"
+(defvoo nneething-map-file-directory
+  (nnheader-concat gnus-directory ".nneething/")

   "Where nneething stores the map files.")
 
 (defvoo nneething-map-file ".nneething"
   "Where nneething stores the map files.")
 
 (defvoo nneething-map-file ".nneething"


@@ -44,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.


@@ -56,13 +64,13 @@ 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-map nil)
 (defvoo nneething-read-only nil)
 (defvoo nneething-active nil)
 (defvoo nneething-work-buffer " *nneething work*")
 
 (defvoo nneething-group nil)
 (defvoo nneething-map nil)
 (defvoo nneething-read-only nil)
 (defvoo nneething-active nil)

+(defvoo nneething-address nil)

 
 \f
 
 
 \f
 


@@ -73,8 +81,7 @@ If this variable is nil, no files will be excluded.")
 (deffoo nneething-retrieve-headers (articles &optional group server fetch-old)
   (nneething-possibly-change-directory group)
 
 (deffoo nneething-retrieve-headers (articles &optional group server fetch-old)
   (nneething-possibly-change-directory group)
 

-  (save-excursion
-    (set-buffer nntp-server-buffer)
+  (with-current-buffer nntp-server-buffer

     (erase-buffer)
     (let* ((number (length articles))
           (count 0)
     (erase-buffer)
     (let* ((number (length articles))
           (count 0)


@@ -99,11 +106,11 @@ If this variable is nil, no files will be excluded.")
 
          (and large
               (zerop (% count 20))
 
          (and large
               (zerop (% count 20))

-              (message "nneething: Receiving headers... %d%%"
-                       (/ (* count 100) number))))
+              (nnheader-message 5 "nneething: Receiving headers... %d%%"
+                                (/ (* count 100) number))))

 
        (when large
 
        (when large

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

 
        (nnheader-fold-continuation-lines)
        'headers))))
 
        (nnheader-fold-continuation-lines)
        'headers))))


@@ -113,18 +120,31 @@ 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))))
 

-(deffoo nneething-request-group (group &optional server dont-check)
+(deffoo nneething-request-group (group &optional server dont-check info)

   (nneething-possibly-change-directory group server)
   (unless dont-check
     (nneething-create-mapping)
   (nneething-possibly-change-directory group server)
   (unless dont-check
     (nneething-create-mapping)


@@ -154,8 +174,8 @@ If this variable is nil, no files will be excluded.")
   (nnheader-init-server-buffer)
   (if (nneething-server-opened server)
       t
   (nnheader-init-server-buffer)
   (if (nneething-server-opened server)
       t

-    (unless (assq 'nneething-directory defs)
-      (setq defs (append defs (list (list 'nneething-directory server)))))
+    (unless (assq 'nneething-address defs)
+      (setq defs (append defs (list (list 'nneething-address server)))))

     (nnoo-change-server 'nneething server defs)))
 
 \f
     (nnoo-change-server 'nneething server defs)))
 
 \f


@@ -181,9 +201,9 @@ If this variable is nil, no files will be excluded.")
 
 (defun nneething-create-mapping ()
   ;; Read nneething-active and nneething-map.
 
 (defun nneething-create-mapping ()
   ;; Read nneething-active and nneething-map.

-  (when (file-exists-p nneething-directory)
+  (when (file-exists-p nneething-address)

     (let ((map-file (nneething-map-file))
     (let ((map-file (nneething-map-file))

-         (files (directory-files nneething-directory))
+         (files (directory-files nneething-address))

          touched map-files)
       (when (file-exists-p map-file)
        (ignore-errors
          touched map-files)
       (when (file-exists-p map-file)
        (ignore-errors


@@ -209,17 +229,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


@@ -239,7 +269,7 @@ If this variable is nil, no files will be excluded.")
        (setq files (cdr files)))
       (when (and touched
                 (not nneething-read-only))
        (setq files (cdr files)))
       (when (and touched
                 (not nneething-read-only))

-       (nnheader-temp-write map-file
+       (with-temp-file map-file

          (insert "(setq nneething-map '")
          (gnus-prin1 nneething-map)
          (insert ")\n(setq nneething-active '")
          (insert "(setq nneething-map '")
          (gnus-prin1 nneething-map)
          (insert ")\n(setq nneething-active '")


@@ -252,33 +282,72 @@ 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)))
+    (mm-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"))
      (or (when buffer
      "@" (system-name) ">\n"
      (if (equal '(0 0) (nth 5 atts)) ""
        (concat "Date: " (current-time-string (nth 5 atts)) "\n"))
      (or (when buffer

-          (save-excursion
-            (set-buffer buffer)
+          (with-current-buffer buffer

             (when (re-search-forward "<[a-zA-Z0-9_]@[-a-zA-Z0-9_]>" 1000 t)
               (concat "From: " (match-string 0) "\n"))))
         (nneething-from-line (nth 2 atts) file))
             (when (re-search-forward "<[a-zA-Z0-9_]@[-a-zA-Z0-9_]>" 1000 t)
               (concat "From: " (match-string 0) "\n"))))
         (nneething-from-line (nth 2 atts) file))

-     (if (> (string-to-int (int-to-string (nth 7 atts))) 0)
+     (if (> (string-to-number (int-to-string (nth 7 atts))) 0)

         (concat "Chars: " (int-to-string (nth 7 atts)) "\n")
        "")
      (if buffer
         (concat "Chars: " (int-to-string (nth 7 atts)) "\n")
        "")
      (if buffer

-        (save-excursion
-          (set-buffer buffer)
+        (with-current-buffer buffer

           (concat "Lines: " (int-to-string
                              (count-lines (point-min) (point-max)))
                   "\n"))
        "")
           (concat "Lines: " (int-to-string
                              (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."


@@ -298,7 +367,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))


@@ -309,10 +379,9 @@ If this variable is nil, no files will be excluded.")
 
 (defun nneething-get-head (file)
   "Either find the head in FILE or make a head for FILE."
 
 (defun nneething-get-head (file)
   "Either find the head in FILE or make a head for FILE."

-  (save-excursion
-    (set-buffer (get-buffer-create nneething-work-buffer))
+  (with-current-buffer (get-buffer-create nneething-work-buffer)

     (setq case-fold-search nil)
     (setq case-fold-search nil)

-    (buffer-disable-undo (current-buffer))
+    (buffer-disable-undo)

     (erase-buffer)
     (cond
      ((not (file-exists-p file))
     (erase-buffer)
     (cond
      ((not (file-exists-p file))


@@ -324,26 +393,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-directory)
-         (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)