* gnus-start.el (gnus-subscribe-newsgroup, gnus-start-draft-setup)
[gnus] / lisp / nnkiboze.el
index 1f85c79..2b79e4c 100644 (file)
@@ -1,5 +1,7 @@
 ;;; nnkiboze.el --- select virtual news access for Gnus
-;; Copyright (C) 1995,96,97,98,99 Free Software Foundation, Inc.
+
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003
+;;     Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
       ;; article fetching by message-id at all.
       (nntp-request-article article newsgroup gnus-nntp-server buffer)
     (let* ((header (gnus-summary-article-header article))
-          (xref (mail-header-xref header)))
+          (xref (mail-header-xref header))
+          num group)
       (unless xref
        (error "nnkiboze: No xref"))
       (unless (string-match " \\([^ ]+\\):\\([0-9]+\\)" xref)
        (error "nnkiboze: Malformed xref"))
-      (gnus-request-article (string-to-int (match-string 2 xref))
-                           (match-string 1 xref)
-                           buffer))))
+      (setq num (string-to-int (match-string 2 xref))
+           group (match-string 1 xref))
+      (or (with-current-buffer buffer
+           (or (and gnus-use-cache (gnus-cache-request-article num group))
+               (gnus-agent-request-article num group)))
+         (gnus-request-article num group buffer)))))
 
 (deffoo nnkiboze-request-scan (&optional group server)
+  (nnkiboze-possibly-change-group group)
   (nnkiboze-generate-group (concat "nnkiboze:" group)))
 
 (deffoo nnkiboze-request-group (group &optional server dont-check)
             nnkiboze-remove-read-articles)
     (let ((coding-system-for-write nnkiboze-file-coding-system))
       (with-temp-file (nnkiboze-nov-file-name)
-       (let ((cur (current-buffer)) 
+       (let ((cur (current-buffer))
              (nnheader-file-coding-system nnkiboze-file-coding-system))
          (nnheader-insert-file-contents (nnkiboze-nov-file-name))
          (goto-char (point-min))
@@ -207,7 +214,10 @@ Finds out what articles are to be part of the nnkiboze groups."
       (when (string-match "nnkiboze" (gnus-info-group info))
        ;; For each kiboze group, we call this function to generate
        ;; it.
-       (nnkiboze-generate-group (gnus-info-group info))))))
+       (nnkiboze-generate-group (gnus-info-group info) t))))
+  (save-excursion
+    (set-buffer gnus-group-buffer)
+    (gnus-group-list-groups)))
 
 (defun nnkiboze-score-file (group)
   (list (expand-file-name
@@ -216,126 +226,130 @@ Finds out what articles are to be part of the nnkiboze groups."
                  (concat (nnkiboze-prefixed-name nnkiboze-current-group)
                          "." gnus-score-file-suffix))))))
 
-(defun nnkiboze-generate-group (group)
-  (let* ((info (nth 2 (gnus-gethash group gnus-newsrc-hashtb)))
+(defun nnkiboze-generate-group (group &optional inhibit-list-groups)
+  (let* ((info (gnus-get-info group))
         (newsrc-file (concat nnkiboze-directory
-                              (nnheader-translate-file-chars
-                               (concat group ".newsrc"))))
+                             (nnheader-translate-file-chars
+                              (concat group ".newsrc"))))
         (nov-file (concat nnkiboze-directory
-                           (nnheader-translate-file-chars
-                            (concat group ".nov"))))
+                          (nnheader-translate-file-chars
+                           (concat group ".nov"))))
         method nnkiboze-newsrc gname newsrc active
         ginfo lowest glevel orig-info nov-buffer
         ;; Bind various things to nil to make group entry faster.
         (gnus-expert-user t)
         (gnus-large-newsgroup nil)
         (gnus-score-find-score-files-function 'nnkiboze-score-file)
+        ;; Use only nnkiboze-score-file!
+        (gnus-score-use-all-scores nil)
+        (gnus-use-scoring t)
         (gnus-verbose (min gnus-verbose 3))
-        gnus-select-group-hook gnus-summary-prepare-hook
+        gnus-select-group-hook gnus-summary-prepare-hook
         gnus-thread-sort-functions gnus-show-threads
         gnus-visual gnus-suppress-duplicates num-unread)
     (unless info
       (error "No such group: %s" group))
     ;; Load the kiboze newsrc file for this group.
-    (when (file-exists-p newsrc-file)
-      (load newsrc-file))
-    (let ((coding-system-for-write nnkiboze-file-coding-system))
-      (with-temp-file nov-file
-       (when (file-exists-p nov-file)
-         (insert-file-contents nov-file))
-       (setq nov-buffer (current-buffer))
-       ;; Go through the active hashtb and add new all groups that match the
-       ;; kiboze regexp.
-       (mapatoms
-        (lambda (group)
-          (and (string-match nnkiboze-regexp
-                             (setq gname (symbol-name group))) ; Match
-               (not (assoc gname nnkiboze-newsrc)) ; It isn't registered
-               (numberp (car (symbol-value group))) ; It is active
-               (or (> nnkiboze-level 7)
-                   (and (setq glevel (nth 1 (nth 2 (gnus-gethash
-                                                    gname gnus-newsrc-hashtb))))
-                        (>= nnkiboze-level glevel)))
-               (not (string-match "^nnkiboze:" gname)) ; Exclude kibozes
-               (push (cons gname (1- (car (symbol-value group))))
-                     nnkiboze-newsrc)))
-        gnus-active-hashtb)
-       ;; `newsrc' is set to the list of groups that possibly are
-       ;; component groups to this kiboze group.  This list has elements
-       ;; on the form `(GROUP . NUMBER)', where NUMBER is the highest
-       ;; number that has been kibozed in GROUP in this kiboze group.
-       (setq newsrc nnkiboze-newsrc)
-       (while newsrc
-         (if (not (setq active (gnus-gethash
-                                (caar newsrc) gnus-active-hashtb)))
-             ;; This group isn't active after all, so we remove it from
-             ;; the list of component groups.
-             (setq nnkiboze-newsrc (delq (car newsrc) nnkiboze-newsrc))
-           (setq lowest (cdar newsrc))
-           ;; Ok, we have a valid component group, so we jump to it.
-           (switch-to-buffer gnus-group-buffer)
-           (gnus-group-jump-to-group (caar newsrc))
-           (gnus-message 3 "nnkiboze: Checking %s..." (caar newsrc))
-           (setq ginfo (gnus-get-info (gnus-group-group-name))
-                 orig-info (gnus-copy-sequence ginfo)
-                 num-unread (car (gnus-gethash (caar newsrc)
-                                               gnus-newsrc-hashtb)))
-           (unwind-protect
-               (progn
-                 ;; We set all list of article marks to nil.  Since we operate
-                 ;; on copies of the real lists, we can destroy anything we
-                 ;; want here.
-                 (when (nth 3 ginfo)
-                   (setcar (nthcdr 3 ginfo) nil))
-                 ;; We set the list of read articles to be what we expect for
-                 ;; this kiboze group -- either nil or `(1 . LOWEST)'.
-                 (when ginfo
-                   (setcar (nthcdr 2 ginfo)
-                           (and (not (= lowest 1)) (cons 1 lowest))))
-                 (when (and (or (not ginfo)
-                                (> (length (gnus-list-of-unread-articles
-                                            (car ginfo)))
-                                   0))
-                            (progn
-                              (ignore-errors
-                                (gnus-group-select-group nil))
-                              (eq major-mode 'gnus-summary-mode)))
-                   ;; We are now in the group where we want to be.
-                   (setq method (gnus-find-method-for-group
-                                 gnus-newsgroup-name))
-                   (when (eq method gnus-select-method)
-                     (setq method nil))
-                   ;; We go through the list of scored articles.
-                   (while gnus-newsgroup-scored
-                     (when (> (caar gnus-newsgroup-scored) lowest)
-                       ;; If it has a good score, then we enter this article
-                       ;; into the kiboze group.
-                       (nnkiboze-enter-nov
-                        nov-buffer
-                        (gnus-summary-article-header
-                         (caar gnus-newsgroup-scored))
-                        gnus-newsgroup-name))
-                     (setq gnus-newsgroup-scored (cdr gnus-newsgroup-scored)))
-                   ;; That's it.  We exit this group.
-                   (when (eq major-mode 'gnus-summary-mode)
-                     (kill-buffer (current-buffer)))))
-             ;; Restore the proper info.
-             (when ginfo
-               (setcdr ginfo (cdr orig-info)))
-             (setcar (gnus-gethash (caar newsrc) gnus-newsrc-hashtb)
-                     num-unread)))
-         (setcdr (car newsrc) (car active))
-         (gnus-message 3 "nnkiboze: Checking %s...done" (caar newsrc))
-         (setq newsrc (cdr newsrc)))))
-    ;; We save the kiboze newsrc for this group.
-    (with-temp-file newsrc-file
-      (insert "(setq nnkiboze-newsrc '")
-      (gnus-prin1 nnkiboze-newsrc)
-      (insert ")\n")))
-  (save-excursion
-    (set-buffer gnus-group-buffer)
-    (gnus-group-list-groups))
-  t)
+    (mm-with-unibyte
+      (when (file-exists-p newsrc-file)
+       (load newsrc-file))
+      (let ((coding-system-for-write nnkiboze-file-coding-system))
+       (gnus-make-directory (file-name-directory nov-file))
+       (with-temp-file nov-file
+         (when (file-exists-p nov-file)
+           (insert-file-contents nov-file))
+         (setq nov-buffer (current-buffer))
+         ;; Go through the active hashtb and add new all groups that match the
+         ;; kiboze regexp.
+         (mapatoms
+          (lambda (group)
+            (and (string-match nnkiboze-regexp
+                               (setq gname (symbol-name group))) ; Match
+                 (not (assoc gname nnkiboze-newsrc)) ; It isn't registered
+                 (numberp (car (symbol-value group))) ; It is active
+                 (or (> nnkiboze-level 7)
+                     (and (setq glevel
+                                (gnus-info-level (gnus-get-info gname)))
+                          (>= nnkiboze-level glevel)))
+                 (not (string-match "^nnkiboze:" gname)) ; Exclude kibozes
+                 (push (cons gname (1- (car (symbol-value group))))
+                       nnkiboze-newsrc)))
+          gnus-active-hashtb)
+         ;; `newsrc' is set to the list of groups that possibly are
+         ;; component groups to this kiboze group.  This list has elements
+         ;; on the form `(GROUP . NUMBER)', where NUMBER is the highest
+         ;; number that has been kibozed in GROUP in this kiboze group.
+         (setq newsrc nnkiboze-newsrc)
+         (while newsrc
+           (if (not (setq active (gnus-active (caar newsrc))))
+               ;; This group isn't active after all, so we remove it from
+               ;; the list of component groups.
+               (setq nnkiboze-newsrc (delq (car newsrc) nnkiboze-newsrc))
+             (setq lowest (cdar newsrc))
+             ;; Ok, we have a valid component group, so we jump to it.
+             (switch-to-buffer gnus-group-buffer)
+             (gnus-group-jump-to-group (caar newsrc))
+             (gnus-message 3 "nnkiboze: Checking %s..." (caar newsrc))
+             (setq ginfo (gnus-get-info (gnus-group-group-name))
+                   orig-info (gnus-copy-sequence ginfo)
+                   num-unread (gnus-group-unread (caar newsrc)))
+             (unwind-protect
+                 (progn
+                   ;; We set all list of article marks to nil.  Since we operate
+                   ;; on copies of the real lists, we can destroy anything we
+                   ;; want here.
+                   (when (nth 3 ginfo)
+                     (setcar (nthcdr 3 ginfo) nil))
+                   ;; We set the list of read articles to be what we expect for
+                   ;; this kiboze group -- either nil or `(1 . LOWEST)'.
+                   (when ginfo
+                     (setcar (nthcdr 2 ginfo)
+                             (and (not (= lowest 1)) (cons 1 lowest))))
+                   (when (and (or (not ginfo)
+                                  (> (length (gnus-list-of-unread-articles
+                                              (car ginfo)))
+                                     0))
+                              (progn
+                                (ignore-errors
+                                  (gnus-group-select-group nil))
+                                (eq major-mode 'gnus-summary-mode)))
+                     ;; We are now in the group where we want to be.
+                     (setq method (gnus-find-method-for-group
+                                   gnus-newsgroup-name))
+                     (when (eq method gnus-select-method)
+                       (setq method nil))
+                     ;; We go through the list of scored articles.
+                     (while gnus-newsgroup-scored
+                       (when (> (caar gnus-newsgroup-scored) lowest)
+                         ;; If it has a good score, then we enter this article
+                         ;; into the kiboze group.
+                         (nnkiboze-enter-nov
+                          nov-buffer
+                          (gnus-summary-article-header
+                           (caar gnus-newsgroup-scored))
+                          gnus-newsgroup-name))
+                       (setq gnus-newsgroup-scored (cdr gnus-newsgroup-scored)))
+                     ;; That's it.  We exit this group.
+                     (when (eq major-mode 'gnus-summary-mode)
+                       (kill-buffer (current-buffer)))))
+               ;; Restore the proper info.
+               (when ginfo
+                 (setcdr ginfo (cdr orig-info)))
+               (setcar (gnus-active (caar newsrc)) num-unread)))
+           (setcdr (car newsrc) (cdr active))
+           (gnus-message 3 "nnkiboze: Checking %s...done" (caar newsrc))
+           (setq newsrc (cdr newsrc)))))
+      ;; We save the kiboze newsrc for this group.
+      (gnus-make-directory (file-name-directory newsrc-file))
+      (with-temp-file newsrc-file
+       (insert "(setq nnkiboze-newsrc '")
+       (gnus-prin1 nnkiboze-newsrc)
+       (insert ")\n")))
+  (unless inhibit-list-groups
+    (save-excursion
+      (set-buffer gnus-group-buffer)
+      (gnus-group-list-groups)))
+  t))
 
 (defun nnkiboze-enter-nov (buffer header group)
   (save-excursion
@@ -351,11 +365,11 @@ Finds out what articles are to be part of the nnkiboze groups."
        (setq article 1))
       (mail-header-set-number oheader article)
       (with-temp-buffer
-       (insert (mail-header-xref oheader))
+       (insert (or (mail-header-xref oheader) ""))
        (goto-char (point-min))
        (if (re-search-forward " [^ ]+:[0-9]+" nil t)
            (goto-char (match-beginning 0))
-       (forward-char 1))
+         (or (eobp) (forward-char 1)))
        ;; The first Xref has to be the group this article
        ;; really came for - this is the article nnkiboze
        ;; will request when it is asked for the article.