mhc 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1c058aa0f117bd28b047082f0bffb7829a65336
-  data.tar.gz: 33e55550fee0eab49840f679b57f703803bc9ac7
+  metadata.gz: 4a35853f0483a4ea2ebe72cea18b5f04e11eb115
+  data.tar.gz: abb4fbac0bed6fbfde24a58fd8ca6614ced22c63
 SHA512:
-  metadata.gz: 59543a84b06f8f386b7f3bd33ad4ba8116479308d69a2079d1a8c30dc03a38a5433119117852168b746e364ccbec43576cb9ac3b15fc11532ce5ea5bc5389097
-  data.tar.gz: 2ba5edb349ac06b2e5cc31891c37fe2bde122db6918c0bfec4d9589f1c4c7ccd667adcdb5f99a678a135e5ae2815d0c90164f5fe6aac0da984cf776ab1b3dfa5
+  metadata.gz: 1fddb81016df1b68e8e321e8c6a152e2498812e089e0d07223ba6c0ec074513adfa53e472622ef42effe4e090d8211fdb5b6d68218a02fc061dde78d83992035
+  data.tar.gz: 1bb78936fb975dfd903eb4b6a795db39ab6bceea1620b69a3217e4c76c5392a2d640845af5924c090d9fb59d9c5c3540026cb3073abb7460fbe787daf3539d0c

data/emacs/Cask

@@ -5,7 +5,7 @@
 (source org)
 (source melpa)
 
-(package "mhc" "1.0.4" "Message Harmonized Calendaring system") ;; MHC_VERSION
+(package "mhc" "1.1.0" "Message Harmonized Calendaring system") ;; MHC_VERSION
 
 (files "mhc.el" "mhc-*.el")
 

data/emacs/mhc-vars.el

@@ -17,7 +17,7 @@
 
 
 ;;; Constants:
-(defconst mhc-version "mhc 1.0.4") ;; MHC_VERSION
+(defconst mhc-version "mhc 1.1.0") ;; MHC_VERSION
 
 
 ;;; Configration Variables:

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.0.4
+;; Version: 1.1.0
 ;; Keywords: calendar
 ;; URL: http://www.quickhack.net/mhc
 ;; Package-Requires: ((calfw "20150703"))

data/lib/mhc/formatter.rb

@@ -316,20 +316,17 @@ module Mhc
       def format_body(context)
         events = []
         @occurrences.each do |oc|
-          if oc.categories.map{|c| c.to_s.downcase}.include?('holiday')
-            color = "red"
-          elsif oc.allday?
-            color = "green"
-          else
-            color = ""
-          end
+          class_name = []
+          class_name += oc.categories.map{|c| "mhc-category-#{c.to_s.downcase}"}
+          class_name << (oc.allday? ? "mhc-allday" : "mhc-time-range")
+
           events << {
             id:    oc.record_id,
             allDay: oc.allday?,
             title: oc.subject,
             start: oc.dtstart.iso8601,
             end:   oc.dtend.iso8601,
-            color: color
+            className: class_name
           }
         end
         return events.to_json

data/lib/mhc/sync/driver.rb

@@ -23,7 +23,7 @@ module Mhc
         items = count_sync_items(list_cache)
         if items > max_count
           STDERR.print "Too many (#{items}) articles to sync... abort\n"
-          return false
+          return false unless dry_run
         end
 
         list_cache.each do |uid|
@@ -66,6 +66,10 @@ module Mhc
           copy(uid, @db1, @db2, :overwrite)
         when :overwrite2_to_1
           copy(uid, @db2, @db1, :overwrite)
+        when :move1_to_2
+          move(uid, @db1, @db2)
+        when :move2_to_1
+          move(uid, @db2, @db1)
         end
       end
 
@@ -103,6 +107,22 @@ module Mhc
           STDERR.print "COPY: failed.\n"
         end
       end
+
+      def move(uid, db1, db2)
+        ev = db1.get(uid)
+        info = db1.syncinfo(uid)
+
+        STDERR.print "MOVING: #{ev.uid}\n"
+
+        if new_info = db2.put(ev)
+          db2.syncinfo(uid).mark_synced(new_info.etag)
+
+          db1.delete(uid)
+          info.mark_synced(nil)
+        else
+          STDERR.print "MOVE: failed.\n"
+        end
+      end
     end # class Driver
   end # module  Sync
 end # module Mhc

data/lib/mhc/sync/status.rb

@@ -29,7 +29,11 @@ module Mhc
       end
 
       def modified?
-        sync_status == :created or sync_status == :modified
+        sync_status == :modified
+      end
+
+      def created?
+        sync_status == :created
       end
 
       def unmodified?

data/lib/mhc/sync/strategy.rb

@@ -9,6 +9,8 @@ module Mhc
             return Mirror.new
           when :sync
             return Sync.new
+          when :import
+            return Import.new
           else
             raise NotImplementedError, "#{strategy} #{strategy.class}"
           end
@@ -110,7 +112,7 @@ module Mhc
         def status_signature(info)
           return "N" if info.nil?
 
-          return "M" if info.modified?
+          return "M" if info.modified? || info.created?
           return "U" if info.unmodified?
           return "N" if info.norecord?
           return "D" if info.deleted?
@@ -228,6 +230,58 @@ module Mhc
         end
       end # class Mirror
 
+      # * Import from side1 to side2
+      #
+      #   Import newly created articles on side1 into side2
+      #   All articles in side1 will be deleted after imported into side2.
+      #
+      #                    Side 2
+      #   |---+---------+----------+------------+---------|
+      # S |   | M       | U        | N          | D       |
+      # i |---+---------+----------+------------+---------|
+      # d | M | ?? DEL1 | ?? DEL1  | MV 1->2    | ?? DEL1 |
+      # e | U | ?? DEL1 | ?? DEL1  | ?? DEL1    | ?? DEL1 |
+      # 1 | N | --      | --       | --         | --      |
+      #   | D | --      | --       | --         | --      |
+      #   |---+---------+----------+------------+---------|
+      #
+      #   + M :: Modified (or Created)
+      #   + U :: Unchanged
+      #   + N :: No Record
+      #   + D :: Deleted
+      #
+      #   + -- :: No operation (ignore)
+      #   + ?? :: Not occurred in normal cases
+      #   + MV :: Move
+      #   + DEL :: Delete
+      #
+      class Import < Base
+        def whatnow(side1, side2)
+          actions = {
+            "MM" => :delete1,
+            "MU" => :delete1,
+            "MN" => :move1_to_2,
+            "MD" => :delete1,
+
+            "UM" => :delete1,
+            "UU" => :delete1,
+            "UN" => :delete1,
+            "UD" => :delete1,
+
+            "NM" => :ignore,
+            "NU" => :ignore,
+            "NN" => :ignore,
+            "ND" => :ignore,
+
+            "DM" => :ignore,
+            "DU" => :ignore,
+            "DN" => :ignore,
+            "DD" => :ignore,
+          }
+          return actions[status_pair(side1, side2)]
+        end
+      end # class Import
+
     end # module Strategy
   end # module  Sync
 end # module Mhc

data/lib/mhc/version.rb

@@ -1,4 +1,4 @@
 module Mhc
-  VERSION = "1.0.4"
+  VERSION = "1.1.0"
   PRODID = "-//Quickhack.net//MHC #{Mhc::VERSION}//EN"
 end

data/samples/DOT.mhc-config.yml

@@ -31,9 +31,13 @@
 # make a new calendar on your Google Calendar,
 # and backup MHC folder ~/Mai/schedule.
 #
-# Currently, the type of STRATEGY in SYNC_CHANNELS allows only "mirror"
-# from MHC to Google Calendar. We are planning to support the
-# true two-way sync soon.
+# Currently, the type of STRATEGY in SYNC_CHANNELS allows:
+# + "mirror" :: mirrors MHC to Google Calendar.
+# + "import" :: imports newly created (non-recurring) articles
+#               on Google Calendar into MHC.
+#               All articles in Google will be deleted after the import.
+#
+# We are planning to support the true two-way sync "sync" soon.
 #
 ---
 ################################################################
@@ -61,6 +65,14 @@ SYNC_CHANNELS:
   CALENDAR2: google_business
   STRATEGY: mirror
 
+# After create some articles into google_inbox with Android client,
+# doing ``mhc sync inbox'' on my Mac will import the articles into my MHC.
+# All articles in google_inbox will be deleted, after the import.
+- NAME: inbox
+  CALENDAR1: google_inbox
+  CALENDAR2: master
+  STRATEGY: import
+
 ################################################################
 CALENDARS:
 ################################################################
@@ -114,3 +126,8 @@ CALENDARS:
 - <<: *google_default
   NAME: google_business
   URL: https://calendar.google.com/calendar/dav/**************************@group.calendar.google.com/events/
+
+# Displayname: Android to create articles into:
+- <<: *google_default
+  NAME: google_inbox
+  URL: https://calendar.google.com/calendar/dav/**************************@group.calendar.google.com/events/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mhc
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Yoshinari Nomura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor