X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-filter.el;h=632b0957fb70a996a97b2c1084b891b406b96bb6;hb=3d982b21b06c48c4e48e4b78649412f914ab59d8;hp=a4be1769408af7aca3b4cb70fff26b870d21d70d;hpb=d9a93ab4dde52c5c4f8e998af60f720effb3de15;p=elisp%2Fwanderlust.git diff --git a/elmo/elmo-filter.el b/elmo/elmo-filter.el index a4be176..632b095 100644 --- a/elmo/elmo-filter.el +++ b/elmo/elmo-filter.el @@ -30,6 +30,7 @@ ;;; Code: ;; (require 'elmo) +(require 'elmo-signal) (require 'elmo-msgdb) (defvar elmo-filter-number-filename "number-list" @@ -45,8 +46,7 @@ name) (let (pair) (setq pair (elmo-parse-search-condition name)) - (elmo-filter-folder-set-condition-internal folder - (car pair)) + (elmo-filter-folder-set-condition-internal folder (car pair)) (if (string-match "^ */\\(.*\\)$" (cdr pair)) (elmo-filter-folder-set-target-internal folder @@ -57,8 +57,35 @@ (elmo-folder-search-requires-msgdb-p (elmo-filter-folder-target-internal folder) (elmo-filter-folder-condition-internal folder))) + (elmo-filter-connect-signals + folder + (elmo-filter-folder-target-internal folder)) folder)) +(defun elmo-filter-connect-signals (folder target) + (elmo-connect-signal + target 'flag-changing folder + (elmo-define-signal-handler (folder target number old-flags new-flags) + (elmo-filter-add-flag-count folder number old-flags -1) + (elmo-filter-add-flag-count folder number new-flags) + (elmo-emit-signal 'flag-changing folder number old-flags new-flags)) + (elmo-define-signal-filter (folder target number) + (memq number (elmo-folder-list-messages folder nil t)))) + (elmo-connect-signal + target 'flag-changed folder + (elmo-define-signal-handler (folder target numbers) + (let ((filterd (elmo-list-filter + (elmo-folder-list-messages folder nil t) + numbers))) + (when filterd + (elmo-emit-signal 'flag-changed folder filterd))))) + (elmo-connect-signal + target 'cache-changed folder + (elmo-define-signal-handler (folder target number) + (elmo-emit-signal 'cache-changed folder number)) + (elmo-define-signal-filter (folder target number) + (memq number (elmo-folder-list-messages folder nil t))))) + (defun elmo-filter-number-list-load (dir) (elmo-object-load (expand-file-name elmo-filter-number-filename dir))) @@ -86,12 +113,25 @@ (setq flag-count (cons (cons flag delta) flag-count))))) (elmo-filter-folder-set-flag-count-internal folder flag-count))) +(defun elmo-filter-add-flag-count (folder number flags &optional delta) + (let ((flag-count (elmo-filter-folder-flag-count-internal folder)) + (delta (or delta 1)) + elem) + (dolist (flag flags) + (if (setq elem (assq flag flag-count)) + (setcdr elem (+ (cdr elem) delta)) + (setq flag-count (cons (cons flag delta) flag-count)))) + (elmo-filter-folder-set-flag-count-internal folder flag-count))) + (defun elmo-filter-folder-flag-count (folder) (or (elmo-filter-folder-flag-count-internal folder) (elmo-filter-folder-countup-message-flags folder (elmo-folder-list-messages folder t t)))) +(defun elmo-filter-folder-copy-flag-count (flag-counts) + (mapcar (lambda (pair) (cons (car pair) (cdr pair))) flag-counts)) + (luna-define-method elmo-folder-open :after ((folder elmo-filter-folder) &optional load-msgdb) (when load-msgdb @@ -143,11 +183,14 @@ (luna-define-method elmo-folder-newsgroups ((folder elmo-filter-folder)) (elmo-folder-newsgroups (elmo-filter-folder-target-internal folder))) -(luna-define-method elmo-find-fetch-strategy - ((folder elmo-filter-folder) entity &optional ignore-cache) +(luna-define-method elmo-find-fetch-strategy ((folder elmo-filter-folder) + number + &optional + ignore-cache + require-entireness) (elmo-find-fetch-strategy (elmo-filter-folder-target-internal folder) - entity ignore-cache)) + number ignore-cache require-entireness)) (luna-define-method elmo-folder-get-primitive-list ((folder elmo-filter-folder)) @@ -174,15 +217,24 @@ (luna-define-method elmo-message-fetch ((folder elmo-filter-folder) number strategy - &optional section outbuf unseen) - (elmo-message-fetch - (elmo-filter-folder-target-internal folder) - number strategy section outbuf unseen)) + &optional unseen section) + (elmo-message-fetch (elmo-filter-folder-target-internal folder) + number strategy unseen section)) (luna-define-method elmo-folder-delete-messages ((folder elmo-filter-folder) numbers) - (elmo-folder-delete-messages - (elmo-filter-folder-target-internal folder) numbers)) + (let ((flag-count (elmo-filter-folder-copy-flag-count + (elmo-filter-folder-flag-count-internal folder))) + (messages (copy-sequence + (elmo-filter-folder-number-list-internal folder))) + success) + (elmo-folder-detach-messages folder numbers) + (unless (setq success + (elmo-folder-delete-messages + (elmo-filter-folder-target-internal folder) numbers)) + (elmo-filter-folder-set-flag-count-internal folder flag-count) + (elmo-filter-folder-set-number-list-internal folder messages)) + success)) (luna-define-method elmo-folder-list-messages ((folder elmo-filter-folder) &optional visible-only in-msgdb) @@ -317,10 +369,9 @@ (elmo-filter-folder-target-internal folder) number flag)) -(luna-define-method elmo-message-flags ((folder elmo-filter-folder) number - &optional msgid) +(luna-define-method elmo-message-flags ((folder elmo-filter-folder) number) (elmo-message-flags (elmo-filter-folder-target-internal folder) - number msgid)) + number)) (luna-define-method elmo-message-set-cached ((folder elmo-filter-folder) number cached) @@ -359,24 +410,30 @@ numbers flag &optional is-local) - (elmo-filter-folder-countup-message-flags folder numbers -1) (elmo-folder-set-flag (elmo-filter-folder-target-internal folder) - numbers flag is-local) - (elmo-filter-folder-countup-message-flags folder numbers)) + numbers flag is-local)) (luna-define-method elmo-folder-unset-flag ((folder elmo-filter-folder) numbers flag &optional is-local) - (elmo-filter-folder-countup-message-flags folder numbers -1) (elmo-folder-unset-flag (elmo-filter-folder-target-internal folder) - numbers flag is-local) - (elmo-filter-folder-countup-message-flags folder numbers)) + numbers flag is-local)) (luna-define-method elmo-message-folder ((folder elmo-filter-folder) number) (elmo-message-folder (elmo-filter-folder-target-internal folder) number)) +(luna-define-method elmo-message-field ((folder elmo-filter-folder) + number field) + (elmo-message-field + (elmo-filter-folder-target-internal folder) number field)) + +(luna-define-method elmo-message-set-field ((folder elmo-filter-folder) + number field value) + (elmo-message-set-field + (elmo-filter-folder-target-internal folder) number field value)) + (luna-define-method elmo-folder-clear ((folder elmo-filter-folder) &optional keep-killed) (unless keep-killed @@ -418,9 +475,10 @@ (luna-define-method elmo-folder-detach-messages ((folder elmo-filter-folder) numbers) (elmo-filter-folder-countup-message-flags folder numbers -1) - (elmo-list-delete numbers (elmo-filter-folder-number-list folder) #'delq) - (elmo-folder-detach-messages - (elmo-filter-folder-target-internal folder) numbers)) + (elmo-filter-folder-set-number-list-internal + folder + (elmo-list-delete numbers (elmo-filter-folder-number-list folder) #'delq)) + t) (luna-define-method elmo-folder-length ((folder elmo-filter-folder)) (length (elmo-filter-folder-number-list-internal folder)))