Start preparing for partial downloads.

* nnimap.el (nnimap-find-wanted-parts-1): New function.
(nnimap-fetch-partial-articles): New variable.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f32b3b8..e790eaa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-09-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * nnimap.el (nnimap-find-wanted-parts-1): New function.
+       (nnimap-fetch-partial-articles): New variable.
+
        * gnus.el (gnus-similar-server-opened): Refactor a bit and add
        comments.
        (gnus-methods-sloppily-equal): New function.

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 2675df3..8324d99 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -70,6 +70,13 @@ not done by default on servers that doesn't support that command.")
   "How nnimap authenticate itself to the server.
 Possible choices are nil (use default methods) or `anonymous'.")
 
+(defvoo nnimap-fetch-partial-articles nil
+  "If non-nil, nnimap will fetch partial articles.
+If t, nnimap will fetch only the first part.  If a string, it
+will fetch all parts that have types that match that string.  A
+likely value would be \"text/\" to automatically fetch all
+textual parts.")
+
 (defvoo nnimap-connection-alist nil)
 
 (defvoo nnimap-current-infos nil)
@@ -309,7 +316,8 @@ Possible choices are nil (use default methods) or `anonymous'.")
 
 (deffoo nnimap-request-article (article &optional group server to-buffer)
   (with-current-buffer nntp-server-buffer
-    (let ((result (nnimap-possibly-change-group group server)))
+    (let ((result (nnimap-possibly-change-group group server))
+         parts)
       (when (stringp article)
        (setq article (nnimap-find-article-by-message-id group article)))
       (when (and result
@@ -317,6 +325,14 @@ Possible choices are nil (use default methods) or `anonymous'.")
        (erase-buffer)
        (with-current-buffer (nnimap-buffer)
          (erase-buffer)
+         (when nnimap-fetch-partial-articles
+           (if (eq nnimap-fetch-partial-articles t)
+               (setq parts '(1))
+             (nnimap-command "UID FETCH %d (BODYSTRUCTURE)" article)
+             (goto-char (point-min))
+             (when (re-search-forward "FETCH.*BODYSTRUCTURE" nil t)
+               (let ((structure (ignore-errors (read (current-buffer)))))
+                 (setq parts (nnimap-find-wanted-parts structure))))))
          (setq result
                (nnimap-command
                 (if (member "IMAP4REV1" (nnimap-capabilities nnimap-object))
@@ -340,6 +356,22 @@ Possible choices are nil (use default methods) or `anonymous'.")
                (nnheader-ms-strip-cr))
              t)))))))
 
+(defun nnimap-find-wanted-parts (structure)
+  (let ((nnimap-level 1))
+    (message-flatten-list (nnimap-find-wanted-parts-1 structure))))
+
+(defun nnimap-find-wanted-parts-1 (structure)
+  (let (levels)
+    (while (consp (car structure))
+      (let ((sub (pop structure)))
+       (if (consp (car sub))
+           (push (nnimap-find-wanted-parts-1 sub) levels)
+         (let ((type (format "%s/%s" (nth 0 sub) (nth 1 sub))))
+           (when (string-match nnimap-fetch-partial-articles type)
+             (push nnimap-level levels)))
+         (incf nnimap-level))))
+    (nreverse levels)))
+
 (deffoo nnimap-request-group (group &optional server dont-check info)
   (with-current-buffer nntp-server-buffer
     (let ((result (nnimap-possibly-change-group group server))