[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-cache.el
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-cache.el |
Date: |
Sat, 04 Sep 2004 09:48:04 -0400 |
Index: emacs/lisp/gnus/gnus-cache.el
diff -c emacs/lisp/gnus/gnus-cache.el:1.8 emacs/lisp/gnus/gnus-cache.el:1.9
*** emacs/lisp/gnus/gnus-cache.el:1.8 Mon Sep 1 15:45:24 2003
--- emacs/lisp/gnus/gnus-cache.el Sat Sep 4 13:13:43 2004
***************
*** 1,5 ****
;;; gnus-cache.el --- cache interface for Gnus
! ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <address@hidden>
--- 1,5 ----
;;; gnus-cache.el --- cache interface for Gnus
! ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <address@hidden>
***************
*** 33,38 ****
--- 33,40 ----
(require 'gnus-range)
(require 'gnus-start)
(eval-when-compile
+ (if (not (fboundp 'gnus-agent-load-alist))
+ (defun gnus-agent-load-alist (group)))
(require 'gnus-sum))
(defcustom gnus-cache-active-file
***************
*** 160,170 ****
(when (and number
(> number 0) ; Reffed article.
(or force
! (and (or (not gnus-cacheable-groups)
! (string-match gnus-cacheable-groups group))
! (or (not gnus-uncacheable-groups)
! (not (string-match
! gnus-uncacheable-groups group)))
(gnus-cache-member-of-class
gnus-cache-enter-articles ticked dormant unread)))
(not (file-exists-p (setq file (gnus-cache-file-name
--- 162,168 ----
(when (and number
(> number 0) ; Reffed article.
(or force
! (and (gnus-cache-fully-p group)
(gnus-cache-member-of-class
gnus-cache-enter-articles ticked dormant unread)))
(not (file-exists-p (setq file (gnus-cache-file-name
***************
*** 183,189 ****
(when (> (buffer-size) 0)
(let ((coding-system-for-write gnus-cache-coding-system))
(gnus-write-buffer file))
! (setq headers (nnheader-parse-head t))
(mail-header-set-number headers number)
(gnus-cache-change-buffer group)
(set-buffer (cdr gnus-cache-buffer))
--- 181,188 ----
(when (> (buffer-size) 0)
(let ((coding-system-for-write gnus-cache-coding-system))
(gnus-write-buffer file))
! (nnheader-remove-body)
! (setq headers (nnheader-parse-naked-head))
(mail-header-set-number headers number)
(gnus-cache-change-buffer group)
(set-buffer (cdr gnus-cache-buffer))
***************
*** 209,216 ****
(nnheader-insert-nov headers)
;; Update the active info.
(set-buffer gnus-summary-buffer)
! (gnus-cache-update-active group number)
! (push article gnus-newsgroup-cached)
(gnus-summary-update-secondary-mark article))
t))))))
--- 208,216 ----
(nnheader-insert-nov headers)
;; Update the active info.
(set-buffer gnus-summary-buffer)
! (gnus-cache-possibly-update-active group (cons number number))
! (setq gnus-newsgroup-cached
! (gnus-add-to-sorted-list gnus-newsgroup-cached article))
(gnus-summary-update-secondary-mark article))
t))))))
***************
*** 235,241 ****
(defun gnus-cache-possibly-remove-articles-1 ()
"Possibly remove some of the removable articles."
! (unless (eq gnus-use-cache 'passive)
(let ((articles gnus-cache-removable-articles)
(cache-articles gnus-newsgroup-cached)
article)
--- 235,241 ----
(defun gnus-cache-possibly-remove-articles-1 ()
"Possibly remove some of the removable articles."
! (when (gnus-cache-fully-p gnus-newsgroup-name)
(let ((articles gnus-cache-removable-articles)
(cache-articles gnus-newsgroup-cached)
article)
***************
*** 283,291 ****
;; the normal way.
(let ((gnus-use-cache nil))
(gnus-retrieve-headers articles group fetch-old))
! (let ((uncached-articles (gnus-sorted-intersection
! (gnus-sorted-complement articles cached)
! articles))
(cache-file (gnus-cache-file-name group ".overview"))
type)
;; We first retrieve all the headers that we don't have in
--- 283,289 ----
;; the normal way.
(let ((gnus-use-cache nil))
(gnus-retrieve-headers articles group fetch-old))
! (let ((uncached-articles (gnus-sorted-difference articles cached))
(cache-file (gnus-cache-file-name group ".overview"))
type)
;; We first retrieve all the headers that we don't have in
***************
*** 335,348 ****
(when (gnus-cache-possibly-enter-article
gnus-newsgroup-name article
nil nil nil t)
(push article out))
(gnus-message 2 "Can't cache article %d" article))
(gnus-summary-update-secondary-mark article))
(gnus-summary-next-subject 1)
(gnus-summary-position-point)
(nreverse out)))
! (defun gnus-cache-remove-article (n)
"Remove the next N articles from the cache.
If not given a prefix, use the process marked articles instead.
Returns the list of articles removed."
--- 333,348 ----
(when (gnus-cache-possibly-enter-article
gnus-newsgroup-name article
nil nil nil t)
+ (setq gnus-newsgroup-undownloaded (delq article
gnus-newsgroup-undownloaded))
(push article out))
(gnus-message 2 "Can't cache article %d" article))
+ (gnus-summary-update-download-mark article)
(gnus-summary-update-secondary-mark article))
(gnus-summary-next-subject 1)
(gnus-summary-position-point)
(nreverse out)))
! (defun gnus-cache-remove-article (&optional n)
"Remove the next N articles from the cache.
If not given a prefix, use the process marked articles instead.
Returns the list of articles removed."
***************
*** 354,360 ****
--- 354,367 ----
(setq article (pop articles))
(gnus-summary-remove-process-mark article)
(when (gnus-cache-possibly-remove-article article nil nil nil t)
+ (when gnus-newsgroup-agentized
+ (let ((alist (gnus-agent-load-alist gnus-newsgroup-name)))
+ (unless (cdr (assoc article alist))
+ (setq gnus-newsgroup-undownloaded
+ (gnus-add-to-sorted-list
+ gnus-newsgroup-undownloaded article)))))
(push article out))
+ (gnus-summary-update-download-mark article)
(gnus-summary-update-secondary-mark article))
(gnus-summary-next-subject 1)
(gnus-summary-position-point)
***************
*** 367,381 ****
(defun gnus-summary-insert-cached-articles ()
"Insert all the articles cached for this group into the current buffer."
(interactive)
! (let ((cached (sort (copy-sequence gnus-newsgroup-cached) '>))
! (gnus-verbose (max 6 gnus-verbose)))
! (unless cached
! (gnus-message 3 "No cached articles for this group"))
! (while cached
! (gnus-summary-goto-subject (pop cached) t))))
! (defalias 'gnus-summary-limit-include-cached
! 'gnus-summary-insert-cached-articles)
;;; Internal functions.
--- 374,393 ----
(defun gnus-summary-insert-cached-articles ()
"Insert all the articles cached for this group into the current buffer."
(interactive)
! (let ((gnus-verbose (max 6 gnus-verbose)))
! (if (not gnus-newsgroup-cached)
! (gnus-message 3 "No cached articles for this group")
! (gnus-summary-goto-subjects gnus-newsgroup-cached))))
! (defun gnus-summary-limit-include-cached ()
! "Limit the summary buffer to articles that are cached."
! (interactive)
! (let ((gnus-verbose (max 6 gnus-verbose)))
! (if gnus-newsgroup-cached
! (progn
! (gnus-summary-limit gnus-newsgroup-cached)
! (gnus-summary-position-point))
! (gnus-message 3 "No cached articles for this group"))))
;;; Internal functions.
***************
*** 422,428 ****
?. ?_)))
;; Translate the first colon into a slash.
(when (string-match ":" group)
! (aset group (match-beginning 0) ?/))
(nnheader-replace-chars-in-string group ?. ?/)))
t)
gnus-cache-directory))))
--- 434,441 ----
?. ?_)))
;; Translate the first colon into a slash.
(when (string-match ":" group)
! (setq group (concat (substring group 0 (match-beginning 0))
! "/" (substring group (match-end 0)))))
(nnheader-replace-chars-in-string group ?. ?/)))
t)
gnus-cache-directory))))
***************
*** 460,469 ****
(when (or (looking-at (concat (int-to-string number) "\t"))
(search-forward (concat "\n" (int-to-string number) "\t")
(point-max) t))
! (delete-region (progn (beginning-of-line) (point))
! (progn (forward-line 1) (point)))))
! (setq gnus-newsgroup-cached
! (delq article gnus-newsgroup-cached))
(gnus-summary-update-secondary-mark article)
t)))
--- 473,483 ----
(when (or (looking-at (concat (int-to-string number) "\t"))
(search-forward (concat "\n" (int-to-string number) "\t")
(point-max) t))
! (gnus-delete-line)))
! (unless (setq gnus-newsgroup-cached
! (delq article gnus-newsgroup-cached))
! (gnus-sethash gnus-newsgroup-name nil gnus-cache-active-hashtb)
! (setq gnus-cache-active-altered t))
(gnus-summary-update-secondary-mark article)
t)))
***************
*** 477,485 ****
(directory-files dir nil "^[0-9]+$" t))
'<))
;; Update the cache active file, just to synch more.
! (when articles
! (gnus-cache-update-active group (car articles) t)
! (gnus-cache-update-active group (car (last articles))))
articles)))
(defun gnus-cache-braid-nov (group cached &optional file)
--- 491,503 ----
(directory-files dir nil "^[0-9]+$" t))
'<))
;; Update the cache active file, just to synch more.
! (if articles
! (progn
! (gnus-cache-update-active group (car articles) t)
! (gnus-cache-update-active group (car (last articles))))
! (when (gnus-gethash group gnus-cache-active-hashtb)
! (gnus-sethash group nil gnus-cache-active-hashtb)
! (setq gnus-cache-active-altered t)))
articles)))
(defun gnus-cache-braid-nov (group cached &optional file)
***************
*** 503,515 ****
(< (read (current-buffer)) (car cached)))
(forward-line 1))
(beginning-of-line)
! (save-excursion
! (set-buffer cache-buf)
! (if (search-forward (concat "\n" (int-to-string (car cached)) "\t")
! nil t)
! (setq beg (progn (beginning-of-line) (point))
! end (progn (end-of-line) (point)))
! (setq beg nil)))
(when beg
(insert-buffer-substring cache-buf beg end)
(insert "\n"))
--- 521,533 ----
(< (read (current-buffer)) (car cached)))
(forward-line 1))
(beginning-of-line)
! (set-buffer cache-buf)
! (if (search-forward (concat "\n" (int-to-string (car cached)) "\t")
! nil t)
! (setq beg (gnus-point-at-bol)
! end (progn (end-of-line) (point)))
! (setq beg nil))
! (set-buffer nntp-server-buffer)
(when beg
(insert-buffer-substring cache-buf beg end)
(insert "\n"))
***************
*** 531,550 ****
(car cached)))
(search-forward "\n.\n" nil 'move))
(beginning-of-line)
! (save-excursion
! (set-buffer cache-buf)
! (erase-buffer)
! (let ((coding-system-for-read
! gnus-cache-coding-system))
! (insert-file-contents (gnus-cache-file-name group (car cached))))
! (goto-char (point-min))
! (insert "220 ")
! (princ (car cached) (current-buffer))
! (insert " Article retrieved.\n")
! (search-forward "\n\n" nil 'move)
! (delete-region (point) (point-max))
! (forward-char -1)
! (insert "."))
(insert-buffer-substring cache-buf)
(setq cached (cdr cached)))
(kill-buffer cache-buf)))
--- 549,568 ----
(car cached)))
(search-forward "\n.\n" nil 'move))
(beginning-of-line)
! (set-buffer cache-buf)
! (erase-buffer)
! (let ((coding-system-for-read
! gnus-cache-coding-system))
! (insert-file-contents (gnus-cache-file-name group (car cached))))
! (goto-char (point-min))
! (insert "220 ")
! (princ (car cached) (current-buffer))
! (insert " Article retrieved.\n")
! (search-forward "\n\n" nil 'move)
! (delete-region (point) (point-max))
! (forward-char -1)
! (insert ".")
! (set-buffer nntp-server-buffer)
(insert-buffer-substring cache-buf)
(setq cached (cdr cached)))
(kill-buffer cache-buf)))
***************
*** 604,609 ****
--- 622,645 ----
;; Mark the active hashtb as unaltered.
(setq gnus-cache-active-altered nil)))
+ (defun gnus-cache-possibly-update-active (group active)
+ "Update active info bounds of GROUP with ACTIVE if necessary.
+ The update is performed if ACTIVE contains a higher or lower bound
+ than the current."
+ (let ((lower t) (higher t))
+ (if gnus-cache-active-hashtb
+ (let ((cache-active (gnus-gethash group gnus-cache-active-hashtb)))
+ (when cache-active
+ (unless (< (car active) (car cache-active))
+ (setq lower nil))
+ (unless (> (cdr active) (cdr cache-active))
+ (setq higher nil))))
+ (gnus-cache-read-active))
+ (when lower
+ (gnus-cache-update-active group (car active) t))
+ (when higher
+ (gnus-cache-update-active group (cdr active)))))
+
(defun gnus-cache-update-active (group number &optional low)
"Update the upper bound of the active info of GROUP to NUMBER.
If LOW, update the lower bound instead."
***************
*** 641,647 ****
(gnus-message 5 "Generating the cache active file...")
(setq gnus-cache-active-hashtb (gnus-make-hashtable 123)))
(when (string-match "^\\(nn[^_]+\\)_" group)
! (setq group (replace-match "\\1:" t t group)))
;; Separate articles from all other files and directories.
(while files
(if (string-match "^[0-9]+$" (file-name-nondirectory (car files)))
--- 677,683 ----
(gnus-message 5 "Generating the cache active file...")
(setq gnus-cache-active-hashtb (gnus-make-hashtable 123)))
(when (string-match "^\\(nn[^_]+\\)_" group)
! (setq group (replace-match "\\1:" t nil group)))
;; Separate articles from all other files and directories.
(while files
(if (string-match "^[0-9]+$" (file-name-nondirectory (car files)))
***************
*** 670,682 ****
(interactive (list gnus-cache-directory))
(gnus-cache-close)
(let ((nnml-generate-active-function 'identity))
! (nnml-generate-nov-databases-1 dir)))
(defun gnus-cache-move-cache (dir)
"Move the cache tree to somewhere else."
(interactive "FMove the cache tree to: ")
(rename-file gnus-cache-directory dir))
(provide 'gnus-cache)
;;; arch-tag: 05a79442-8c58-4e65-bd0a-3cbb1b89a33a
--- 706,732 ----
(interactive (list gnus-cache-directory))
(gnus-cache-close)
(let ((nnml-generate-active-function 'identity))
! (nnml-generate-nov-databases-1 dir))
! (gnus-cache-open))
(defun gnus-cache-move-cache (dir)
"Move the cache tree to somewhere else."
(interactive "FMove the cache tree to: ")
(rename-file gnus-cache-directory dir))
+ (defun gnus-cache-fully-p (&optional group)
+ "Returns non-nil if the cache should be fully used.
+ If GROUP is non-nil, also cater to `gnus-cacheable-groups' and
+ `gnus-uncacheable-groups'."
+ (and gnus-use-cache
+ (not (eq gnus-use-cache 'passive))
+ (if (null group)
+ t
+ (and (or (not gnus-cacheable-groups)
+ (string-match gnus-cacheable-groups group))
+ (or (not gnus-uncacheable-groups)
+ (not (string-match gnus-uncacheable-groups group)))))))
+
(provide 'gnus-cache)
;;; arch-tag: 05a79442-8c58-4e65-bd0a-3cbb1b89a33a
- [Emacs-diffs] Changes to emacs/lisp/gnus/gnus-cache.el,
Miles Bader <=