w-zip 1.0.9 → 1.0.13

package/docs/mZip.html

@@ -71,7 +71,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="mZip.mjs.html">mZip.mjs</a>, <a href="mZip.mjs.html#line91">line 91</a>
+        <a href="mZip.mjs.html">mZip.mjs</a>, <a href="mZip.mjs.html#line93">line 93</a>
     </li></ul></dd>
     
 
@@ -124,7 +124,7 @@
 
     <h5>Example</h5>
     
-    <pre class="prettyprint"><code>import wz from 'w-zip'
    //zipFile
    console.log('zipFile before')
    console.log('zipFile', await wz.mZip.zipFile(fpSrc1, fpZip1))
    console.log('zipFile after')
    //zipFolder
    console.log('zipFolder before')
    console.log('zipFolder', await wz.mZip.zipFolder(fpSrc2, fpZip2))
    console.log('zipFolder after')
    //zipFolder with password
    console.log('zipFolder with password before')
    console.log('zipFolder with password', await wz.mZip.zipFolder(fpSrc2, fpZip2PW, { pw }))
    console.log('zipFolder with password after')
    //unzip
    console.log('unzip1 before')
    console.log('unzip1', await wz.mZip.unzip(fpZip1, fpUnzipExtract + '/test1'))
    console.log('unzip1 after')
    //unzip
    console.log('unzip2 before')
    console.log('unzip2', await wz.mZip.unzip(fpZip2, fpUnzipExtract + '/test2'))
    console.log('unzip2 after')
    //unzip with password
    console.log('unzip2 with password before')
    console.log('unzip2 with password', await wz.mZip.unzip(fpZip2PW, fpUnzipExtract + '/test2PW', { pw }))
    console.log('unzip2 with password after')
    .catch((err) => {
        console.log(err)
    })
+    <pre class="prettyprint"><code>import wz from 'w-zip'
    //zipFile
    console.log('zipFile before')
    console.log('zipFile', await wz.mZip.zipFile(fpSrc1, fpZip1))
    console.log('zipFile after')
    //zipFolder
    console.log('zipFolder before')
    console.log('zipFolder', await wz.mZip.zipFolder(fpSrc2, fpZip2))
    console.log('zipFolder after')
    //zipFolder with password
    console.log('zipFolder with password before')
    console.log('zipFolder with password', await wz.mZip.zipFolder(fpSrc2, fpZip2PW, { pw }))
    console.log('zipFolder with password after')
    //unzip
    console.log('unzip1 before')
    console.log('unzip1', await wz.mZip.unzip(fpZip1, fpUnzipExtract + '/test1'))
    console.log('unzip1 after')
    //unzip
    console.log('unzip2 before')
    console.log('unzip2', await wz.mZip.unzip(fpZip2, fpUnzipExtract + '/test2'))
    console.log('unzip2 after')
    //unzip with password
    console.log('unzip2 with password before')
    console.log('unzip2 with password', await wz.mZip.unzip(fpZip2PW, fpUnzipExtract + '/test2PW', { pw }))
    console.log('unzip2 with password after')
    .catch((err) => {
        console.log(err)
    })
 
 
 
@@ -206,7 +206,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="mZip.mjs.html">mZip.mjs</a>, <a href="mZip.mjs.html#line266">line 266</a>
+        <a href="mZip.mjs.html">mZip.mjs</a>, <a href="mZip.mjs.html#line278">line 278</a>
     </li></ul></dd>
     
 
@@ -523,7 +523,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="mZip.mjs.html">mZip.mjs</a>, <a href="mZip.mjs.html#line105">line 105</a>
+        <a href="mZip.mjs.html">mZip.mjs</a>, <a href="mZip.mjs.html#line107">line 107</a>
     </li></ul></dd>
     
 
@@ -865,7 +865,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="mZip.mjs.html">mZip.mjs</a>, <a href="mZip.mjs.html#line185">line 185</a>
+        <a href="mZip.mjs.html">mZip.mjs</a>, <a href="mZip.mjs.html#line192">line 192</a>
     </li></ul></dd>
     
 
@@ -1072,7 +1072,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.6</a> on Thu Sep 09 2021 09:06:53 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.6</a> on Thu Dec 16 2021 13:56:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/mZip.mjs.html

@@ -50,6 +50,8 @@ import unzipper from 'unzipper'
 import get from 'lodash/get'
 import genPm from 'wsemi/src/genPm.mjs'
 import pmMap from 'wsemi/src/pmMap.mjs'
+import getFileName from 'wsemi/src/getFileName.mjs'
+import checkTarget from './checkTarget.mjs'
 
 
 //registerFormat
@@ -114,22 +116,22 @@ archiver.registerFormat('zip-encrypted', archiverEnc)
  *     })
  *
  * // zipFile before
- * // zipFile done: ./testData/outputZip/test1.zip
+ * // zipFile done: test1.zip
  * // zipFile after
  * // zipFolder before
- * // zipFolder done: ./testData/outputZip/test2.zip
+ * // zipFolder done: test2.zip
  * // zipFolder after
  * // zipFolder with password before
- * // zipFolder with password done: ./testData/outputZip/test2PW.zip
+ * // zipFolder with password done: test2PW.zip
  * // zipFolder with password after
  * // unzip1 before
- * // unzip1 done: ./testData/outputZip/extract/test1
+ * // unzip1 done: test1
  * // unzip1 after
  * // unzip2 before
- * // unzip2 done: ./testData/outputZip/extract/test2
+ * // unzip2 done: test2
  * // unzip2 after
  * // unzip2 with password before
- * // unzip2 with password done: ./testData/outputZip/extract/test2PW
+ * // unzip2 with password done: test2PW
  * // unzip2 with password after
  */
 function mZip() {
@@ -156,6 +158,11 @@ function mZip() {
             return Promise.reject('path of source is not file')
         }
 
+        //check fpTar
+        if (!checkTarget(fpTar)) {
+            return Promise.reject('invalid fpSrc')
+        }
+
         //default
         let level = get(opt, 'level', 9)
         let pw = get(opt, 'pw', '')
@@ -236,6 +243,11 @@ function mZip() {
             return Promise.reject('path of source is not folder')
         }
 
+        //check fpTar
+        if (!checkTarget(fpTar)) {
+            return Promise.reject('invalid fpSrc')
+        }
+
         //default
         let level = get(opt, 'level', 9)
         let pw = get(opt, 'pw', '')
@@ -317,6 +329,11 @@ function mZip() {
             return Promise.reject('path of source is not file')
         }
 
+        //check fpTar
+        if (!checkTarget(fpTar)) {
+            return Promise.reject('invalid fpSrc')
+        }
+
         //default
         let pw = get(opt, 'pw', '')
 
@@ -382,7 +399,7 @@ function mZip() {
             //extract
             await extract(fpSrc, fpTar, pw)
 
-            return Promise.resolve('done: ' + fpTar)
+            return Promise.resolve('done: ' + getFileName(fpTar))
         }
         catch (err) {
             return Promise.reject(err)
@@ -413,7 +430,7 @@ export default mZip()
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.6</a> on Thu Sep 09 2021 09:06:53 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.6</a> on Thu Dec 16 2021 13:56:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "w-zip",
-  "version": "1.0.9",
+  "version": "1.0.13",
   "description": "A compression tool with zip and 7z.",
   "main": "dist/w-zip.umd.js",
   "dependencies": {
@@ -8,10 +8,10 @@
     "archiver-zip-encrypted": "^1.0.10",
     "unzipper": "^0.10.11",
     "lodash": "^4.17.21",
-    "wsemi": "^1.6.16"
+    "wsemi": "^1.6.34"
   },
   "devDependencies": {
-    "w-package-tools": "^1.0.56"
+    "w-package-tools": "^1.0.59"
   },
   "scripts": {
     "test": "mocha --parallel --timeout 60000 --experimental-modules --es-module-specifier-resolution=node",

package/src/checkTarget.mjs

@@ -0,0 +1,35 @@
+import fs from 'fs'
+import fsIsFile from 'wsemi/src/fsIsFile.mjs'
+import fsIsFolder from 'wsemi/src/fsIsFolder.mjs'
+import fsDeleteFolder from 'wsemi/src/fsDeleteFolder.mjs'
+
+
+async function checkTarget(fpTar) {
+
+    //check fpTar
+    try {
+
+        //刪除儲存對象
+        if (fsIsFile(fpTar)) {
+            fs.unlinkSync(fpTar)
+        }
+        else if (fsIsFolder(fpTar)) {
+            fsDeleteFolder(fpTar)
+        }
+
+        //測試儲存fpTar成文字檔案
+        fs.writeFileSync(fpTar, 'test', 'utf8')
+
+        //刪除測試檔案
+        fs.unlinkSync(fpTar)
+
+    }
+    catch (err) {
+        return false
+    }
+
+    return true
+}
+
+
+export default checkTarget

package/src/m7z.mjs

@@ -1,6 +1,8 @@
 import fs from 'fs'
 import get from 'lodash/get'
 import execScript from 'wsemi/src/execScript.mjs'
+import getFileName from 'wsemi/src/getFileName.mjs'
+import checkTarget from './checkTarget.mjs'
 
 
 /**
@@ -65,22 +67,22 @@ import execScript from 'wsemi/src/execScript.mjs'
  *     })
  *
  * // zipFile before
- * // zipFile finish: ./testData/output7z/test1.7z
+ * // zipFile finish: test1.7z
  * // zipFile after
  * // zipFolder before
- * // zipFolder finish: ./testData/output7z/test2.7z
+ * // zipFolder finish: test2.7z
  * // zipFolder after
  * // zipFolder with password before
- * // zipFolder with password finish: ./testData/output7z/test2PW.7z
+ * // zipFolder with password finish: test2PW.7z
  * // zipFolder with password after
  * // unzip1 before
- * // unzip1 finish: ./testData/output7z/extract/test1
+ * // unzip1 finish: test1
  * // unzip1 after
  * // unzip2 before
- * // unzip2 finish: ./testData/output7z/extract/test2
+ * // unzip2 finish: test2
  * // unzip2 after
  * // unzip2 with password before
- * // unzip2 with password finish: ./testData/output7z/extract/test2PW
+ * // unzip2 with password finish: test2PW
  * // unzip2 with password after
  */
 function m7z() {
@@ -144,7 +146,7 @@ function m7z() {
      */
     async function zipFile(fpSrc, fpTar, opt = {}) {
 
-        //check
+        //check fpSrc
         if (!fs.existsSync(fpSrc)) {
             return Promise.reject('invalid path of source file')
         }
@@ -152,6 +154,11 @@ function m7z() {
             return Promise.reject('path of source is not file')
         }
 
+        //check fpTar
+        if (!checkTarget(fpTar)) {
+            return Promise.reject('invalid fpSrc')
+        }
+
         //default
         let level = get(opt, 'level', 9)
         let pw = get(opt, 'pw', '')
@@ -196,6 +203,11 @@ function m7z() {
             return Promise.reject('path of source is not folder')
         }
 
+        //check fpTar
+        if (!checkTarget(fpTar)) {
+            return Promise.reject('invalid fpSrc')
+        }
+
         //default
         let level = get(opt, 'level', 9)
         let pw = get(opt, 'pw', '')
@@ -239,6 +251,11 @@ function m7z() {
             return Promise.reject('path of source is not file')
         }
 
+        //check fpTar
+        if (!checkTarget(fpTar)) {
+            return Promise.reject('invalid fpSrc')
+        }
+
         //default
         let pw = get(opt, 'pw', '')
 
@@ -265,7 +282,7 @@ function m7z() {
         }
 
         return {
-            state: 'finish: ' + fpTar, //7z順利結束不代表就是順利完成加解壓縮
+            state: 'finish: ' + getFileName(fpTar), //7z順利結束不代表就是順利完成加解壓縮
             msg7z: r,
         }
     }

package/src/mZip.mjs

@@ -6,6 +6,8 @@ import unzipper from 'unzipper'
 import get from 'lodash/get'
 import genPm from 'wsemi/src/genPm.mjs'
 import pmMap from 'wsemi/src/pmMap.mjs'
+import getFileName from 'wsemi/src/getFileName.mjs'
+import checkTarget from './checkTarget.mjs'
 
 
 //registerFormat
@@ -70,22 +72,22 @@ archiver.registerFormat('zip-encrypted', archiverEnc)
  *     })
  *
  * // zipFile before
- * // zipFile done: ./testData/outputZip/test1.zip
+ * // zipFile done: test1.zip
  * // zipFile after
  * // zipFolder before
- * // zipFolder done: ./testData/outputZip/test2.zip
+ * // zipFolder done: test2.zip
  * // zipFolder after
  * // zipFolder with password before
- * // zipFolder with password done: ./testData/outputZip/test2PW.zip
+ * // zipFolder with password done: test2PW.zip
  * // zipFolder with password after
  * // unzip1 before
- * // unzip1 done: ./testData/outputZip/extract/test1
+ * // unzip1 done: test1
  * // unzip1 after
  * // unzip2 before
- * // unzip2 done: ./testData/outputZip/extract/test2
+ * // unzip2 done: test2
  * // unzip2 after
  * // unzip2 with password before
- * // unzip2 with password done: ./testData/outputZip/extract/test2PW
+ * // unzip2 with password done: test2PW
  * // unzip2 with password after
  */
 function mZip() {
@@ -112,6 +114,11 @@ function mZip() {
             return Promise.reject('path of source is not file')
         }
 
+        //check fpTar
+        if (!checkTarget(fpTar)) {
+            return Promise.reject('invalid fpSrc')
+        }
+
         //default
         let level = get(opt, 'level', 9)
         let pw = get(opt, 'pw', '')
@@ -192,6 +199,11 @@ function mZip() {
             return Promise.reject('path of source is not folder')
         }
 
+        //check fpTar
+        if (!checkTarget(fpTar)) {
+            return Promise.reject('invalid fpSrc')
+        }
+
         //default
         let level = get(opt, 'level', 9)
         let pw = get(opt, 'pw', '')
@@ -273,6 +285,11 @@ function mZip() {
             return Promise.reject('path of source is not file')
         }
 
+        //check fpTar
+        if (!checkTarget(fpTar)) {
+            return Promise.reject('invalid fpSrc')
+        }
+
         //default
         let pw = get(opt, 'pw', '')
 
@@ -338,7 +355,7 @@ function mZip() {
             //extract
             await extract(fpSrc, fpTar, pw)
 
-            return Promise.resolve('done: ' + fpTar)
+            return Promise.resolve('done: ' + getFileName(fpTar))
         }
         catch (err) {
             return Promise.reject(err)