@zwa73/dev-utils 1.0.19 → 1.0.21

package/dist/Command/ScanDups.js

@@ -7,6 +7,7 @@ exports.CmdScanDups = void 0;
 const utils_1 = require("@zwa73/utils");
 const fs_1 = __importDefault(require("fs"));
 const crypto_1 = __importDefault(require("crypto"));
+const path_1 = __importDefault(require("path"));
 async function calculateHash(filePath) {
     return new Promise((resolve, reject) => {
         const hash = crypto_1.default.createHash('md5');
@@ -25,7 +26,8 @@ const CmdScanDups = (program) => program
     .option("-r, --recursive", "是否处理子目录, 默认 true", true)
     .action(async (options) => {
     const regex = new RegExp(options.regex);
-    const pList = utils_1.UtilFT.fileSearchRegex(__dirname.replaceAll("\\", "/"), regex.source, {
+    const basePath = process.cwd().replaceAll("\\", "/");
+    const pList = utils_1.UtilFT.fileSearchRegex(basePath, regex.source, {
         relative: options.recursive,
         normalize: "posix",
     }).map(async (filePath) => ({ filePath, hash: await calculateHash(filePath) }));
@@ -43,6 +45,6 @@ const CmdScanDups = (program) => program
     if (options.out === "console")
         utils_1.SLogger.info(out);
     else
-        await utils_1.UtilFT.writeJSONFile(options.out, out);
+        await utils_1.UtilFT.writeJSONFile(path_1.default.join(basePath, options.out), out);
 });
 exports.CmdScanDups = CmdScanDups;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/dev-utils",
-	"version": "1.0.19",
+	"version": "1.0.21",
 	"description": "编译与调试工具",
 	"main": "index.js",
 	"scripts": {

package/src/Command/ScanDups.ts

@@ -2,6 +2,7 @@ import { SLogger, UtilFT } from "@zwa73/utils";
 import { Command } from "commander";
 import fs from "fs";
 import crypto from 'crypto';
+import path from "path";
 
 async function calculateHash(filePath:string) {
     return new Promise<string>((resolve, reject) => {
@@ -23,7 +24,8 @@ export const CmdScanDups = (program: Command) => program
     .option("-r, --recursive", "是否处理子目录, 默认 true", true)
     .action(async (options) => {
         const regex = new RegExp(options.regex);
-        const pList = UtilFT.fileSearchRegex(__dirname.replaceAll("\\", "/"), regex.source, {
+        const basePath = process.cwd().replaceAll("\\", "/")
+        const pList = UtilFT.fileSearchRegex(basePath, regex.source, {
             relative: options.recursive,
             normalize: "posix",
         }).map(async (filePath) => ({ filePath, hash: await calculateHash(filePath) }));
@@ -41,5 +43,5 @@ export const CmdScanDups = (program: Command) => program
         if(options.out==="console")
             SLogger.info(out);
         else
-            await UtilFT.writeJSONFile(options.out,out);
+            await UtilFT.writeJSONFile(path.join(basePath,options.out),out);
     });