;;; Code:
+(require 'gnus-load)
+(require 'gnus-int)
+(require 'gnus-range)
+(require 'gnus-sum)
+(require 'gnus-start)
(require 'gnus)
-(eval-when-compile (require 'cl))
(defvar gnus-cache-directory
- (concat (file-name-as-directory gnus-article-save-directory) "cache/")
+ (nnheader-concat gnus-directory "cache/")
"*The directory where cached articles will be stored.")
(defvar gnus-cache-active-file
;;; Internal variables.
+(defvar gnus-cache-removable-articles nil)
(defvar gnus-cache-buffer nil)
(defvar gnus-cache-active-hashtb nil)
(defvar gnus-cache-active-altered nil)
(defun gnus-cache-open ()
"Initialize the cache."
- (gnus-cache-read-active))
+ (when (or (file-exists-p gnus-cache-directory)
+ (and gnus-use-cache
+ (not (eq gnus-use-cache 'passive))))
+ (gnus-cache-read-active)))
-(gnus-add-shutdown 'gnus-cache-close 'gnus)
+(condition-case ()
+ (gnus-add-shutdown 'gnus-cache-close 'gnus)
+ ;; Complexities of byte-compiling makes this kludge necessary. Eeek.
+ (error nil))
(defun gnus-cache-close ()
"Shut down the cache."
(if (> (buffer-size) 0)
;; non-empty overview, write it out
(progn
- (gnus-make-directory (file-name-directory overview-file))
+ (unless (file-exists-p (file-name-directory overview-file))
+ (make-directory (file-name-directory overview-file) t))
(write-region (point-min) (point-max)
overview-file nil 'quietly))
;; empty overview file, remove it
(vectorp headers)) ; This might be a dummy article.
;; If this is a virtual group, we find the real group.
(when (gnus-virtual-group-p group)
- (let ((result (nnvirtual-find-group-art group article)))
+ (let ((result (nnvirtual-find-group-art
+ (gnus-group-real-name group) article)))
(setq group (car result)
- article (cdr result)
headers (copy-sequence headers))
- (aset headers 0 article)))
+ (mail-header-set-number headers (cdr result))))
(let ((number (mail-header-number headers))
file dir)
(when (and (> number 0) ; Reffed article.
(gnus-cache-member-of-class
gnus-cache-enter-articles ticked dormant unread))
(not (file-exists-p (setq file (gnus-cache-file-name
- group article)))))
+ group number)))))
;; Possibly create the cache directory.
- (or (file-exists-p (setq dir (file-name-directory file)))
- (gnus-make-directory dir))
+ (unless (file-exists-p (setq dir (file-name-directory file)))
+ (make-directory dir t))
;; Save the article in the cache.
(if (file-exists-p file)
t ; The article already is saved.
(save-excursion
(set-buffer nntp-server-buffer)
(let ((gnus-use-cache nil))
- (gnus-request-article-this-buffer article group))
+ (gnus-request-article-this-buffer number group))
(when (> (buffer-size) 0)
(write-region (point-min) (point-max) file nil 'quiet)
(gnus-cache-change-buffer group)
;; Update the active info.
(set-buffer gnus-summary-buffer)
(gnus-cache-update-active group number)
- (push number gnus-newsgroup-cached)
+ (push article gnus-newsgroup-cached)
(gnus-summary-update-secondary-mark article))
t))))))
ga)
(while arts
(when (setq ga (nnvirtual-find-group-art
- gnus-newsgroup-name (pop arts)))
+ (gnus-group-real-name gnus-newsgroup-name) (pop arts)))
(let ((gnus-cache-removable-articles (list (cdr ga)))
(gnus-newsgroup-name (car ga)))
(gnus-cache-possibly-remove-articles-1)))))
(defun gnus-cache-possibly-alter-active (group active)
"Alter the ACTIVE info for GROUP to reflect the articles in the cache."
- (let ((cache-active (gnus-gethash group gnus-cache-active-hashtb)))
- (and cache-active
- (< (car cache-active) (car active))
- (setcar active (car cache-active)))
- (and cache-active
- (> (cdr cache-active) (cdr active))
- (setcdr active (cdr cache-active)))))
+ (when gnus-cache-active-hashtb
+ (let ((cache-active (gnus-gethash group gnus-cache-active-hashtb)))
+ (and cache-active
+ (< (car cache-active) (car active))
+ (setcar active (car cache-active)))
+ (and cache-active
+ (> (cdr cache-active) (cdr active))
+ (setcdr active (cdr cache-active))))))
(defun gnus-cache-retrieve-headers (articles group &optional fetch-old)
"Retrieve the headers for ARTICLES in GROUP."
(file-name-as-directory
(if (gnus-use-long-file-name 'not-cache)
group
- (let ((group (concat group "")))
- (if (string-match ":" group)
- (aset group (match-beginning 0) ?/))
+ (let ((group (nnheader-replace-chars-in-string group ?/ ?_)))
+ ;; Translate the first colon into a slash.
+ (when (string-match ":" group)
+ (aset group (match-beginning 0) ?/))
(nnheader-replace-chars-in-string group ?. ?/))))
(if (stringp article) article (int-to-string article))))
(defun gnus-cache-update-article (group article)
"If ARTICLE is in the cache, remove it and re-enter it."
(when (gnus-cache-possibly-remove-article article nil nil nil t)
- (gnus-cache-possibly-enter-article
- gnus-newsgroup-name article (gnus-summary-article-header article)
- nil nil nil t)))
+ (let ((gnus-use-cache nil))
+ (gnus-cache-possibly-enter-article
+ gnus-newsgroup-name article (gnus-summary-article-header article)
+ nil nil nil t))))
(defun gnus-cache-possibly-remove-article (article ticked dormant unread
&optional force)
"Possibly remove ARTICLE from the cache."
- (let ((file (gnus-cache-file-name gnus-newsgroup-name article)))
+ (let ((group gnus-newsgroup-name)
+ (number article)
+ file)
+ ;; If this is a virtual group, we find the real group.
+ (when (gnus-virtual-group-p group)
+ (let ((result (nnvirtual-find-group-art
+ (gnus-group-real-name group) article)))
+ (setq group (car result)
+ number (cdr result))))
+ (setq file (gnus-cache-file-name group number))
(when (and (file-exists-p file)
(or force
(gnus-cache-member-of-class
(delete-file file)
(set-buffer (cdr gnus-cache-buffer))
(goto-char (point-min))
- (if (or (looking-at (concat (int-to-string article) "\t"))
- (search-forward (concat "\n" (int-to-string article) "\t")
+ (if (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)))))
(defun gnus-cache-read-active (&optional force)
"Read the cache active file."
+ (unless (file-exists-p gnus-cache-directory)
+ (make-directory gnus-cache-directory t))
(if (not (and (file-exists-p gnus-cache-active-file)
(or force (not gnus-cache-active-hashtb))))
;; There is no active file, so we generate one.
(symbol-name sym) (cdr (symbol-value sym))
(car (symbol-value sym))))))
gnus-cache-active-hashtb)
- (gnus-make-directory (file-name-directory gnus-cache-active-file))
+ (unless (file-exists-p (file-name-directory gnus-cache-active-file))
+ (make-directory (file-name-directory gnus-cache-active-file) t))
(write-region
(point-min) (point-max) gnus-cache-active-file nil 'silent))
;; Mark the active hashtb as unaltered.
projects / gnus / blobdiff