alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mu4e-message: mu4e-message-field: return "" for nil-strings, 0 for

Browse Source 
nil-numbers; add mu4e-message-field-raw to get the non-massaged values
This commit is contained in:
djcb
2012-10-16 10:56:46 +03:00
parent fb8502768d
commit 3359615bdc
1 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mu4e/mu4e-message.el
View File

@ -51,11 +51,13 @@ e-mail message (if there is any."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defsubst mu4e-message-field (msg field) (defsubst mu4e-message-field-raw (msg field)
"Retrieve FIELD from message plist MSG. FIELD is one "Retrieve FIELD from message plist MSG. FIELD is one
of :from, :to, :cc, :bcc, :subject, :data, :message-id, :path, :maildir, of :from, :to, :cc, :bcc, :subject, :data, :message-id, :path, :maildir,
:priority, :attachments, :references, :in-reply-to, :body-txt, :body-html :priority, :attachments, :references, :in-reply-to, :body-txt, :body-html
Returns `nil' if the field does not exist.
A message plist looks something like: A message plist looks something like:
\(:docid 32461 \(:docid 32461
:from ((\"Nikola Tesla\" . \"niko@example.com\")) :from ((\"Nikola Tesla\" . \"niko@example.com\"))
@ -84,13 +86,32 @@ Some notes on the format:
the MIME-part), :name (the file name, if any), :mime-type (the the MIME-part), :name (the file name, if any), :mime-type (the
MIME-type, if any) and :size (the size in bytes, if any). MIME-type, if any) and :size (the size in bytes, if any).
- Messages in the Headers view come from the database and do not have - Messages in the Headers view come from the database and do not have
:attachments. :body-txt or :body-html fields. Message in the :attachments, :body-txt or :body-html fields. Message in the
Message view use the actual message file, and do include these fields." Message view use the actual message file, and do include these fields."
;; after all this documentation, the spectacular implementation ;; after all this documentation, the spectacular implementation
(if msg (if msg
(plist-get msg field) (plist-get msg field)
(mu4e-error "message must be non-nil"))) (mu4e-error "message must be non-nil")))
(defsubst mu4e-message-field (msg field)
"Retrieve FIELD from message plist MSG.
Like `mu4e-message-field-nil', but will sanitize `nil' values:
- all string field except body-txt/body-html: nil -> \"\"
- numeric fields + dates : nil -> 0
- all others : return the value
Thus, function will return nil for empty lists, non-existing body-txt or body-html."
(let ((val (mu4e-message-field-raw msg field)))
(cond
(val
val) ;; non-nil -> just return it
((member field '(:from :to :cc :bcc :subject :message-id
:path :maildir :in-reply-to))
"") ;; string fields except body-txt, body-html: nil -> ""
((member field '(:docid :size))
0) ;; numeric type: nil -> 0
(t
val)))) ;; otherwise, just return nil
(defsubst mu4e-message-at-point (&optional noerror) (defsubst mu4e-message-at-point (&optional noerror)
"Get the message s-expression for the message at point in either "Get the message s-expression for the message at point in either
the headers buffer or the view buffer, or nil if there is no such the headers buffer or the view buffer, or nil if there is no such