Make it possible to specify servers to be covered by the cloud

[gnus] / lisp / gnus-cloud.el

diff --git a/lisp/gnus-cloud.el b/lisp/gnus-cloud.el
index 00e3b0d..62a25d7 100644 (file)
--- a/lisp/gnus-cloud.el
+++ b/lisp/gnus-cloud.el
@@ -26,6 +26,7 @@
 
 (eval-when-compile (require 'cl))
 (require 'parse-time)
+(require 'nnimap)
 
 (defgroup gnus-cloud nil
   "Syncing Gnus data via IMAP."
@@ -41,6 +42,7 @@
   :type '(repeat regexp))
 
 (defvar gnus-cloud-group-name "*Emacs Cloud*")
+(defvar gnus-cloud-covered-servers nil)
 
 (defvar gnus-cloud-version 1)
 (defvar gnus-cloud-sequence 1)
@@ -238,19 +240,30 @@
           (gnus-activate-group gnus-cloud-group-name nil nil gnus-cloud-method)
           (gnus-subscribe-group gnus-cloud-group-name)))))
 
-(defun gnus-cloud-upload-data ()
+(defun gnus-cloud-upload-data (&optional full)
   (gnus-cloud-ensure-cloud-group)
   (with-temp-buffer
-    (let* ((full t)
-          (elems (gnus-cloud-files-to-upload full)))
+    (let ((elems (gnus-cloud-files-to-upload full)))
       (insert (format "Subject: (sequence: %d type: %s)\n"
                      gnus-cloud-sequence
                      (if full :full :partial)))
       (insert "From: nobody@invalid.com\n")
       (insert "\n")
       (insert (gnus-cloud-make-chunk elems))
-      (gnus-request-accept-article gnus-cloud-group-name gnus-cloud-method
-                                  t t))))
+      (when (gnus-request-accept-article gnus-cloud-group-name gnus-cloud-method
+                                        t t)
+       (setq gnus-cloud-sequence (1+ gnus-cloud-sequence))
+       (gnus-cloud-add-timestamps elems)))))
+
+(defun gnus-cloud-add-timestamps (elems)
+  (dolist (elem elems)
+    (let* ((file-name (plist-get elem :file-name))
+          (old (assoc file-name gnus-cloud-file-timestamps)))
+      (when old
+       (setq gnus-cloud-file-timestamps
+             (delq old gnus-cloud-file-timestamps)))
+      (push (list file-name (plist-get elem :timestamp))
+           gnus-cloud-file-timestamps))))
 
 (defun gnus-cloud-available-chunks ()
   (gnus-activate-group gnus-cloud-group-name nil nil gnus-cloud-method)
@@ -263,7 +276,10 @@
        (while (and (not (eobp))
                    (setq head (nnheader-parse-head)))
          (push head headers))))
-    (nreverse headers)))
+    (sort (nreverse headers)
+         (lambda (h1 h2)
+           (> (gnus-cloud-chunk-sequence (mail-header-subject h1))
+              (gnus-cloud-chunk-sequence (mail-header-subject h2)))))))
 
 (defun gnus-cloud-chunk-sequence (string)
   (if (string-match "sequence: \\([0-9]+\\)" string)
@@ -271,11 +287,7 @@
     0))
 
 (defun gnus-cloud-prune-old-chunks (headers)
-  (let ((headers
-        (sort (reverse headers)
-              (lambda (h1 h2)
-                (> (gnus-cloud-chunk-sequence (mail-header-subject h1))
-                   (gnus-cloud-chunk-sequence (mail-header-subject h2))))))
+  (let ((headers (reverse headers))
        (found nil))
   (while (and headers
              (not found))
@@ -291,6 +303,25 @@
             (nreverse headers))
      (gnus-group-full-name gnus-cloud-group-name gnus-cloud-method)))))
 
+(defun gnus-cloud-download-data ()
+  (let ((articles nil)
+       chunks)
+    (dolist (header (gnus-cloud-available-chunks))
+      (when (> (gnus-cloud-chunk-sequence (mail-header-subject header))
+              gnus-cloud-sequence)
+       (push (mail-header-number header) articles)))
+    (when articles
+      (nnimap-request-articles (nreverse articles) gnus-cloud-group-name)
+      (with-current-buffer nntp-server-buffer
+       (goto-char (point-min))
+       (while (re-search-forward "^Version " nil t)
+         (beginning-of-line)
+         (push (gnus-cloud-parse-chunk) chunks)
+         (forward-line 1))))))
+
+(defun gnus-cloud-server-p (server)
+  (member server gnus-cloud-covered-servers))
+
 (provide 'gnus-cloud)
 
 ;;; gnus-cloud.el ends here