wsemi 1.8.63 → 1.8.64

package/src/fsSyncFolderCore.mjs

@@ -1,5 +1,6 @@
 import get from 'lodash-es/get.js'
 import map from 'lodash-es/map.js'
+import size from 'lodash-es/size.js'
 import isestr from './isestr.mjs'
 import strleft from './strleft.mjs'
 import strdelleft from './strdelleft.mjs'
@@ -22,7 +23,7 @@ import fsTreeFolderWithHashCore from './fsTreeFolderWithHashCore.mjs'
  * @param {String} fdTar 輸入目標資料夾字串
  * @param {Object} [opt={}] 輸入設定物件，預設{}
  * @param {String} [opt.type='md5'] 輸入計算HASH方法字串，預設'md5'
- * @returns {Promise} 回傳Promise，resolve代表同步成功，reject代表回傳錯誤訊息
+ * @returns {Promise} 回傳Promise，resolve回傳是否有進行同步的布林值，reject代表回傳錯誤訊息
  * @example
  * //need test in nodejs
  *
@@ -48,10 +49,14 @@ async function fsSyncFolderCore(fdSrc, fdTar, opt = {}) {
         throw new Error(`fdSrc[${fdSrc}] is not a folder`)
     }
 
+    //b
+    let b = false
+
     //check
     if (!fsIsFolderCore(fdTar, { fs })) {
         await fsCopyFolderCore(fdSrc, fdTar, { path, fs, useSync: false })
-        return
+        b = true
+        return b
     }
 
     //dlm, ndlm
@@ -102,6 +107,9 @@ async function fsSyncFolderCore(fdSrc, fdTar, opt = {}) {
     //   same: [ {...} ],
     //   diff: [ {...} ],
 
+    //b, 有任一刪除, 新增或變更, 代表需進行同步
+    b = size(r.del) > 0 || size(r.add) > 0 || size(r.diff) > 0
+
     //先針對fdTar內刪除已消失之資料夾
     await pmSeries(r.del, async(v) => {
         if (v.isFolder) {
@@ -130,6 +138,7 @@ async function fsSyncFolderCore(fdSrc, fdTar, opt = {}) {
         }
     })
 
+    return b
 }
 
 

package/test/fsSyncFolder.test.mjs

@@ -22,6 +22,7 @@ describe(`fsSyncFolder`, function() {
         let fp
         let stage
         let b
+        let bSync
 
         if (true) {
 
@@ -104,7 +105,11 @@ describe(`fsSyncFolder`, function() {
         // console.log(stage, fp, 'fsIsFile', b)
         ms.push({ stage, fp, fsIsFile: b })
 
-        await fsSyncFolder(fdSrc, fdTar)
+        stage = 'sync'
+
+        bSync = await fsSyncFolder(fdSrc, fdTar)
+        // console.log(stage, 'bSync', bSync)
+        ms.push({ stage, bSync }) //bSync=true, 有差異故需同步
 
         stage = 'after'
 
@@ -158,6 +163,12 @@ describe(`fsSyncFolder`, function() {
         // console.log(stage, fp, 'fsIsFile', b)
         ms.push({ stage, fp, fsIsFile: b })
 
+        stage = 'sync-again'
+
+        bSync = await fsSyncFolder(fdSrc, fdTar)
+        // console.log(stage, 'bSync', bSync)
+        ms.push({ stage, bSync }) //bSync=false, 已無差異故無須同步
+
         fsDeleteFolder(fdt) //刪除臨時任務資料夾
 
         // console.log('ms', JSON.stringify(ms, null, 2))
@@ -174,6 +185,7 @@ describe(`fsSyncFolder`, function() {
     // before ./_test_fsSyncFolder/tar/def fsIsFolder true
     // before ./_test_fsSyncFolder/tar/def/xyz fsIsFolder true
     // before ./_test_fsSyncFolder/tar/def/xyz/t3.txt fsIsFile true
+    // sync bSync true
     // after ./_test_fsSyncFolder/tar/t0.txt fsIsFile true
     // after ./_test_fsSyncFolder/tar/abc fsIsFolder true
     // after ./_test_fsSyncFolder/tar/abc/t1.txt fsIsFile true
@@ -184,6 +196,7 @@ describe(`fsSyncFolder`, function() {
     // after ./_test_fsSyncFolder/tar/def/xyz-add fsIsFolder true
     // after ./_test_fsSyncFolder/tar/def/xyz/t3.txt fsIsFile false
     // after ./_test_fsSyncFolder/tar/def/xyz-add/t3.txt fsIsFile true
+    // sync-again bSync false
     // ms [
     //   {
     //     "stage": "before",
@@ -221,6 +234,10 @@ describe(`fsSyncFolder`, function() {
     //     "fsIsFile": true
     //   },
     //   {
+    //     "stage": "sync",
+    //     "bSync": true
+    //   },
+    //   {
     //     "stage": "after",
     //     "fp": "./_test_fsSyncFolder/tar/t0.txt",
     //     "fsIsFile": true
@@ -269,6 +286,10 @@ describe(`fsSyncFolder`, function() {
     //     "stage": "after",
     //     "fp": "./_test_fsSyncFolder/tar/def/xyz-add/t3.txt",
     //     "fsIsFile": true
+    //   },
+    //   {
+    //     "stage": "sync-again",
+    //     "bSync": false
     //   }
     // ]
     let ms = [
@@ -307,6 +328,10 @@ describe(`fsSyncFolder`, function() {
             'fp': './_test_fsSyncFolder/tar/def/xyz/t3.txt',
             'fsIsFile': true
         },
+        {
+            'stage': 'sync',
+            'bSync': true
+        },
         {
             'stage': 'after',
             'fp': './_test_fsSyncFolder/tar/t0.txt',
@@ -356,6 +381,10 @@ describe(`fsSyncFolder`, function() {
             'stage': 'after',
             'fp': './_test_fsSyncFolder/tar/def/xyz-add/t3.txt',
             'fsIsFile': true
+        },
+        {
+            'stage': 'sync-again',
+            'bSync': false
         }
     ]
 

package/toolfp/dist/wsemip.umd.js

@@ -1,5 +1,5 @@
 /*!
- * wsemip v1.8.63
+ * wsemip v1.8.64
  * (c) 2018-2021 yuda-lyu(semisphere)
  * Released under the MIT License.
  */

package/toolparfor/dist/wpf.umd.js

@@ -1,5 +1,5 @@
 /*!
- * wpf v1.8.63
+ * wpf v1.8.64
  * (c) 2018-2021 yuda-lyu(semisphere)
  * Released under the MIT License.
  */

package/toolparfor/dist/wpf_pmSeries.umd.js

@@ -1,5 +1,5 @@
 /*!
- * wpf_pmSeries v1.8.63
+ * wpf_pmSeries v1.8.64
  * (c) 2018-2021 yuda-lyu(semisphere)
  * Released under the MIT License.
  */