;;; ELMO Local directory folder
(eval-and-compile
- (luna-define-class elmo-localdir-folder (elmo-folder)
+ (luna-define-class elmo-localdir-folder (elmo-folder elmo-file-tag)
(dir-name directory))
(luna-define-internal-accessors 'elmo-localdir-folder))
(luna-define-method elmo-message-file-name ((folder
elmo-localdir-folder)
number)
- (expand-file-name (int-to-string number)
+ (expand-file-name (number-to-string number)
(elmo-localdir-folder-directory-internal folder)))
(luna-define-method elmo-folder-message-file-number-p ((folder
(dolist (number numbers)
(elmo-copy-file
(expand-file-name
- (int-to-string number)
+ (number-to-string number)
(elmo-localdir-folder-directory-internal folder))
(expand-file-name
- (int-to-string (if start-number cur-number number))
+ (number-to-string (if start-number cur-number number))
temp-dir))
(incf cur-number))
temp-dir))
(defun elmo-localdir-msgdb-create-entity (msgdb dir number)
(elmo-msgdb-create-message-entity-from-file
(elmo-msgdb-message-entity-handler msgdb)
- number (expand-file-name (int-to-string number) dir)))
+ number (expand-file-name (number-to-string number) dir)))
(luna-define-method elmo-folder-msgdb-create ((folder elmo-localdir-folder)
numbers
(when numbers
(let ((dir (elmo-localdir-folder-directory-internal folder))
(new-msgdb (elmo-make-msgdb))
- entity message-id
- flags
- (i 0)
- (len (length numbers)))
- (message "Creating msgdb...")
- (while numbers
- (setq entity
- (elmo-localdir-msgdb-create-entity
- new-msgdb dir (car numbers)))
- (when entity
- (setq message-id (elmo-message-entity-field entity 'message-id)
- flags (elmo-flag-table-get flag-table message-id))
- (elmo-global-flags-set flags folder (car numbers) message-id)
- (elmo-msgdb-append-entity new-msgdb entity flags))
- (when (> len elmo-display-progress-threshold)
- (setq i (1+ i))
- (elmo-display-progress
- 'elmo-localdir-msgdb-create-as-numbers "Creating msgdb..."
- (/ (* i 100) len)))
- (setq numbers (cdr numbers)))
- (message "Creating msgdb...done")
+ entity message-id flags)
+ (elmo-with-progress-display (elmo-folder-msgdb-create (length numbers))
+ "Creating msgdb"
+ (dolist (number numbers)
+ (setq entity (elmo-localdir-msgdb-create-entity
+ new-msgdb dir number))
+ (when entity
+ (setq message-id (elmo-message-entity-field entity 'message-id)
+ flags (elmo-flag-table-get flag-table message-id))
+ (elmo-global-flags-set flags folder number message-id)
+ (elmo-msgdb-append-entity new-msgdb entity flags))
+ (elmo-progress-notify 'elmo-folder-msgdb-create)))
new-msgdb)))
(luna-define-method elmo-folder-list-subfolders ((folder elmo-localdir-folder)
one-level)))
(defsubst elmo-localdir-list-subr (folder &optional nonsort)
- (let ((flist (mapcar 'string-to-int
+ (let ((flist (mapcar 'string-to-number
(directory-files
(elmo-localdir-folder-directory-internal folder)
nil "^[0-9]+$" t)))
folder (elmo-msgdb-get-message-id-from-buffer) flags)
t)))
-(luna-define-method elmo-folder-append-messages :around
- ((folder elmo-localdir-folder)
- src-folder numbers &optional same-number)
- (if (elmo-folder-message-file-p src-folder)
- (let ((src-msgdb-exists (not (zerop (elmo-folder-length src-folder))))
- (dir (elmo-localdir-folder-directory-internal folder))
- (table (elmo-folder-flag-table folder))
- (succeeds numbers)
- (next-num (1+ (car (elmo-folder-status folder))))
- flags id)
- (while numbers
- (setq flags (elmo-message-flags src-folder (car numbers)))
- (elmo-copy-file
- (elmo-message-file-name src-folder (car numbers))
- (expand-file-name
- (int-to-string
- (if same-number (car numbers) next-num))
- dir))
- ;; save flag-table only when src folder's msgdb is loaded.
- (when (setq id (and src-msgdb-exists
- (elmo-message-field src-folder (car numbers)
- 'message-id)))
- (elmo-flag-table-set table id flags))
- (elmo-progress-notify 'elmo-folder-move-messages)
- (if (and (setq numbers (cdr numbers))
- (not same-number))
- (setq next-num
- (if (elmo-localdir-locked-p)
- ;; MDA is running.
- (1+ (car (elmo-folder-status folder)))
- (1+ next-num)))))
- (when (elmo-folder-persistent-p folder)
- (elmo-folder-close-flag-table folder))
- succeeds)
- (luna-call-next-method)))
+(defun elmo-folder-append-messages-*-localdir (folder
+ src-folder
+ numbers
+ same-number)
+ (let ((src-msgdb-exists (not (zerop (elmo-folder-length src-folder))))
+ (dir (elmo-localdir-folder-directory-internal folder))
+ (table (elmo-folder-flag-table folder))
+ (succeeds numbers)
+ (next-num (1+ (car (elmo-folder-status folder))))
+ flags id)
+ (while numbers
+ (setq flags (elmo-message-flags src-folder (car numbers)))
+ (elmo-copy-file
+ (elmo-message-file-name src-folder (car numbers))
+ (expand-file-name
+ (number-to-string
+ (if same-number (car numbers) next-num))
+ dir))
+ ;; save flag-table only when src folder's msgdb is loaded.
+ (when (setq id (and src-msgdb-exists
+ (elmo-message-field src-folder (car numbers)
+ 'message-id)))
+ (elmo-flag-table-set table id flags))
+ (elmo-progress-notify 'elmo-folder-move-messages)
+ (if (and (setq numbers (cdr numbers))
+ (not same-number))
+ (setq next-num
+ (if (elmo-localdir-locked-p)
+ ;; MDA is running.
+ (1+ (car (elmo-folder-status folder)))
+ (1+ next-num)))))
+ (when (elmo-folder-persistent-p folder)
+ (elmo-folder-close-flag-table folder))
+ succeeds))
(luna-define-method elmo-folder-delete-messages-internal
((folder elmo-localdir-folder) numbers)
(luna-define-method elmo-message-fetch-internal ((folder elmo-localdir-folder)
number strategy
&optional section unread)
- (when (file-exists-p (elmo-message-file-name folder number))
- (insert-file-contents-as-binary
- (elmo-message-file-name folder number))))
+ (let ((filename (elmo-message-file-name folder number)))
+ (when (file-exists-p filename)
+ (insert-file-contents-as-raw-text filename))))
(luna-define-method elmo-folder-list-messages-internal
((folder elmo-localdir-folder) &optional nohide)
(rename-file old new)
t))
-(defsubst elmo-localdir-field-condition-match (folder condition
- number number-list)
- (elmo-file-field-condition-match
- (expand-file-name (int-to-string number)
- (elmo-localdir-folder-directory-internal folder))
- condition number number-list))
-
(luna-define-method elmo-folder-pack-numbers ((folder elmo-localdir-folder))
(let* ((dir (elmo-localdir-folder-directory-internal folder))
(msgdb (elmo-folder-msgdb folder))
(not elmo-pack-number-check-strict))
'<))
(new-number 1) ; first ordinal position in localdir
- total entity)
- (setq total (length numbers))
- (elmo-with-progress-display (> total elmo-display-progress-threshold)
- (elmo-folder-pack-numbers total "Packing...")
+ entity)
+ (elmo-with-progress-display (elmo-folder-pack-numbers (length numbers))
+ "Packing"
(dolist (old-number numbers)
(setq entity (elmo-msgdb-message-entity msgdb old-number))
(when (not (eq old-number new-number)) ; why \=() is wrong..
- (elmo-bind-directory
- dir
- ;; xxx nfs,hardlink
- (rename-file (int-to-string old-number)
- (int-to-string new-number) t))
+ (elmo-bind-directory dir
+ ;; xxx nfs,hardlink
+ (rename-file (number-to-string old-number)
+ (number-to-string new-number) t))
(elmo-message-entity-set-number entity new-number))
(elmo-msgdb-append-entity new-msgdb entity
(elmo-msgdb-flags msgdb old-number))
(luna-define-method elmo-folder-message-file-p ((folder elmo-localdir-folder))
t)
-(luna-define-method elmo-message-file-name ((folder elmo-localdir-folder)
- number)
- (expand-file-name
- (int-to-string number)
- (elmo-localdir-folder-directory-internal folder)))
-
(defun elmo-localdir-locked-p ()
(if elmo-localdir-lockfile-list
(let ((lock elmo-localdir-lockfile-list))
projects / elisp / wanderlust.git / blobdiff