X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=elmo%2Felmo.el;h=ed890ebf01343f98f8841ba9d54cf3e51a1f49ca;hb=824fe18b2ad090f609041a4af11de484bdb7e3a8;hp=b7be6fb56e53ca7247935350822cb7f250bd1aae;hpb=f28a522e2a489093cd0ee9d8a44d7b286932b384;p=elisp%2Fwanderlust.git diff --git a/elmo/elmo.el b/elmo/elmo.el index b7be6fb..ed890eb 100644 --- a/elmo/elmo.el +++ b/elmo/elmo.el @@ -35,6 +35,7 @@ (require 'elmo-vars) (require 'elmo-util) (require 'elmo-msgdb) +(require 'elmo-signal) (eval-when-compile (require 'cl)) @@ -87,6 +88,22 @@ Otherwise, entire fetching of the message is aborted without confirmation." (elmo-define-error 'elmo-authenticate-error "Login failed" 'elmo-open-error) (elmo-define-error 'elmo-imap4-bye-error "IMAP4 session was terminated" 'elmo-open-error) +;; Event declarations +(elmo-define-signal flag-changing (number old-flags new-flags) + "Notify the changing flag of the messages with NUMBER.") + +(elmo-define-signal flag-changed (numbers) + "Notify the change flag of the messages with NUMBERS.") + +(elmo-define-signal status-changed (numbers) + "Notify the change status of the message with NUMBERS.") + +(elmo-define-signal update-overview (number) + "Notify update overview of the message with NUMBER.") + +(elmo-define-signal message-number-changed (old-number new-number) + "Notify change of message number within the folder.") + ;; autoloads (eval-and-compile (autoload 'md5 "md5") @@ -97,9 +114,12 @@ Otherwise, entire fetching of the message is aborted without confirmation." (autoload 'elmo-global-flag-detach "elmo-flag") (autoload 'elmo-global-flag-detach-messages "elmo-flag") (autoload 'elmo-global-flag-set "elmo-flag") + (autoload 'elmo-global-flag-replace-referrer "elmo-flag") (autoload 'elmo-get-global-flags "elmo-flag") + (autoload 'elmo-global-flags-initialize "elmo-flag") (autoload 'elmo-global-mark-migrate "elmo-flag") - (autoload 'elmo-folder-list-global-flag-messages "elmo-flag")) + (autoload 'elmo-folder-list-global-flag-messages "elmo-flag") + (autoload 'elmo-search-register-engine "elmo-search")) (defun elmo-define-folder (prefix backend) "Define a folder. @@ -131,7 +151,7 @@ If a folder name begins with PREFIX, use BACKEND." persistent ; non-nil if persistent. process-duplicates ; read or hide biff ; folder for biff - handlers ; list of event handler. + mime-charset ; charset for encode & decode )) (luna-define-internal-accessors 'elmo-folder)) @@ -141,12 +161,14 @@ If a folder name begins with PREFIX, use BACKEND." (defmacro elmo-folder-send (folder message &rest args) "Let FOLDER receive the MESSAGE with ARGS." - (` (luna-send (, folder) (, message) (, folder) (,@ args)))) + `(luna-send ,folder ,message ,folder ,@args)) ;;;###autoload -(defun elmo-make-folder (name &optional non-persistent) +(defun elmo-make-folder (name &optional non-persistent mime-charset) "Make an ELMO folder structure specified by NAME. -If optional argument NON-PERSISTENT is non-nil, the folder msgdb is not saved." +If optional argument NON-PERSISTENT is non-nil, the folder msgdb is not saved. +If optional argument MIME-CHARSET is specified, it is used for +encode and decode a multibyte string." (let ((type (elmo-folder-type name)) prefix split class folder original) (setq original (elmo-string name)) @@ -165,10 +187,18 @@ If optional argument NON-PERSISTENT is non-nil, the folder msgdb is not saved." :type type :prefix prefix :name original - :persistent (not non-persistent))) + :persistent (not non-persistent) + :mime-charset mime-charset)) (save-match-data (elmo-folder-send folder 'elmo-folder-initialize name)))) +(defvar elmo-get-folder-function nil) + +(defun elmo-get-folder (name) + (or (and elmo-get-folder-function + (funcall elmo-get-folder-function name)) + (elmo-make-folder name))) + ;; Note that this function is for internal use only. (luna-define-generic elmo-folder-msgdb (folder) "Return the msgdb of FOLDER (on-demand loading). @@ -404,21 +434,6 @@ If optional argument NUMBER is specified, the new message number is set \(if possible\). Return nil on failure.") -(luna-define-generic elmo-folder-append-messages (folder - src-folder - numbers - &optional - same-number) - "Append messages from folder. -FOLDER is the ELMO folder structure. -Caller should make sure FOLDER is `writable'. -\(Can be checked with `elmo-folder-writable-p'\). -SRC-FOLDER is the source ELMO folder structure. -NUMBERS is the message numbers to be appended in the SRC-FOLDER. -If second optional argument SAME-NUMBER is specified, -message number is preserved \(if possible\). -Returns a list of message numbers successfully appended.") - (luna-define-generic elmo-folder-pack-numbers (folder) "Pack message numbers of FOLDER.") @@ -599,12 +614,6 @@ CACHE-PATH is the cache path to be used as a message cache file." ((folder elmo-folder) &optional visible-only) t) -(defun elmo-folder-encache (folder numbers &optional unread) - "Encache messages in the FOLDER with NUMBERS. -If UNREAD is non-nil, messages are not flaged as read." - (dolist (number numbers) - (elmo-message-encache folder number unread))) - (luna-define-generic elmo-message-encache (folder number &optional read) "Encache message in the FOLDER with NUMBER. If READ is non-nil, message is flaged as read.") @@ -762,14 +771,19 @@ Return a cons cell of (NUMBER-CROSSPOSTS . NEW-FLAG-ALIST).") t)) (luna-define-method elmo-folder-rename ((folder elmo-folder) new-name) - (let* ((new-folder (elmo-make-folder new-name))) + (let ((new-folder (elmo-make-folder + new-name + nil + (elmo-folder-mime-charset-internal folder)))) (unless (eq (elmo-folder-type-internal folder) (elmo-folder-type-internal new-folder)) (error "Not same folder type")) - (if (or (file-exists-p (elmo-folder-msgdb-path new-folder)) - (elmo-folder-exists-p new-folder)) - (error "Already exists folder: %s" new-name)) + (when (or (file-exists-p (elmo-folder-msgdb-path new-folder)) + (elmo-folder-exists-p new-folder)) + (error "Already exists folder: %s" new-name)) (elmo-folder-send folder 'elmo-folder-rename-internal new-folder) + (elmo-global-flag-replace-referrer (elmo-folder-name-internal folder) + new-name) (elmo-msgdb-rename-path folder new-folder))) (luna-define-method elmo-folder-delete-messages ((folder elmo-folder) @@ -786,10 +800,17 @@ Return a cons cell of (NUMBER-CROSSPOSTS . NEW-FLAG-ALIST).") (setq results (elmo-msgdb-search msgdb condition numbers)) (if (listp results) results - (let ((len (length numbers)) - matched) - (elmo-with-progress-display (> len elmo-display-progress-threshold) - (elmo-folder-search len "Searching...") + (elmo-condition-optimize condition) + (when (and (consp condition) + (eq (car condition) 'and) + (listp (setq results (elmo-msgdb-search msgdb + (nth 1 condition) + numbers)))) + (setq numbers results + condition (nth 2 condition))) + (let (matched) + (elmo-with-progress-display (elmo-folder-search (length numbers)) + "Searching messages" (dolist (number numbers) (let (result) (setq result (elmo-msgdb-match-condition msgdb @@ -804,9 +825,24 @@ Return a cons cell of (NUMBER-CROSSPOSTS . NEW-FLAG-ALIST).") (when result (setq matched (cons number matched)))) (elmo-progress-notify 'elmo-folder-search))) - (message "Searching...done") (nreverse matched))))) +(defun elmo-message-buffer-match-condition (condition number) + (let* ((handler (luna-make-entity 'modb-buffer-entity-handler)) + (result (elmo-condition-match + condition + (lambda (condition handler entity) + (elmo-msgdb-message-match-condition handler + condition + entity)) + (list + handler + (elmo-msgdb-make-message-entity + handler + :number number + :buffer (current-buffer)))))) + (and result (not (elmo-filter-condition-p result))))) + (luna-define-method elmo-message-match-condition ((folder elmo-folder) number condition numbers) @@ -834,7 +870,7 @@ Return a cons cell of (NUMBER-CROSSPOSTS . NEW-FLAG-ALIST).") (set-buffer-multibyte default-enable-multibyte-characters) (decode-coding-region (point-min) (point-max) elmo-mime-display-as-is-coding-system) - (elmo-buffer-field-condition-match condition number numbers))))) + (elmo-message-buffer-match-condition condition number))))) (luna-define-method elmo-folder-pack-numbers ((folder elmo-folder)) nil) ; default is noop. @@ -969,7 +1005,7 @@ If optional argument IF-EXISTS is nil, load on demand. append-list delete-list diff) (cons (if (equal in-folder in-db) 0 - (setq diff (elmo-list-diff in-folder in-db nil)) + (setq diff (elmo-list-diff in-folder in-db)) (setq append-list (car diff)) (setq delete-list (cadr diff)) (if append-list @@ -1028,20 +1064,73 @@ If optional argument IF-EXISTS is nil, load on demand. (+ 1 (elmo-max-of-list (or (elmo-folder-list-messages folder) '(0))))) -(luna-define-method elmo-folder-append-messages ((folder elmo-folder) - src-folder - numbers - &optional - same-number) - (elmo-generic-folder-append-messages folder src-folder numbers - same-number)) +(eval-and-compile + (luna-define-class elmo-file-tag)) + +(defconst elmo-append-messages-dispatch-table + '(((nil . null) . elmo-folder-append-messages-*-null) + ((filter . nil) . elmo-folder-append-messages-filter-*) + ((nil . filter) . elmo-folder-append-messages-*-filter) + ((pipe . nil) . elmo-folder-append-messages-pipe-*) + ((nil . pipe) . elmo-folder-append-messages-*-pipe) + ((multi . nil) . elmo-folder-append-messages-multi-*) + ((nil . flag) . elmo-folder-append-messages-*-flag) + ((imap4 . imap4) . elmo-folder-append-messages-imap4-imap4) + ((elmo-file-tag . localdir) . elmo-folder-append-messages-*-localdir) + ((elmo-file-tag . maildir) . elmo-folder-append-messages-*-maildir) + ((nil . archive) . elmo-folder-append-messages-*-archive) + ((nil . nil) . elmo-generic-folder-append-messages))) + +(defun elmo-folder-type-p (folder type) + (or (null type) + (eq (elmo-folder-type-internal folder) type) + (labels ((member-if (predicate list) + (and list + (or (funcall predicate (car list)) + (member-if predicate (cdr list))))) + (subtypep (name type) + (or (eq name type) + (let ((class (luna-find-class name))) + (and class + (member-if (lambda (name) + (subtypep name type)) + (luna-class-parents class))))))) + (subtypep (luna-class-name folder) + (or (intern-soft (format "elmo-%s-folder" type)) + type))))) + +(defun elmo-folder-append-messages (dst-folder src-folder numbers + &optional same-number caller) + "Append messages from folder. +DST-FOLDER is the ELMO folder structure. +Caller should make sure DST-FOLDER is `writable'. +\(Can be checked with `elmo-folder-writable-p'\). +SRC-FOLDER is the source ELMO folder structure. +NUMBERS is the message numbers to be appended in the SRC-FOLDER. +If second optional argument SAME-NUMBER is specified, +message number is preserved \(if possible\). +Returns a list of message numbers successfully appended." + (let ((rest (if caller + (cdr (memq (rassq caller elmo-append-messages-dispatch-table) + elmo-append-messages-dispatch-table)) + elmo-append-messages-dispatch-table)) + result) + (while rest + (let ((types (car (car rest)))) + (if (and (elmo-folder-type-p src-folder (car types)) + (elmo-folder-type-p dst-folder (cdr types))) + (setq result (funcall (cdr (car rest)) + dst-folder src-folder numbers same-number) + rest nil) + (setq rest (cdr rest))))) + result)) (defun elmo-generic-folder-append-messages (folder src-folder numbers same-number) (let ((src-msgdb-exists (not (zerop (elmo-folder-length src-folder)))) - unseen table + unseen succeed-numbers failure cache id) - (setq table (elmo-folder-flag-table folder)) + (elmo-folder-flag-table folder) ; load (with-temp-buffer (set-buffer-multibyte nil) (while numbers @@ -1090,7 +1179,6 @@ If optional argument IF-EXISTS is nil, load on demand. same-number) (save-excursion (let* ((messages msgs) - (elmo-inhibit-display-retrieval-progress t) (len (length msgs)) succeeds i result) (if (eq dst-folder 'null) @@ -1154,6 +1242,14 @@ If optional argument IF-EXISTS is nil, load on demand. (luna-define-method elmo-message-cached-p ((folder elmo-folder) number) (elmo-message-flagged-p folder number 'cached)) +(luna-define-generic elmo-message-killed-p (folder number) + "Return non-nil if the message is killed.") + +(luna-define-method elmo-message-killed-p ((folder elmo-folder) number) + (let ((killed-list (elmo-folder-killed-list-internal folder))) + (and killed-list + (elmo-number-set-member number killed-list)))) + (defun elmo-message-accessible-p (folder number) "Get accessibility of the message. Return non-nil when message is accessible." @@ -1173,7 +1269,7 @@ If CACHED is t, message is set as cached.") (if cached (elmo-msgdb-set-flag (elmo-folder-msgdb folder) number 'cached) (elmo-msgdb-unset-flag (elmo-folder-msgdb folder) number 'cached)) - (elmo-folder-notify-event folder 'cache-changed number)) + (elmo-emit-signal 'status-changed folder (list number))) (defun elmo-message-copy-entity (entity) (elmo-msgdb-copy-message-entity (elmo-message-entity-handler entity) @@ -1260,14 +1356,16 @@ If optional IS-LOCAL is non-nil, update only local (not server) status." ;; XXX Transitional implementation. (elmo-folder-unset-flag folder (list number) flag is-local)) -(luna-define-generic elmo-message-field (folder number field) +(luna-define-generic elmo-message-field (folder number field &optional type) "Get message field value in the msgdb. FOLDER is the ELMO folder structure. NUMBER is a number of the message. -FIELD is a symbol of the field.") +FIELD is a symbol of the field. +If optional argument TYPE is specified, return converted value.") -(luna-define-method elmo-message-field ((folder elmo-folder) number field) - (elmo-msgdb-message-field (elmo-folder-msgdb folder) number field)) +(luna-define-method elmo-message-field ((folder elmo-folder) + number field &optional type) + (elmo-msgdb-message-field (elmo-folder-msgdb folder) number field type)) (luna-define-generic elmo-message-set-field (folder number field value) "Set message field value in the msgdb. @@ -1293,13 +1391,17 @@ VALUE is a value to set.") &optional is-local) (when (elmo-folder-msgdb-internal folder) (dolist (number numbers) - (when (elmo-global-flag-p flag) - (let ((message-id (elmo-message-field folder number 'message-id))) - (elmo-global-flag-set flag folder number message-id))) - (elmo-msgdb-set-flag (elmo-folder-msgdb folder) - number - flag)) - (elmo-folder-notify-event folder 'flag-changed numbers))) + (let ((old-flags (elmo-message-flags folder number))) + (when (elmo-global-flag-p flag) + (let ((message-id (elmo-message-field folder number 'message-id))) + (elmo-global-flag-set flag folder number message-id))) + (elmo-msgdb-set-flag (elmo-folder-msgdb folder) number flag) + (elmo-emit-signal 'flag-changing + folder + number + old-flags + (elmo-message-flags folder number)))) + (elmo-emit-signal 'flag-changed folder numbers))) (defun elmo-message-has-global-flag-p (folder number) "Return non-nil when the message in the FOLDER with NUMBER has global flag." @@ -1333,12 +1435,16 @@ If Optional LOCAL is non-nil, don't update server flag." &optional is-local) (when (elmo-folder-msgdb-internal folder) (dolist (number numbers) - (when (elmo-global-flag-p flag) - (elmo-global-flag-detach flag folder number 'always)) - (elmo-msgdb-unset-flag (elmo-folder-msgdb folder) - number - flag)) - (elmo-folder-notify-event folder 'flag-changed numbers))) + (let ((old-flags (elmo-message-flags folder number))) + (when (elmo-global-flag-p flag) + (elmo-global-flag-detach flag folder number 'always)) + (elmo-msgdb-unset-flag (elmo-folder-msgdb folder) number flag) + (elmo-emit-signal 'flag-changing + folder + number + old-flags + (elmo-message-flags folder number)))) + (elmo-emit-signal 'flag-changed folder numbers))) (luna-define-method elmo-folder-process-crosspost ((folder elmo-folder)) ;; Do nothing. @@ -1377,20 +1483,22 @@ If Optional LOCAL is non-nil, don't update server flag." (length duplicates)) 0)) -(defun elmo-folder-confirm-appends (appends) +(defun elmo-folder-confirm-appends (folder appends) (let ((len (length appends)) in) (if (and elmo-folder-update-threshold (> len elmo-folder-update-threshold) elmo-folder-update-confirm) - (if (y-or-n-p (format "Too many messages(%d). Update all? " len)) + (if (y-or-n-p (format + "Too many messages(%d) in %s. Update all? " + len (elmo-folder-name-internal folder))) appends (setq in elmo-folder-update-threshold) (catch 'end (while t (setq in (read-from-minibuffer "Update number: " (int-to-string in)) - in (string-to-int in)) + in (string-to-number in)) (if (< len in) (throw 'end len)) (if (y-or-n-p (format @@ -1413,6 +1521,7 @@ If Optional LOCAL is non-nil, don't update server flag." unread section) (with-temp-buffer + (set-buffer-multibyte nil) (when (elmo-message-fetch folder number strategy unread section) (buffer-string)))) @@ -1474,6 +1583,23 @@ If Optional LOCAL is non-nil, don't update server flag." numbers)) (elmo-folder-unset-flag folder numbers 'all 'local-only)) +(luna-define-generic elmo-folder-recover-messages (folder numbers) + "Recover killed messages in the FOLDER with NUMBERS.") + +(luna-define-method elmo-folder-recover-messages ((folder elmo-folder) numbers) + (let ((msgdb (elmo-folder-msgdb folder))) + (elmo-folder-set-killed-list-internal + folder + (elmo-number-set-delete-list + (elmo-folder-killed-list-internal folder) + numbers)) + (dolist (number numbers) + (if (elmo-file-cache-exists-p + (elmo-message-field folder number 'message-id)) + (elmo-msgdb-set-flag msgdb number 'cached) + (elmo-msgdb-unset-flag msgdb number 'cached))) + (elmo-emit-signal 'status-changed folder numbers))) + (luna-define-method elmo-folder-clear ((folder elmo-folder) &optional keep-killed) (unless keep-killed @@ -1526,17 +1652,18 @@ If update process is interrupted, return nil.") (elmo-list-diff (elmo-folder-list-messages folder) (elmo-folder-list-messages folder nil 'in-msgdb))) (when diff-new + (setq diff-new (sort diff-new #'<)) (unless disable-killed (setq diff-new (elmo-living-messages diff-new killed-list))) - (when mask + (when (and mask (not ignore-msgdb)) (setq diff-new (elmo-list-filter mask diff-new)))) (message "Checking folder diff...done") - (setq new-list (elmo-folder-confirm-appends diff-new)) + (setq new-list (elmo-folder-confirm-appends folder diff-new)) ;; Append to killed list as (MIN-OF-DISAPPEARED . MAX-OF-DISAPPEARED) (when (not (eq (length diff-new) (length new-list))) (let* ((diff (elmo-list-diff diff-new new-list)) - (disappeared (car diff))) + (disappeared (sort (car diff) #'<))) (when disappeared (elmo-folder-kill-messages-range folder (car disappeared) @@ -1595,7 +1722,8 @@ If update process is interrupted, return nil.") (defun elmo-folder-msgdb-load (folder &optional silent) (unless silent (message "Loading msgdb for %s..." (elmo-folder-name-internal folder))) - (let ((msgdb (elmo-load-msgdb (elmo-folder-msgdb-path folder)))) + (let ((msgdb (elmo-load-msgdb (elmo-folder-msgdb-path folder) + (elmo-folder-mime-charset-internal folder)))) (elmo-folder-set-info-max-by-numdb folder (elmo-msgdb-list-messages msgdb)) @@ -1667,32 +1795,41 @@ Return a hashtable for newsgroups." (elmo-make-directory temp-dir) temp-dir)) -;; Event notification/observer framework -(eval-and-compile - (luna-define-class elmo-event-handler ())) +;; ELMO status structure. +(defmacro elmo-message-status (folder number &optional flags killed) + "Make ELMO status structure from FOLDER and NUMBER. +A value in this structure is cached at first access." + `(vector ,folder ,number ,flags ,killed)) -(luna-define-generic elmo-event-handler-flag-changed (handler numbers) - "Notify flag of the messages with NUMBERS is changed.") +(defmacro elmo-message-status-folder (status) + `(aref ,status 0)) -(luna-define-generic elmo-event-handler-cache-changed (handler number) - "Called when cache status of the message with NUMBER is changed.") +(defmacro elmo-message-status-number (status) + `(aref ,status 1)) -(defun elmo-folder-add-handler (folder handler) - (unless (memq handler (elmo-folder-handlers-internal folder)) - (elmo-folder-set-handlers-internal - folder - (cons handler (elmo-folder-handlers-internal folder))))) +(defmacro elmo-message-status-set-flags (status flags) + `(aset ,status 2 (or ,flags '(read)))) -(defun elmo-folder-remove-handler (folder handler) - (elmo-folder-set-handlers-internal - folder - (delq handler (elmo-folder-handlers-internal folder)))) +(defsubst elmo-message-status-flags (status) + (or (aref status 2) + (elmo-message-status-set-flags + status + (elmo-message-flags (elmo-message-status-folder status) + (elmo-message-status-number status))))) + +(defsubst elmo-message-status-cached-p (status) + (memq 'cached (elmo-message-status-flags status))) -(defun elmo-folder-notify-event (folder event &rest args) - (when (elmo-folder-handlers-internal folder) - (let ((message (format "elmo-event-handler-%s" event))) - (dolist (handler (elmo-folder-handlers-internal folder)) - (apply #'luna-send handler message handler args))))) +(defmacro elmo-message-status-set-killed (status killed) + `(aset ,status 3 (if ,killed 'killed 'living))) + +(defsubst elmo-message-status-killed-p (status) + (eq 'killed + (or (aref status 3) + (elmo-message-status-set-killed + status + (elmo-message-killed-p (elmo-message-status-folder status) + (elmo-message-status-number status)))))) ;;; (defun elmo-init () @@ -1737,7 +1874,7 @@ Return a hashtable for newsgroups." (elmo-define-folder ?| 'pipe) (elmo-define-folder ?. 'maildir) (elmo-define-folder ?' 'internal) -(elmo-define-folder ?\[ 'nmz) +(elmo-define-folder ?\[ 'search) (elmo-define-folder ?@ 'shimbun) ;;; Obsolete variables. @@ -1777,6 +1914,13 @@ Return a hashtable for newsgroups." 'elmo-msgdb-directory) (elmo-define-obsolete-variable 'elmo-global-flag-list 'elmo-global-flags) +(elmo-define-obsolete-variable 'elmo-nmz-default-index-path + 'elmo-search-namazu-default-index-path) +(elmo-define-obsolete-variable 'elmo-nmz-index-alias-alist + 'elmo-search-namazu-index-alias-alist) +(elmo-define-obsolete-variable 'elmo-nmz-use-drive-letter + 'elmo-search-use-drive-letter) + ;; Obsolete functions. ;; 2001-12-11: *-dir -> *-directory