mhc 1.1.1 → 1.2.0

data/emacs/mhc-ps.el

@@ -1171,4 +1171,4 @@ showpage
 ;; ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 ;; OF THE POSSIBILITY OF SUCH DAMAGE.
 
-;;; mhc-ps.el ends here.
+;;; mhc-ps.el ends here

data/emacs/mhc-schedule.el

@@ -142,7 +142,10 @@
 
 
 (defun mhc-schedule-subject-as-string (schedule)
-  (or (mhc-schedule-subject schedule) "(none)"))
+  (let ((subject (mhc-schedule-subject schedule)))
+    (if (eq (length subject) 0)
+        "(no subject)"
+      subject)))
 
 
 (defun mhc-schedule-categories-as-string (schedule)
@@ -199,4 +202,4 @@
 ;; ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 ;; OF THE POSSIBILITY OF SUCH DAMAGE.
 
-;;; mhc-schedule.el ends here.
+;;; mhc-schedule.el ends here

data/emacs/mhc-summary.el

@@ -171,6 +171,8 @@ which are replaced by the given information:
         'face mhc-tmp-day-face)
     (?/ (if mhc-tmp-first "/" " ")
         'face mhc-tmp-day-face)
+    (?- (if mhc-tmp-first "-" " ")
+        'face mhc-tmp-day-face)
     (?S " " 'face mhc-tmp-day-face)
     (?M (mhc-summary/line-month-string)
         'face mhc-tmp-day-face)
@@ -182,7 +184,8 @@ which are replaced by the given information:
             (make-string 5 ? )
           (format "%02d:%02d" (/ mhc-tmp-begin 60) (% mhc-tmp-begin 60)))
         'face 'mhc-summary-face-time)
-    (?e (if (null mhc-tmp-end)
+    (?e (if (or (null mhc-tmp-end)
+                (and mhc-tmp-begin (= mhc-tmp-end mhc-tmp-begin)))
             (make-string 6 ? )
           (format "-%02d:%02d" (/ mhc-tmp-end 60) (% mhc-tmp-end 60)))
         'face 'mhc-summary-face-time)
@@ -498,10 +501,10 @@ If BANNER is set, it is printed on the horizontal line."
 
 
 (defun mhc-summary/line-subject-string ()
-  (if mhc-tmp-private
-      (and mhc-tmp-schedule mhc-summary-string-secret)
-    (or (mhc-schedule-subject mhc-tmp-schedule) "")))
-
+  (if mhc-tmp-schedule
+      (if mhc-tmp-private
+          mhc-summary-string-secret
+        (mhc-schedule-subject-as-string mhc-tmp-schedule))))
 
 (defun mhc-summary/line-location-string ()
   (let ((location (mhc-schedule-location mhc-tmp-schedule)))
@@ -661,20 +664,36 @@ If BANNER is set, it is printed on the horizontal line."
 (defun mhc-summary-buffer-p (&optional buffer)
   (if buffer
       (set-buffer buffer))
-  mhc-summary-buffer-current-date-month)
+  (eq major-mode 'mhc-summary-mode))
 
-(defun mhc-summary-current-date ()
+(defun mhc-summary-current-date (&optional p)
   (when (mhc-summary-buffer-p)
-    (let ((dayinfo (get-text-property (point) 'mhc-dayinfo)))
+    (let* ((pos (or p (point)))
+           (dayinfo (get-text-property pos 'mhc-dayinfo)))
       (or (and dayinfo (mhc-day-date dayinfo))
           (save-excursion
             (end-of-line)
-            (while (and (not (bobp))
+            (while (and (>= pos (point-min))
                         (null dayinfo))
-              (or (setq dayinfo (get-text-property (point) 'mhc-dayinfo))
-                  (forward-char -1)))
+              (or (setq dayinfo (get-text-property pos 'mhc-dayinfo))
+                  (setq pos (- pos 1))))
             (and dayinfo (mhc-day-date dayinfo)))))))
 
+(defun mhc-summary-region-date ()
+  (when (region-active-p)
+    (let* ((p (region-beginning))
+           dayinfo
+           (datelist ()))
+      (progn
+        (while (<= p (region-end))
+          (and (setq dayinfo (mhc-summary-current-date p))
+               (setq datelist (cons dayinfo datelist)))
+          (setq p (next-single-property-change p 'mhc-dayinfo)))
+        (setq datelist (reverse (delete-dups datelist)))
+        (if (< 1 (length datelist))
+             (cons (car datelist) (car (last datelist)))
+          (car datelist))))))
+
 (defvar mhc-summary-buffer-current-date-month nil
   "Indicate summary buffer's month. It is also used by mhc-summary-buffer-p")
 (make-variable-buffer-local 'mhc-summary-buffer-current-date-month)
@@ -782,4 +801,4 @@ If BANNER is set, it is printed on the horizontal line."
 ;; ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 ;; OF THE POSSIBILITY OF SUCH DAMAGE.
 
-;;; mhc-summary.el ends here.
+;;; mhc-summary.el ends here

data/emacs/mhc-vars.el

@@ -13,11 +13,12 @@
 
 ;;; Code:
 (require 'mhc-compat)
-(require 'mhc-process)
+
+(autoload 'mhc-process-send-command "mhc-process")
 
 
 ;;; Constants:
-(defconst mhc-version "mhc 1.1.1") ;; MHC_VERSION
+(defconst mhc-version "mhc 1.2.0") ;; MHC_VERSION
 
 
 ;;; Configration Variables:
@@ -25,6 +26,18 @@
   "Various sorts of MH Calender."
   :group 'mail)
 
+(defcustom mhc-program-name "mhc"
+  "Program name of MHC."
+  :group 'mhc
+  :type 'string)
+
+(defcustom mhc-ruby-program-name (when (eq system-type 'windows-nt) "ruby")
+  "When non-nil, specify ruby program name.
+Nil means MHC script is called directly."
+  :group 'mhc
+  :type '(choice (const :tag "Call script directly" nil)
+		 string))
+
 (defcustom mhc-start-day-of-week 0
   "*Day of the week as the start of the week."
   :group 'mhc

data/emacs/mhc.el

@@ -3,7 +3,7 @@
 ;; Description: Message Harmonized Calendaring system.
 ;; Author:  Yoshinari Nomura <nom@quickhack.net>
 ;; Created: 1994-07-04
-;; Version: 1.1.1
+;; Version: 1.2.0
 ;; Keywords: calendar
 ;; URL: http://www.quickhack.net/mhc
 ;; Package-Requires: ((calfw "20150703"))
@@ -190,8 +190,8 @@
    Field names using by MHC.
 
    X-SC-Category:
-   Space-seperated Keywords. You can set default category to scan.
-   You can also indicate keywords by typing '\\[mhc-rescan-month]', '\\[mhc-goto-this-month]', '\\[mhc-goto-month]', '\\[mhc-goto-date]' with C-u.
+   Space-seperated Keywords.  You can set default category to scan.
+   You can also indicate keywords by typing '\\[mhc-rescan-month]', '\\[mhc-goto-this-month]', '\\[mhc-goto-month]', '\\[mhc-goto-date]' with \\[universal-argument].
 "
   (interactive "P")
   (make-local-variable 'mhc-mode)
@@ -371,10 +371,15 @@ If HIDE-PRIVATE, priavate schedules are suppressed."
     (if mhc-default-hide-private-schedules
         (not current-prefix-arg)
       current-prefix-arg)))
-  (mhc-scan-month date
-                  'mhc-mua
-                  mhc-default-category-predicate-sexp
-                  hide-private))
+  (let ((name (if (and (mhc-summary-buffer-p)
+                       (not (string-match
+                             "^[0-9][0-9][0-9][0-9]-[0-9][0-9]$" (buffer-name))))
+                  (buffer-name))))
+    (mhc-scan-month date
+                    'mhc-mua
+                    mhc-default-category-predicate-sexp
+                    hide-private
+                    name)))
 
 (defvar mhc-goto-date-func 'mhc-goto-date-calendar)
                                         ; or mhc-goto-date-summary
@@ -524,21 +529,22 @@ SCOPE is one of:
    ((eq scope 'wide)
     (mhc-date-ww-last (mhc-date++ edge-date) mhc-start-day-of-week)))))
 
-(defun mhc-scan-month (date mailer category-predicate secret)
+(defun mhc-scan-month (date mailer category-predicate secret &optional name)
   "Make summary buffer for a month indicated by DATE.
 DATE can be any date of the target month.
 If MAILER is 'direct, insert scanned result into current buffer.
 CATEGORY-PREDICATE must be a function that can take one mhc-schedule
 argument and return a boolean value indicates opacity of the article.
 If SECRET is non-nil, hide articles those categories are
-listed in ``mhc-category-as-private''."
+listed in ``mhc-category-as-private''.
+If optional NAME is non-nil, created smmary buffer has the name."
   (let* ((from (mhc-date-mm-first date))
          (to (mhc-date-mm-last date))
          (today (mhc-date-now))
          ;; need three months for mini-calendar
          (dayinfo-list (mhc-db-scan (mhc-date-mm-- from) (mhc-date-mm++ to))))
     (unless (eq 'direct mailer)
-      (mhc-summary-generate-buffer date)
+      (mhc-summary-generate-buffer (or name date))
       (setq mhc-summary-buffer-current-date-month
             (mhc-date-mm-first date)))
     (when mhc-use-wide-scope
@@ -614,7 +620,7 @@ Returns t if the importation was succeeded."
        (list (get-buffer (read-buffer "Import buffer: "
                                       (current-buffer))))))
   (let ((draft-buffer (generate-new-buffer mhc-draft-buffer-name))
-        (current-date (or (mhc-summary-current-date) (mhc-calendar-get-date) (mhc-date-now)))
+        (current-date (or (mhc-summary-region-date) (mhc-summary-current-date) (mhc-calendar-get-date) (mhc-date-now)))
         (succeed t)
         msgp date time subject location category recurrence-tag priority alarm)
     (and (called-interactively-p 'interactive)
@@ -629,9 +635,9 @@ Returns t if the importation was succeeded."
           (mhc-header-narrowing
             (setq msgp (or (mhc-header-get-value "from")
                            (mhc-header-get-value "x-sc-subject")))
-            (mhc-header-delete-header
+            (mhc-header-distill-header
              (concat "^\\("
-                     (mhc-regexp-opt mhc-draft-unuse-hdr-list)
+                     (mhc-regexp-opt mhc-draft-import-header-list)
                      "\\)")
              'regexp))
           (mhc-highlight-message)
@@ -808,15 +814,35 @@ the default action of this command is changed to the latter."
     (mhc-window-pop)))
 
 (defun mhc-import-from-region (beg end)
-  "Import a schedule from region BEG END."
+  "Create new schedule draft from region BEG END."
   (interactive "r")
-  (save-restriction
-    (narrow-to-region beg end)
-    (let ((str (buffer-substring beg end)))
-      (mhc-import)
-      (goto-char (point-max))
-      (insert str)
-      (goto-char (point-min)))))
+  (mhc-import-from-string (buffer-substring beg end)))
+
+(defun mhc-import-from-clipboard ()
+  "Create new schedule draft from clipboard text."
+  (interactive)
+  (mhc-import-from-string (current-kill 0)))
+
+(defun mhc-import-from-string (string)
+  "Create new schedule draft from STRING."
+  (with-temp-buffer
+    (yank 1)
+    (goto-char (point-min))
+    (insert "X-SC-Subject: \n"
+            "X-SC-Location: \n"
+            "X-SC-Day: \n"
+            "X-SC-Time: \n"
+            "X-SC-Category: \n"
+            "X-SC-Priority: \n"
+            "X-SC-Recurrence-Tag: \n"
+            "X-SC-Cond: \n"
+            "X-SC-Duration: \n"
+            "X-SC-Alarm: \n"
+            "X-SC-Record-Id: \n"
+            "X-SC-Sequence: 0\n"
+            "\n"
+            string)
+    (mhc-import)))
 
 (defun mhc-delete ()
   "Delete the current schedule."
@@ -871,11 +897,11 @@ the default action of this command is changed to the latter."
                      ("x-sc-time"  . ,time-list)
                      ("x-sc-day" . ,date-list)))))
 
-(defun mhc-reuse-copy ()
+(defun mhc-reuse-copy (&optional filename)
   "Copy current schedule to template."
   (interactive)
-  (let ((file (mhc-summary-filename))
-        (record (mhc-summary-record)))
+  (let* ((file (or filename (mhc-summary-filename)))
+         (record (mhc-parse-file file)))
     (if (and (stringp file) (file-exists-p file))
         (with-temp-buffer
           (mhc-insert-file-contents-as-coding-system

data/lib/mhc.rb

@@ -5,7 +5,7 @@ require "kconv"
 ## Monkey patch to the original RiCal https://github.com/rubyredrick/ri_cal
 ## delived from:
 ##   git clone https://github.com/yoshinari-nomura/ri_cal.git
-##   git diff 369a4ee..dc740e7
+##   git diff 369a4ee..cdb1f75
 ##
 module RiCal
   class Component #:nodoc:
@@ -47,6 +47,8 @@ module RiCal
           result = {"VALUE" => "DATE"}.merge(params)
         when DateTime
           result = {"VALUE" => "DATE-TIME"}.merge(params)
+        when Period
+          result = {"VALUE" => "PERIOD"}.merge(params)
         end
 
         if has_local_timezone?

data/lib/mhc/builder.rb

@@ -11,6 +11,10 @@ module Mhc
       @config = Mhc::Config.create_from_file(config) if config.is_a?(String)
     end
 
+    def datastore
+      Mhc::DataStore.new(@config.general.repository)
+    end
+
     def calendar(calendar_name)
       calendar = @config.calendars[calendar_name]
       raise Mhc::ConfigurationError, "calendar '#{calendar_name}' not found" unless calendar
@@ -23,7 +27,7 @@ module Mhc
       when "lastnote"
         db = Mhc::LastNote::Client.new(calendar.name)
       when "mhc"
-        db = Mhc::Calendar.new(Mhc::DataStore.new(@config.general.repository), calendar.modifiers, &calendar.filter)
+        db = Mhc::Calendar.new(self.datastore, calendar.modifiers, &calendar.filter)
       end
       return db
     end

data/lib/mhc/calendar.rb

@@ -19,9 +19,13 @@ module Mhc
       occurrences(date_range, &scope_block).map(&:event).uniq
     end
 
+    def tasks(&scope_block)
+      @datastore.entries(category: "todo")
+    end
+
     def occurrences(date_range, &scope_block)
       ocs = []
-      @datastore.entries(date_range).each do |event|
+      @datastore.entries(range: date_range).each do |event|
         event = decorate_event(event)
         event.occurrences(range:date_range).each do |oc|
           ocs << oc if in_scope?(oc, &scope_block)

data/lib/mhc/command/cache.rb

@@ -2,10 +2,11 @@ module Mhc
   module Command
     class Cache
 
-      def initialize(calendar)
-        calendar.events.each do |event|
-          range = event.range
-          puts "#{range.min.to_mhc_string},#{range.max.to_mhc_string},#{event.uid},#{event.subject}"
+      def initialize(datastore)
+        epoch = Date.new(1970, 1, 1)
+        puts"UID,MTIME,MIN,MAX,CATEGORIES,RECURRENCE,SUBJECT"
+        datastore.each_cache_entry do |uid, ent|
+          puts"#{ent.uid},#{ent.mtime},#{epoch + ent.range.min},#{epoch + ent.range.max},#{(ent.categories||[]).join(' ')},#{ent.recurrence},#{ent.subject}"
         end
       end
 

data/lib/mhc/converter.rb

@@ -44,8 +44,9 @@ module Mhc
 
       def to_emacs_string(str)
         # 1. quote " and \
-        # 2. surround by "
-        '"' + str.to_s.toutf8.gsub(/[\"\\]/, '\\\\\&') + '"'
+        # 2. LF => \n
+        # 3. surround by "
+        '"' + str.to_s.toutf8.gsub(/[\"\\]/, '\\\\\&').gsub("\n", "\\n") + '"'
       end
 
       def to_emacs_plist(hash)

data/lib/mhc/datastore.rb

@@ -11,9 +11,9 @@ module Mhc
       @cache   = Cache.new(File.expand_path("status/cache/events.pstore", @basedir))
     end
 
-    def entries(date_range = nil)
-      if date_range
-        int_range = date_range.min.absolute_from_epoch .. date_range.max.absolute_from_epoch
+    def entries(range: nil, category: nil, recurrence: nil)
+      if range
+        int_range = range.min.absolute_from_epoch .. range.max.absolute_from_epoch
       end
 
       Enumerator.new do |yielder|
@@ -23,13 +23,18 @@ module Mhc
 
           Dir.chdir(dir) do
             Dir.foreach(".") do |ent|
-              parse_mhcc(ent).each {|ev| yielder << ev} if /\.mhcc$/ =~ ent
+              parse_mhcc(ent).each {|ev|
+                next if category   && !ev.in_category?(category)
+                next if recurrence && !ev.in_recurrence?(recurrence)
+                yielder << ev
+              } if /\.mhcc$/ =~ ent
               next unless /\.mhc$/ =~ ent
               uid = $`
               cache_entry = @cache.lookup(uid, ent)
-              if !date_range || cache_entry.involved?(int_range)
-                yielder << Event.parse_file(File.expand_path(ent))
-              end
+              next if range      && !cache_entry.in_range?(int_range)
+              next if category   && !cache_entry.in_category?(category)
+              next if recurrence && !cache_entry.in_recurrence?(recurrence)
+              yielder << Event.parse_file(File.expand_path(ent))
             end
           end
         end
@@ -78,6 +83,13 @@ module Mhc
       end
     end
 
+    # dump cache entry for debug usage
+    def each_cache_entry
+      @cache.each do |uid, ent|
+        yield uid, ent
+      end
+    end
+
     ################################################################
     private
 
@@ -105,11 +117,21 @@ module Mhc
     class Cache
       require 'pstore'
 
+      VERSION = "1"
+
       def initialize(cache_filename)
         @pstore = PStore.new(cache_filename)
         load
       end
 
+      # dump cache entry for debug usage
+      def each
+        load unless @db
+        @db.each do |uid, ent|
+          yield uid, ent
+        end
+      end
+
       def lookup(uid, filename)
         unless c = get(uid) and File.mtime(filename).to_i <= c.mtime
           c = CacheEntry.new(filename)
@@ -122,6 +144,7 @@ module Mhc
         return self unless @dirty
         @pstore.transaction do
           @pstore["root"] = @db
+          @pstore["version"] = VERSION
         end
         @dirty = false
       end
@@ -139,7 +162,7 @@ module Mhc
 
       def load
         @pstore.transaction do
-          @db = @pstore["root"] || {}
+          @db = (@pstore["version"] == VERSION) && @pstore["root"] || {}
         end
         @dirty = false
       end
@@ -147,18 +170,34 @@ module Mhc
     end # class Cache
 
     class CacheEntry
-      attr_reader :mtime, :range
+      attr_reader :mtime, :uid, :subject, :location, :categories, :recurrence, :mission, :range
 
       def initialize(filename)
-        @mtime, event = File.mtime(filename).to_i, Event.parse_file(filename)
-        @range = event.range.min.absolute_from_epoch ..
-                 event.range.max.absolute_from_epoch
+        @mtime = File.mtime(filename).to_i
+
+        event = Event.parse_file(filename)
+        @uid            = event.uid.to_s
+        @subject        = event.subject.to_s
+        @location       = event.location.to_s
+        @categories     = event.categories.map {|c| c.to_s.downcase}
+        @recurrence     = event.recurrence_tag.to_s
+        @mission        = event.mission_tag.to_s
+        @range          = event.range.min.absolute_from_epoch ..
+                          event.range.max.absolute_from_epoch
+      end
+
+      def in_category?(category)
+        @categories.member?(category.downcase)
       end
 
-      def involved?(range)
+      def in_range?(range)
         range.min <= @range.max && @range.min <= range.max
       end
 
+      def in_recurrence?(recurrence)
+        @recurrence && @recurrence.downcase == recurrence.downcase
+      end
+
     end # class CacheEntry
 
   end # class DataStore