icfs 0.2.0 → 0.3.0

data/lib/icfs/items.rb

@@ -499,9 +499,10 @@ module Items
       'template' => Validate::IsBoolean,
       'status' => Validate::IsBoolean,
       'title' => FieldTitle,
-      'access' => SubAccess
+      'access' => SubAccess,
     }.freeze,
     optional: {
+      'caseid' => FieldCaseid,
       'tags' => SubTags,
       'stats' => SubCaseStats,
     }.freeze
@@ -512,11 +513,11 @@ module Items
   ItemEntryNew = {
     method: :hash,
     required: {
-      'caseid' => FieldCaseid,
       'title' => FieldTitle,
       'content' => FieldContent,
     }.freeze,
     optional: {
+      'caseid' => FieldCaseid,
       'time' => Validate::IsIntPos,
       'tags' => SubTagsNormal,
       'index' => SubIndexes,
@@ -536,11 +537,11 @@ module Items
   ItemEntryEdit = {
     method: :hash,
     required: {
-      'caseid' => FieldCaseid,
       'title' => FieldTitle,
       'content' => FieldContent,
     }.freeze,
     optional: {
+      'caseid' => FieldCaseid,
       'entry' => Validate::IsIntPos,
       'time' => Validate::IsIntPos,
       'tags' => SubTagsEntry,
@@ -567,6 +568,7 @@ module Items
       'tasks' => SubTasksEdit
     }.freeze,
     optional: {
+      'caseid' => FieldCaseid,
       'action' => Validate::IsIntPos
     }.freeze
   }.freeze
@@ -580,6 +582,7 @@ module Items
       'content' => FieldContent,
     }.freeze,
     optional: {
+      'caseid' => FieldCaseid,
       'index' => Validate::IsIntPos,
       'tags' => SubTags,
     }.freeze
@@ -605,6 +608,7 @@ module Items
     }.freeze,
     optional: {
       'stats' => SubCaseStats,
+      'entry' => Validate::IsIntPos,
     }.freeze,
   }.freeze
 
@@ -619,12 +623,18 @@ module Items
       'prev' => FieldHash,
       'time' => Validate::IsIntPos,
       'user' => FieldUsergrp,
-      'entry' => SubLogItem,
     }.freeze,
     optional: {
+      'entry' => SubLogItem,
       'index' => SubLogItem,
       'action' => SubLogItem,
-      'case_hash' => FieldHash,
+      'case' => {
+        method: :hash,
+        required: {
+          'set' => Validate::IsBoolean,
+          'hash' => FieldHash,
+        }.freeze,
+      }.freeze,
       'files_hash' => {
         method: :array,
         min: 1,
@@ -677,6 +687,9 @@ module Items
       'action' => Validate::IsIntPos,
       'log' => Validate::IsIntPos,
       'tasks' => SubTasks
+    }.freeze,
+    optional: {
+      'entry' => Validate::IsIntPos,
     }.freeze
   }.freeze
 
@@ -693,6 +706,9 @@ module Items
       'content' => FieldContent,
       'tags' => SubTags
     }.freeze,
+    optional: {
+      'entry' => Validate::IsIntPos,
+    }.freeze
   }.freeze
 
 

data/lib/icfs/utils/backup.rb

@@ -111,13 +111,15 @@ class Backup
       end
 
       # entry
-      enum = log['entry']['num']
-      _copy_item(dest,
-        'entry %d-%d' % [enum, lnum],
-        :entry_read,
-        :entry_write,
-        [cid, enum, lnum]
-      )
+      if log['entry']
+        enum = log['entry']['num']
+        _copy_item(dest,
+          'entry %d-%d' % [enum, lnum],
+          :entry_read,
+          :entry_write,
+          [cid, enum, lnum]
+        )
+      end
 
       # index
       if log['index']
@@ -142,7 +144,7 @@ class Backup
       end
 
       # case
-      if log['case_hash']
+      if log['case']
         _copy_item(dest,
           'case %d' % lnum,
           :case_read,
@@ -280,15 +282,17 @@ class Backup
         end
 
         # entry
-        enum = log['entry']['num']
-        _restore_item(src,
-          'entry %d-%d' % [enum, lnum],
-          :entry_read,
-          :entry_write,
-          [cid, enum, lnum],
-          [cid, enum]
-        )
-        emax = enum if enum > emax
+        if log['entry']
+          enum = log['entry']['num']
+          _restore_item(src,
+            'entry %d-%d' % [enum, lnum],
+            :entry_read,
+            :entry_write,
+            [cid, enum, lnum],
+            [cid, enum]
+          )
+          emax = enum if enum > emax
+        end
 
         # index
         if log['index']
@@ -317,7 +321,7 @@ class Backup
         end
 
         # case
-        if log['case_hash']
+        if log['case']
           _restore_item(src,
             'case %d' % lnum,
             :case_read,

data/lib/icfs/utils/check.rb

@@ -138,27 +138,29 @@ class Check
       end
 
       # entry
-      enum = log['entry']['num']
-      ent = _item(
-        'entry %d-%d' % [enum, lnum],
-        :entry_read,
-        [cid, enum, lnum],
-        ent_cur.include?(enum),
-        log['entry']['hash'],
-        Items::ItemEntry,
-        [
-          ['caseid', 0].freeze,
-          ['entry', 1].freeze,
-          ['log', 2].freeze
-        ].freeze,
-      )
+      if log['entry']
+        enum = log['entry']['num']
+        ent = _item(
+          'entry %d-%d' % [enum, lnum],
+          :entry_read,
+          [cid, enum, lnum],
+          ent_cur.include?(enum),
+          log['entry']['hash'],
+          Items::ItemEntry,
+          [
+            ['caseid', 0].freeze,
+            ['entry', 1].freeze,
+            ['log', 2].freeze
+          ].freeze,
+        )
 
-      # current entry
-      unless ent_cur.include?(enum)
-        ent_cur.add(enum)
-        if ent['files']
-          ent['files'].each do |fd|
-            file_cur.add( '%d-%d-%d' % [enum, fd['num'], fd['log']] )
+        # current entry
+        unless ent_cur.include?(enum)
+          ent_cur.add(enum)
+          if ent['files']
+            ent['files'].each do |fd|
+              file_cur.add( '%d-%d-%d' % [enum, fd['num'], fd['log']] )
+            end
           end
         end
       end
@@ -202,13 +204,13 @@ class Check
       end
 
       # case
-      if log['case_hash']
+      if log['case']
         cse = _item(
           'case %d' % lnum,
           :case_read,
           [cid, lnum],
           cse_cur,
-          log['case_hash'],
+          log['case']['hash'],
           Items::ItemCase,
           [
             ['caseid', 0].freeze,