X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;ds=inline;f=lisp%2Fnnkiboze.el;h=b3e8f7dbdc588e4790a5daecdd5f4b70599c7f5c;hb=55bc8c3145813effa0a57df9326c683eb77dbbe6;hp=c0370eb90aa5db2b8cf1cd66857fe4d5009f7b50;hpb=842a9816a058067683d2a91db8770b32f1730889;p=gnus

diff --git a/lisp/nnkiboze.el b/lisp/nnkiboze.el
index c0370eb90..b3e8f7dbd 100644
--- a/lisp/nnkiboze.el
+++ b/lisp/nnkiboze.el
@@ -1,7 +1,7 @@
 ;;; nnkiboze.el --- select virtual news access for Gnus
-;; Copyright (C) 1995,96,97 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97,98 Free Software Foundation, Inc.
 
-;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
@@ -115,6 +115,8 @@
       (save-excursion
 	(set-buffer nntp-server-buffer)
 	(erase-buffer)
+	(unless (file-exists-p nov-file)
+	  (nnkiboze-request-scan group))
 	(if (not (file-exists-p nov-file))
 	    (nnheader-report 'nnkiboze "Can't select group %s" group)
 	  (nnheader-insert-file-contents nov-file)
@@ -134,7 +136,7 @@
   ;; Remove NOV lines of articles that are marked as read.
   (when (and (file-exists-p (nnkiboze-nov-file-name))
 	     nnkiboze-remove-read-articles)
-    (nnheader-temp-write (nnkiboze-nov-file-name)
+    (with-temp-file (nnkiboze-nov-file-name)
       (let ((cur (current-buffer)))
 	(nnheader-insert-file-contents (nnkiboze-nov-file-name))
 	(goto-char (point-min))
@@ -153,15 +155,17 @@
 (deffoo nnkiboze-request-delete-group (group &optional force server)
   (nnkiboze-possibly-change-group group)
   (when force
-     (let ((files (list (nnkiboze-nov-file-name)
-			(concat nnkiboze-directory group ".newsrc")
-			(nnkiboze-score-file group))))
+     (let ((files (nconc
+		   (nnkiboze-score-file group)
+		   (list (nnkiboze-nov-file-name)
+			 (nnkiboze-nov-file-name ".newsrc")))))
        (while files
 	 (and (file-exists-p (car files))
 	      (file-writable-p (car files))
 	      (delete-file (car files)))
 	 (setq files (cdr files)))))
-  (setq nnkiboze-current-group nil))
+  (setq nnkiboze-current-group nil)
+  t)
 
 (nnoo-define-skeleton nnkiboze)
 
@@ -176,7 +180,7 @@
 
 ;;;###autoload
 (defun nnkiboze-generate-groups ()
-  "Usage: emacs -batch -l nnkiboze -f nnkiboze-generate-groups
+  "\"Usage: emacs -batch -l nnkiboze -f nnkiboze-generate-groups\".
 Finds out what articles are to be part of the nnkiboze groups."
   (interactive)
   (let ((nnmail-spool-file nil)
@@ -193,7 +197,7 @@ Finds out what articles are to be part of the nnkiboze groups."
     (while (setq info (pop newsrc))
       (when (string-match "nnkiboze" (gnus-info-group info))
 	;; For each kiboze group, we call this function to generate
-	;; it.  
+	;; it.
 	(nnkiboze-generate-group (gnus-info-group info))))))
 
 (defun nnkiboze-score-file (group)
@@ -205,8 +209,12 @@ Finds out what articles are to be part of the nnkiboze groups."
 
 (defun nnkiboze-generate-group (group)
   (let* ((info (nth 2 (gnus-gethash group gnus-newsrc-hashtb)))
-	 (newsrc-file (concat nnkiboze-directory group ".newsrc"))
-	 (nov-file (concat nnkiboze-directory group ".nov"))
+	 (newsrc-file (concat nnkiboze-directory 
+                              (nnheader-translate-file-chars
+                               (concat group ".newsrc"))))
+	 (nov-file (concat nnkiboze-directory
+                           (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.
@@ -214,18 +222,19 @@ Finds out what articles are to be part of the nnkiboze groups."
 	 (gnus-large-newsgroup nil)
 	 (gnus-score-find-score-files-function 'nnkiboze-score-file)
 	 (gnus-verbose (min gnus-verbose 3))
- 	 gnus-select-group-hook gnus-summary-prepare-hook 
-	 gnus-thread-sort-functions gnus-show-threads 
-	 gnus-visual gnus-suppress-duplicates)
+ 	 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))
-    (nnheader-temp-write nov-file
-      (insert-file-contents 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 
+      ;; Go through the active hashtb and add new all groups that match the
       ;; kiboze regexp.
       (mapatoms
        (lambda (group)
@@ -247,18 +256,20 @@ Finds out what articles are to be part of the nnkiboze groups."
       ;; number that has been kibozed in GROUP in this kiboze group.
       (setq newsrc nnkiboze-newsrc)
       (while newsrc
-	(if (not (setq active (gnus-gethash 
+	(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. 
+	  ;; 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))
+		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
@@ -267,19 +278,20 @@ Finds out what articles are to be part of the nnkiboze groups."
 		(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)'. 
+		;; 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 
+			       (> (length (gnus-list-of-unread-articles
 					   (car ginfo)))
 				  0))
 			   (progn
-			     (gnus-group-select-group nil)
+			     (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 
+		  (setq method (gnus-find-method-for-group
 				gnus-newsgroup-name))
 		  (when (eq method gnus-select-method)
 		    (setq method nil))
@@ -288,36 +300,39 @@ Finds out what articles are to be part of the nnkiboze groups."
 		    (when (> (caar gnus-newsgroup-scored) lowest)
 		      ;; If it has a good score, then we enter this article
 		      ;; into the kiboze group.
-		      (nnkiboze-enter-nov 
+		      (nnkiboze-enter-nov
 		       nov-buffer
-		       (gnus-summary-article-header 
+		       (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.
-		  (gnus-summary-exit-no-update)))
+		  (when (eq major-mode 'gnus-summary-mode)
+		    (kill-buffer (current-buffer)))))
 	    ;; Restore the proper info.
 	    (when ginfo
-	      (setcdr ginfo (cdr orig-info)))))
+	      (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.
-    (nnheader-temp-write newsrc-file
+    (with-temp-file newsrc-file
       (insert "(setq nnkiboze-newsrc '")
       (gnus-prin1 nnkiboze-newsrc)
-      (insert ")\n"))
-    t))
-    
+      (insert ")\n")))
+  (save-excursion
+    (set-buffer gnus-group-buffer)
+    (gnus-group-list-groups))
+  t)
+
 (defun nnkiboze-enter-nov (buffer header group)
   (save-excursion
     (set-buffer buffer)
     (goto-char (point-max))
-    (debug)
-    (let ((xref (mail-header-xref header))
-	  (prefix (gnus-group-real-prefix group))
+    (let ((prefix (gnus-group-real-prefix group))
 	  (oheader (copy-sequence header))
-	  (first t)
 	  article)
       (if (zerop (forward-line -1))
 	  (progn
@@ -333,16 +348,17 @@ Finds out what articles are to be part of the nnkiboze groups."
       ;; 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.
-      (insert group ":" 
+      (insert " " group ":"
 	      (int-to-string (mail-header-number header)) " ")
       (while (re-search-forward " [^ ]+:[0-9]+" nil t)
 	(goto-char (1+ (match-beginning 0)))
 	(insert prefix)))))
 
-(defun nnkiboze-nov-file-name ()
+(defun nnkiboze-nov-file-name (&optional suffix)
   (concat (file-name-as-directory nnkiboze-directory)
 	  (nnheader-translate-file-chars
-	   (concat (nnkiboze-prefixed-name nnkiboze-current-group) ".nov"))))
+	   (concat (nnkiboze-prefixed-name nnkiboze-current-group)
+		   (or suffix ".nov")))))
 
 (provide 'nnkiboze)