@e-mc/file-manager 0.13.0 → 0.13.2

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.13.0/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.13.2/lib/index.d.ts)
 
 ```typescript
 import type { ChecksumValue, DataSource, IncrementalMatch, TaskAction } from "./squared";
@@ -296,15 +296,15 @@ NOTE: **FileManager** is a sub-class of [Host](https://www.npmjs.com/package/@e-
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.13.0/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.0/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.0/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.0/lib/filemanager.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.0/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.0/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.0/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.0/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.0/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.2/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.2/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.2/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.2/lib/filemanager.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.2/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.2/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.2/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.2/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.2/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -132,10 +132,20 @@ function bundleTorrent(host, files, mimeType, encoding) {
     return output;
 }
 function recurseDir(output, subDirs, options) {
-    const { ignore, sortBy, recursive } = options;
+    const { ignore, ignoreRoot, sortBy, recursive } = options;
+    const fromDir = subDirs.length > 1 ? path.posix.join(...subDirs.slice(1)) : null;
+    if (ignoreRoot.length > 0 && fromDir && pm.isMatch(fromDir + '/', ignoreRoot, core_1.Host.PLATFORM_WIN32 ? { nocase: true } : undefined)) {
+        return output;
+    }
+    const ignoreGlob = ignore.length > 0 ? pm(ignore, core_1.Host.PLATFORM_WIN32 ? { nocase: true, matchBase: true } : { matchBase: true }) : null;
     const baseDir = path.join(...subDirs);
     const items = fs.readdirSync(baseDir, { withFileTypes: true })
-        .filter(item => item.name)
+        .filter(item => {
+        if (ignoreGlob && ignoreGlob(fromDir ? path.posix.join(fromDir, item.name) : item.name)) {
+            return false;
+        }
+        return item.name;
+    })
         .sort((a, b) => {
         if (sortBy > 0) {
             if (a.isDirectory() && !b.isDirectory()) {
@@ -150,11 +160,12 @@ function recurseDir(output, subDirs, options) {
     for (const item of items) {
         if (!item.isDirectory()) {
             const pathname = path.join(baseDir, item.name);
-            if (!ignore.includes(pathname)) {
-                output.push(pathname);
+            if (item.isSymbolicLink() && core_1.Host.isDir(pathname) || ignore.length > 0 && (core_1.Host.PLATFORM_WIN32 ? ignore.includes(pathname.toLowerCase()) : ignore.includes(pathname))) {
+                continue;
             }
+            output.push(pathname);
         }
-        else if (recursive) {
+        else if (recursive && (subDirs.length > 1 || (core_1.Host.PLATFORM_WIN32 ? !ignoreRoot.includes(item.name.toLowerCase()) : !ignoreRoot.includes(item.name)))) {
             recurseDir(output, subDirs.concat(item.name), options);
         }
     }
@@ -196,7 +207,7 @@ function filterPaths(rootDir, values, options = {}) {
             const [glob, globAbs] = createMatchNegate(include, options);
             for (let i = 0; i < values.length; ++i) {
                 const value = values[i];
-                if (!isMatch(value, glob) && !isMatch(value.substring(rootDir.length), globAbs)) {
+                if (!isMatch(value, globAbs) && !isMatch(value.substring(rootDir.length), glob)) {
                     values.splice(i--, 1);
                 }
             }
@@ -210,7 +221,7 @@ function filterPaths(rootDir, values, options = {}) {
             const [glob, globAbs] = createMatchNegate(exclude, options);
             for (let i = 0; i < values.length; ++i) {
                 const value = values[i];
-                if (isMatch(value, glob) || isMatch(value.substring(rootDir.length), globAbs)) {
+                if (isMatch(value, globAbs) || isMatch(value.substring(rootDir.length), glob)) {
                     values.splice(i--, 1);
                 }
             }
@@ -321,7 +332,7 @@ function setBufferTarget(item, buffer) {
     }
 }
 async function doVerifyChecksum(root, from, options, nested) {
-    const { digestEncoding = options.digest, sortBy = 0, recursive = false, ignore = [], verbose = true, joinRoot } = options;
+    const { digestEncoding = options.digest, sortBy = 0, recursive = false, ignore = [], ignoreRoot = [], verbose = true, joinRoot } = options;
     const parent = recursive === 1 && typeof verbose !== 'number';
     let algorithm = options.algorithm;
     from ||= checksumFile(algorithm);
@@ -349,7 +360,7 @@ async function doVerifyChecksum(root, from, options, nested) {
         const filename = path.basename(from);
         const files = [];
         from = joinRoot ? path.join(root, filename) : path.resolve(from);
-        recurseDir(files, [root], { ignore: [...ignore, from], sortBy, recursive });
+        recurseDir(files, [root], { ignore: [...mapPosix(ignore), from], ignoreRoot: mapPosix(ignoreRoot), sortBy, recursive });
         const items = fs.readFileSync(from, 'utf8').split('\n').map(item => {
             const index = item.indexOf(' ');
             return [item.substring(0, index), path.join(root, item.substring(index + 1))];
@@ -474,6 +485,7 @@ const isDownloadAll = (type) => type === 4 || type === 0;
 const hasFiles = (type, uri) => type === 3 || type === 4 || type === 0 && request_1.isRclone(uri);
 const hasIncremental = (value) => value === "etag" || value === "exists";
 const matchPathname = (value) => core_1.Host.PLATFORM_WIN32 ? value.toLowerCase() : value;
+const mapPosix = (values) => core_1.Host.PLATFORM_WIN32 ? values.map(value => core_1.Permission.toPosix(value).toLowerCase()) : values;
 const formatPercent = (value) => Math.round(value).toString().padStart(3) + '%';
 const formatLength = (value, length) => `${length} ${value + (length === 1 ? '' : 's')}`;
 const checkEOF = (value) => /\n$/.test(value) ? value : value + '\n';
@@ -1448,13 +1460,13 @@ class FileManager extends core_1.Host {
         else {
             options ||= {};
         }
-        const { algorithm, digestEncoding = options.digest, sortBy = 0, recursive = false, ignore = [], verbose = false, joinRoot } = options;
+        const { algorithm, digestEncoding = options.digest, sortBy = 0, recursive = false, ignore = [], ignoreRoot = [], verbose = false, joinRoot } = options;
         to ||= checksumFile(algorithm);
         let result = [];
         try {
             const filename = path.basename(to);
             to = joinRoot ? path.join(root, to) : path.resolve(to);
-            recurseDir(result, [root], { ignore: [...ignore, to], sortBy, recursive });
+            recurseDir(result, [root], { ignore: [...mapPosix(ignore), to], ignoreRoot: mapPosix(ignoreRoot), sortBy, recursive });
             const output = [];
             for (const pathname of result = filterPaths(root, result, options)) {
                 if (recursive === 1 && path.basename(pathname) === filename) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/file-manager",
-  "version": "0.13.0",
+  "version": "0.13.2",
   "description": "FileManager constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -19,15 +19,15 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/cloud": "0.13.0",
-    "@e-mc/compress": "0.13.0",
-    "@e-mc/core": "0.13.0",
-    "@e-mc/document": "0.13.0",
-    "@e-mc/image": "0.13.0",
-    "@e-mc/request": "0.13.0",
-    "@e-mc/task": "0.13.0",
-    "@e-mc/types": "0.13.0",
-    "@e-mc/watch": "0.13.0",
+    "@e-mc/cloud": "0.13.2",
+    "@e-mc/compress": "0.13.2",
+    "@e-mc/core": "0.13.2",
+    "@e-mc/document": "0.13.2",
+    "@e-mc/image": "0.13.2",
+    "@e-mc/request": "0.13.2",
+    "@e-mc/task": "0.13.2",
+    "@e-mc/types": "0.13.2",
+    "@e-mc/watch": "0.13.2",
     "chalk": "4.1.2",
     "diff": "^8.0.2",
     "picomatch": "^4.0.3"