mhc 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9eb513930c0f5d993e1755bed627593443df3e2
-  data.tar.gz: d4a6c467fe781e96c68c0ebad0a96f743e8d6a8b
+  metadata.gz: 402d897f119ad032a3b79fe4a80c052e1a8c2c8b
+  data.tar.gz: 4dc290bec03d71233ef479963506b33b999661c7
 SHA512:
-  metadata.gz: 0027ebd2eaab008113d12e02062011bf403ce7f3611f8d41cd874ee0c16434ed3e9c576abb10199426f2d374c6ea8c397209ee35ec453b86c42713c56c7c39b1
-  data.tar.gz: 4b3ba18ed523c7105e9109f573b10f74bf1c4cfefbc99dea2e5d2dc4a09b03f6a17bd349097efae502b650323a6b64456dd3e0193fbc5f41516029519d1438e8
+  metadata.gz: ba669c599f75b7841a00629a3f5fa16d9833ec251a335bc9c8f147499fdcac02638d5e5f728d03adeac5e1f877e16c4bfb86c0bfc6e218b2f7d7a6139c699fe3
+  data.tar.gz: cdc5ddbbe58cdf8b81105b2f25218be682be480faa7dafe3143529d6dd35672aee37baffd403da52cb70b401b9e1ab74ce26db9fbba4e78565d52b7bdfe3f3f6

data/Gemfile

@@ -2,7 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mhc.gemspec
 gemspec
-gem "thor"
-gem "ri_cal", :git => 'https://github.com/yoshinari-nomura/ri_cal.git'
-gem "tzinfo"
-gem "tzinfo-data"

data/README.org

@@ -134,10 +134,9 @@
       #+BEGIN_SRC emacs-lisp
         (setq load-path
               (cons "~/src/mhc/emacs" load-path))
-        (autoload 'mhc-mua-setup "mhc-mua")
-        (mhc-mua-setup)
+        (autoload 'mhc "mhc" "Message Harmonized Calendar system." t)
 
-        ;; M-x mhc-goto-this-month
+        ;; M-x mhc
       #+END_SRC
 
    9) Check if TODAY is good.

data/bin/mhc

@@ -69,7 +69,7 @@ class MhcCLI < Thor
   register_option :repository, :desc => "Set MHC top directory", :banner => "DIRECTORY"
   register_option :calendar,   :desc => "Set source CALENDAR"
   register_option :category,   :desc => "Pick items only in CATEGORY"
-  register_option :format,     :desc => "Set printing format", :enum => %w(text mail orgtable emacs icalendar calfw howm)
+  register_option :format,     :desc => "Set printing format", :enum => %w(text mail orgtable emacs icalendar calfw howm json)
   register_option :search,     :desc => "Search items by complex expression"
   register_option :dry_run,    :desc => "Perform a trial run with no changes made", :type => :boolean
 

data/emacs/mhc-calendar.el

@@ -11,6 +11,9 @@
 
 ;;; Configration Variables:
 
+(require 'mhc-date)
+(require 'mhc-day)
+(require 'mhc-schedule)
 (require 'mhc-vars)
 (require 'mhc-face)
 (require 'mhc-e21)
@@ -227,10 +230,10 @@ ww-japanese-long => \"土曜日\"
 
 ;; Avoid warning of byte-compiler.
 (eval-when-compile
-  (defvar mhc-yy)
-  (defvar mhc-mm)
-  (defvar mhc-dd)
-  (defvar mhc-ww)
+  (defvar yy)
+  (defvar mm)
+  (defvar dd)
+  (defvar ww)
   (defvar hnf-diary-dir)
   (defvar hnf-diary-year-directory-flag)
   (defvar view-exit-action)
@@ -465,7 +468,7 @@ ww-japanese-long => \"土曜日\"
          (i 0)
          (from  (mhc-date-mm-first date))
          (to    (mhc-date-mm-last  date))
-         (start (mhc-date-ww date))
+         (start (mhc-date-ww from))
          (cdate from)
          week color cw day map dayinfo)
     (when (mhc-calendar/cw-week)
@@ -556,7 +559,7 @@ ww-japanese-long => \"土曜日\"
             (setq pos cpos)
             (throw 'detect t))))
       (goto-char pos)
-      (funcall (mhc-get-function 'goto-message) view))
+      (when view (mhc-summary-display)))
      (t
       (unless (mhc-calendar-mouse-icon-function event)
         (setq func (or (lookup-key (current-local-map) (this-command-keys))
@@ -728,7 +731,8 @@ The keys that are defined for mhc-calendar-mode are:
         (caldate (mhc-date-mm+ date -1))
         (col mhc-calendar-start-column)
         (prefix " +|")
-        (i 3))
+        (i 3)
+        (string))
     (mhc-calendar/delete-overlay)
     (set-text-properties (point-min) (point-max) nil)
     (erase-buffer)
@@ -743,8 +747,9 @@ The keys that are defined for mhc-calendar-mode are:
       (setq i (1- i)))
     (goto-char (point-min))
     (while (re-search-forward prefix nil t)
+      (setq string (match-string 0))
       (delete-region (match-end 0) (match-beginning 0))
-      (insert (make-string (- (match-end 0) (match-beginning 0)) ?\ )))
+      (insert (make-string (length string) ?\ )))
     (setq mhc-calendar-date date)
     ;; (mhc-calendar/put-property-date)
     (and mhc-calendar-link-hnf (mhc-calendar/hnf-mark-diary-entries))
@@ -850,7 +855,7 @@ The keys that are defined for mhc-calendar-mode are:
 (defun mhc-calendar/view-file-decode-header ()
   (let ((buffer-read-only nil))
     (goto-char (point-min))
-    (mhc-decode-header)
+    (mhc-header-decode-ewords)
     (mhc-highlight-message)))
 
 ;; insert function
@@ -1062,53 +1067,53 @@ The keys that are defined for mhc-calendar-mode are:
       (and func (funcall func))))))
 
 (defun mhc-calendar/inserter-yy ()
-  (format "%4d" mhc-yy))
+  (format "%4d" yy))
 
 (defun mhc-calendar/inserter-nengo ()
-  (if (> mhc-yy 1987)
-      (format "平成%2d年" (- mhc-yy 1988))
-    (if (> mhc-yy 1924)
-        (format "昭和%2d年" (- mhc-yy 1925))
+  (if (> yy 1987)
+      (format "平成%2d年" (- yy 1988))
+    (if (> yy 1924)
+        (format "昭和%2d年" (- yy 1925))
       "昔々")))
 
 (defun mhc-calendar/inserter-mm ()
-  (format "%d" mhc-mm))
+  (format "%d" mm))
 
 (defun mhc-calendar/inserter-mm02 ()
-  (format "%02d" mhc-mm))
+  (format "%02d" mm))
 
 (defun mhc-calendar/inserter-mm2 ()
-  (format "%2d" mhc-mm))
+  (format "%2d" mm))
 
 (defun mhc-calendar/inserter-mm-string ()
-  (mhc-date-digit-to-mm-string mhc-mm))
+  (mhc-date-digit-to-mm-string mm))
 
 (defun mhc-calendar/inserter-mm-string-long ()
-  (mhc-date-digit-to-mm-string mhc-mm t))
+  (mhc-date-digit-to-mm-string mm t))
 
 (defun mhc-calendar/inserter-dd ()
-  (format "%d" mhc-dd))
+  (format "%d" dd))
 
 (defun mhc-calendar/inserter-dd02 ()
-  (format "%02d" mhc-dd))
+  (format "%02d" dd))
 
 (defun mhc-calendar/inserter-dd2 ()
-  (format "%2d" mhc-dd))
+  (format "%2d" dd))
 
 (defun mhc-calendar/inserter-ww ()
-  (format "%d" mhc-ww))
+  (format "%d" ww))
 
 (defun mhc-calendar/inserter-ww-string ()
-  (mhc-date-digit-to-ww-string mhc-ww))
+  (mhc-date-digit-to-ww-string ww))
 
 (defun mhc-calendar/inserter-ww-string-long ()
-  (mhc-date-digit-to-ww-string mhc-ww t))
+  (mhc-date-digit-to-ww-string ww t))
 
 (defun mhc-calendar/inserter-ww-japanese ()
-  (mhc-date-digit-to-ww-japanese-string mhc-ww))
+  (mhc-date-digit-to-ww-japanese-string ww))
 
 (defun mhc-calendar/inserter-ww-japanese-long ()
-  (mhc-date-digit-to-ww-japanese-string mhc-ww t))
+  (mhc-date-digit-to-ww-japanese-string ww t))
 
 (defun mhc-calendar/get-day-list (date &optional datelst dateend)
   (let (lst-org formlst retlst retlst2 ret con)
@@ -1526,7 +1531,7 @@ The keys that are defined for mhc-calendar-mode are:
               (setq lst (cdr lst))))
           (with-temp-buffer
             (insert-file-contents mhcfile)
-            (mhc-decode-header)
+            (mhc-header-decode-ewords)
             (mhc-header-narrowing
               (setq cats (mhc-header-get-value "x-sc-category"))
               (setq subj (mhc-header-get-value "x-sc-subject"))

data/emacs/mhc-draft.el

@@ -9,31 +9,6 @@
 
 ;; This file is a part of MHC, includes functions for draft.
 
-;;; About MUA Backend:
-
-;; In order to define new MUA backend, it is required to define these
-;; methods.
-;;
-;;     (mhc-foo-draft-setup-new)
-;;         Setup new draft (Insert header separator).
-;;
-;;     (mhc-foo-draft-reedit-buffer BUFFER ORIGINAL)
-;;         Restore content of BUFFER as draft in the current buffer.
-;;         If ORIGINAL is non-nil, use BUFFER as raw buffer.
-;;
-;;     (mhc-foo-draft-reedit-file FILENAME)
-;;         Restore contents of file FILENAME as draft in the current buffer.
-;;
-;;     (mhc-foo-draft-translate)
-;;         Translate current buffer to raw buffer.
-;;
-;; Define these methods appropriately, and put definitions as follows:
-;;
-;;    (put 'mhc-foo 'draft-setup-new 'mhc-foo-draft-setup-new)
-;;    (put 'mhc-foo 'draft-reedit-buffer 'mhc-foo-draft-reedit-buffer)
-;;    (put 'mhc-foo 'draft-reedit-file 'mhc-foo-draft-reedit-file)
-;;    (put 'mhc-foo 'draft-translate 'mhc-foo-draft-translate)
-
 ;;; Code:
 
 (require 'mhc-summary)
@@ -63,25 +38,80 @@
 
 (defvar mhc-draft-mode-map)
 
-(defsubst mhc-draft-setup-new ()
+(defun mhc-draft-setup-new ()
   "Setup new draft (Insert header separator, etc)."
-  (funcall (mhc-get-function 'draft-setup-new)))
-
+  (let ((sep-regexp (format "\n\\(%s\\)?\n" (regexp-quote mail-header-separator)))
+        (sep (concat "\n" mail-header-separator "\n")))
+    (save-excursion
+      (goto-char (point-min))
+      (if (re-search-forward sep-regexp nil t)
+          (replace-match sep)
+        (goto-char (point-max))
+        (unless (bolp) (insert "\n"))
+        (insert mail-header-separator "\n")))))
+
+(defun mhc-draft-new (&optional template preset-fields)
+  "Prepare new mhc-draft buffer.
+If TEMPLATE is a string or buffer, it is used for a new draft.
+If PRESET-FIELDS is a list of cons-cell like: ((header-name . value) ...),
+these fields are set to the draft after import TEMPLATE."
+  (interactive)
+  (let ((draft-buffer (generate-new-buffer mhc-draft-buffer-name)))
+        (with-current-buffer draft-buffer
+          ;; insert template
+          (cond
+           ((bufferp template)
+            (insert-buffer-substring-no-properties template))
+           ((stringp template)
+            (insert template)))
+          ;; insert header separator
+          (mhc-draft-setup-new)
+          (mhc-draft-delete-garbage-headers)
+          (mhc-draft-setup-headers preset-fields)
+          ;; remove end of message marker
+          (mhc-draft-remove-tailers)
+          (mhc-draft-mode)
+        (switch-to-buffer draft-buffer t)
+        (goto-char (point-min)))))
+
+(defvar mhc-draft-template)
+
+(defun mhc-draft-store-template (template)
+  "Store common draft template to TEMPLATE."
+  (setq mhc-draft-template template))
+
+(defun mhc-draft-template ()
+  "Get common draft template."
+  mhc-draft-template)
 
 (defsubst mhc-draft-reedit-buffer (buffer &optional original)
   "Restore contents of BUFFER as draft in the current buffer.
 If optional argument ORIGINAL is non-nil, BUFFER is raw buffer."
-  (funcall (mhc-get-function 'draft-reedit-buffer) buffer original))
-
+  (unless (eq (current-buffer) buffer)
+    (erase-buffer)
+    (insert-buffer-substring buffer))
+  (mhc-header-narrowing
+    (mhc-header-delete-header
+     "^\\(Content-.*\\|Mime-Version\\|User-Agent\\):" 'regexp))
+  (mhc-header-decode-ewords)
+  (goto-char (point-min))
+  (when (re-search-forward "^\r?$" nil t)
+    (insert mail-header-separator)))
 
 (defsubst mhc-draft-reedit-file (filename)
   "Restore contents of file FILENAME as draft in the current buffer."
-  (funcall (mhc-get-function 'draft-reedit-file) filename))
+  (erase-buffer)
+  (insert-file-contents filename)
+  (mhc-draft-reedit-buffer (current-buffer) 'original))
 
 
 (defsubst mhc-draft-translate ()
-  "Translate current buffer to raw buffer."
-  (funcall (mhc-get-function 'draft-translate)))
+  "Convert an article in the current buffer to an ENCODED one.
+ENCODED article should be valid for storeing to a mhc file."
+  (save-excursion
+    (goto-char (point-min))
+    (when (search-forward (concat "\n" mail-header-separator "\n") nil t)
+      (replace-match "\n\n"))))
 
 
 (define-derived-mode mhc-draft-mode
@@ -158,6 +188,36 @@ If optional argument NO-CONFIRM is non-nil, kill without confirmation."
       (mhc-header-put-value "x-sc-sequence"
                             (1+ (string-to-number sequence))))))
 
+(defun mhc-draft-remove-tailers ()
+  (save-excursion
+    (goto-char (point-max))
+    (if (re-search-backward
+         (regexp-quote mhc-message-end-of-messge-marker)
+         (- (point) (length mhc-message-end-of-messge-marker)) t)
+        (replace-match ""))
+    (unless (bolp) (insert "\n"))))
+
+(defun mhc-draft-delete-garbage-headers ()
+  (mhc-header-narrowing
+    (mhc-header-delete-header
+     (concat "^\\(" (mhc-regexp-opt mhc-draft-unuse-hdr-list) "\\)")
+     'regexp)))
+
+(defun mhc-draft-setup-headers (&optional headers-values)
+  "Put X-SC-* headers to draft.
+HEADERS-VALUES is a list of cons-cell like: ((header-name . value) ...)."
+  (let ((xsc-headers (mapcar (lambda (v) (downcase (substring v 0 -1)))
+                             (mhc-header-list)))
+        (item))
+    (mhc-header-narrowing
+      (mapc
+       (lambda (xsc)
+         (if (setq item (assoc xsc headers-values))
+             (mhc-header-put-value xsc (or (cdr item) ""))
+           (unless (mhc-header-get-value xsc)
+             (mhc-header-put-value xsc ""))))
+       xsc-headers))))
+
 (defun mhc-draft-finish ()
   "Add current draft as a schedule."
   (interactive)

data/emacs/mhc-face.el

@@ -33,6 +33,51 @@ in setup time.")
   (FACE-SYMBOL . (PARENT FG BG UNDERLINED FONT STIPPLE)).
 refer to mhc-calendar-hnf-face-alist-internal.")
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Message faces.
+
+(defvar mhc-message-face-eof-marker 'mhc-message-face-eof-marker)
+(defvar mhc-message-face-subject 'mhc-message-face-subject)
+
+(defface mhc-message-face-eof-marker
+  '((((class color)
+      (background dark))
+     (:background "aquamarine2"))
+    (((class color)
+      (background light))
+     (:background "aquamarine2"))
+    (t
+     ()))
+  "*Face used by mhc-message-eof-marker."
+  :group 'mhc-faces)
+
+(defface mhc-message-face-subject
+  '((((class color)
+      (background dark))
+     (:foreground "OrangeRed" :bold t))
+    (((class color)
+      (background light))
+     (:foreground "Firebrick" :bold t))
+    (t
+     ()))
+  "*Face used by mhc-message-subject."
+  :group 'mhc-faces)
+
+(defvar mhc-message-font-lock-keywords
+  '(("\\([12][0-9][0-9][0-9]\\)\\([0-1][0-9]\\)\\([0-3][0-9]\\)"
+     (1 font-lock-type-face)
+     (2 font-lock-comment-face)
+     (3 font-lock-builtin-face))
+    ("\\(X-SC-\\(Subject\\|Location\\|Day\\|Time\\|Category\\|Priority\\|Recurrence-Tag\\|Mission-Tag:\\|Cond\\|Duration\\|Alarm\\|Record-Id\\|Sequence\\):\\)"
+     (1 font-lock-keyword-face))
+    ("\\(\\[End of message\\]\\)"
+     (1 mhc-message-face-eof-marker))
+    ("\\(X-SC-Subject:\\) *\\(.*\\)"
+     (1 font-lock-keyword-face)
+     (2 mhc-message-face-subject))
+    ))
+
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; for necessary faces.
 

data/emacs/mhc-header.el

@@ -17,24 +17,20 @@
 ;; Global Variable:
 
 (defconst mhc-header-table
-  '(("x-sc-day"         "X-SC-Day:"             mhc-parse/day)
-    ("x-sc-cond"        "X-SC-Cond:"            mhc-parse/cond)
-    ("x-sc-duration"    "X-SC-Duration:"        mhc-parse/duration)
-    ("x-sc-subject"     "X-SC-Subject:"         mhc-parse/subject)
-    ("x-sc-location"    "X-SC-Location:"        mhc-parse/location)
-    ("x-sc-time"        "X-SC-Time:"            mhc-parse/time)
-    ("x-sc-alarm"       "X-SC-Alarm:"           mhc-parse/alarm)
-    ("x-sc-category"    "X-SC-Category:"        mhc-parse/category)
-    ("x-sc-recurrence-tag" "X-SC-Recurrence-Tag:" mhc-parse/recurrence-tag)
-    ("x-sc-priority"    "X-SC-Priority:"        mhc-parse/priority)
-    ("x-sc-record-id"   "X-SC-Record-Id:"       mhc-parse/record-id)
-    ("x-sc-schedule"    "X-SC-Schdule:"         mhc-parse/schedule)
-    ("x-sc-sequence"    "X-SC-Sequence:"        mhc-parse/sequence)
-    ;; For backward compatibility
-    ("x-sc-date"        "X-SC-Date:"            mhc-parse/old-style-date)
-    ;; FIXME: 要削除
-    ("x-sc-next"        "X-SC-Next:"            mhc-parse/next)))
-
+  '(
+    ("x-sc-subject"        "X-SC-Subject:"         mhc-parse/subject)
+    ("x-sc-location"       "X-SC-Location:"        mhc-parse/location)
+    ("x-sc-day"            "X-SC-Day:"             mhc-parse/day)
+    ("x-sc-time"           "X-SC-Time:"            mhc-parse/time)
+    ("x-sc-category"       "X-SC-Category:"        mhc-parse/category)
+    ("x-sc-priority"       "X-SC-Priority:"        mhc-parse/priority)
+    ("x-sc-recurrence-tag" "X-SC-Recurrence-Tag:"  mhc-parse/recurrence-tag)
+    ("x-sc-cond"           "X-SC-Cond:"            mhc-parse/cond)
+    ("x-sc-duration"       "X-SC-Duration:"        mhc-parse/duration)
+    ("x-sc-alarm"          "X-SC-Alarm:"           mhc-parse/alarm)
+    ("x-sc-record-id"      "X-SC-Record-Id:"       mhc-parse/record-id)
+    ("x-sc-sequence"       "X-SC-Sequence:"        mhc-parse/sequence)
+    ))
 
 (defmacro mhc-header-list ()
   "Return headers which are referenced by MHC."
@@ -139,6 +135,14 @@ If REGEXP, HEADER is a regular expression."
         (delete-region (match-beginning 0) (match-end 0)))))
 
 
+(eval-and-compile
+  (autoload 'rfc2047-decode-region "rfc2047"))
+
+(defsubst mhc-header-decode-ewords ()
+  "Decode rfc2047 encoded header."
+  (save-restriction
+    (mhc-header-narrowing
+      (rfc2047-decode-region (point-min) (point-max)))))
 
 (provide 'mhc-header)