@zwa73/dev-utils 1.0.18 → 1.0.20

package/dist/Command/MapPath.js

@@ -12,7 +12,7 @@ const DupMethodList = ["no-rename", "overwrite", "move"];
 const CmdMapPath = (program) => program
     .command("mappath")
     .description("根据正则表达式对文件名进行映射")
-    .argument("<regex>", "要匹配的正则表达式")
+    .argument("<regex>", "要匹配的正则表达式, posix风格路径")
     .argument("<replacement>", "替换字符串")
     .option("-e, --exclude <regex>", "排除文件的正则表达式")
     .option(`-d, --duplicate-handling <${DupMethodList.join('|')}>`, "处理重名文件的方式", "no-rename")
@@ -26,10 +26,10 @@ const CmdMapPath = (program) => program
     if (!DupMethodList.includes(options.duplicateHandling))
         (0, utils_1.throwError)(`${options.duplicateHandling} 不是有效的 duplicate-handling`);
     const duplicateHandling = options.duplicateHandling;
-    const basePath = process.cwd();
+    const basePath = process.cwd().replaceAll('\\', '/');
     // 遍历当前目录下的所有文件
     const filePaths = utils_1.UtilFT.fileSearchRegex(basePath, regex.source, { relative: options.recursive, normalize: "posix" })
-        .map((filePath) => path_1.default.relative(basePath, filePath))
+        .map((filePath) => path_1.default.posix.relative(basePath, filePath))
         .filter((filePath) => excludeRegex ? (!excludeRegex.test(filePath)) : true);
     //对单个路径映射
     const mapPath = async (source, target) => {
@@ -51,7 +51,7 @@ const CmdMapPath = (program) => program
         //如果文件已存在
         if (await utils_1.UtilFT.pathExists(newFilePath)) {
             await (0, utils_1.matchProc)(duplicateHandling, {
-                'move': () => mapPath(filePath, path_1.default.join(options.duplicateOutput, newFilePath)),
+                'move': () => mapPath(filePath, path_1.default.posix.join(options.duplicateOutput, newFilePath)),
                 'no-rename': () => utils_1.SLogger.info(`重名文件存在，跳过：${newFilePath}`),
                 'overwrite': () => mapPath(filePath, newFilePath),
             });

package/dist/Command/Route.js

@@ -6,11 +6,13 @@ const Init_1 = require("./Init");
 const Node_1 = require("./Node");
 const Release_1 = require("./Release");
 const MapPath_1 = require("./MapPath");
+const ScanDups_1 = require("./ScanDups");
 async function cliRoute() {
     (0, Init_1.CmdInit)(commander_1.program);
     (0, Node_1.CmdNode)(commander_1.program);
     (0, Release_1.CmdRelease)(commander_1.program);
     (0, MapPath_1.CmdMapPath)(commander_1.program);
+    (0, ScanDups_1.CmdScanDups)(commander_1.program);
     commander_1.program.parse(process.argv);
 }
 exports.cliRoute = cliRoute;

package/dist/Command/ScanDups.d.ts

@@ -0,0 +1,3 @@
+import { Command } from "commander";
+/**重命名文件或路径 scan_duplicates */
+export declare const CmdScanDups: (program: Command) => Command;

package/dist/Command/ScanDups.js

@@ -0,0 +1,49 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CmdScanDups = void 0;
+const utils_1 = require("@zwa73/utils");
+const fs_1 = __importDefault(require("fs"));
+const crypto_1 = __importDefault(require("crypto"));
+async function calculateHash(filePath) {
+    return new Promise((resolve, reject) => {
+        const hash = crypto_1.default.createHash('md5');
+        const stream = fs_1.default.createReadStream(filePath);
+        stream.on('data', (data) => hash.update(data));
+        stream.on('end', () => resolve(hash.digest('hex')));
+        stream.on('error', reject);
+    });
+}
+/**重命名文件或路径 scan_duplicates */
+const CmdScanDups = (program) => program
+    .command("scandups")
+    .description("扫描当前目录下hash重复的文件")
+    .option("-re, --regex <regex>", "文件的正则表达式, 使用posix路径", ".*")
+    .option("-o, --out <dir|console>", "输出的json文件路径, 默认 scandupsOut.json, 为 \"console\" 时无文件输出", "scandupsOut")
+    .option("-r, --recursive", "是否处理子目录, 默认 true", true)
+    .action(async (options) => {
+    const regex = new RegExp(options.regex);
+    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) }));
+    const hashMap = (await Promise.all(pList)).reduce((obj, cur) => {
+        obj[cur.hash] = (obj[cur.hash] ?? []).concat(cur.filePath);
+        return obj;
+    }, {});
+    const out = {};
+    for (const hash in hashMap) {
+        const duplicateFiles = hashMap[hash];
+        if (duplicateFiles.length <= 1)
+            continue;
+        out[hash] = duplicateFiles;
+    }
+    if (options.out === "console")
+        utils_1.SLogger.info(out);
+    else
+        await utils_1.UtilFT.writeJSONFile(options.out, out);
+});
+exports.CmdScanDups = CmdScanDups;

package/package.json

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

package/src/Command/MapPath.ts

@@ -10,7 +10,7 @@ type DupMethod = typeof DupMethodList[number];
 export const CmdMapPath = (program: Command) => program
     .command("mappath")
     .description("根据正则表达式对文件名进行映射")
-    .argument("<regex>", "要匹配的正则表达式")
+    .argument("<regex>", "要匹配的正则表达式, posix风格路径")
     .argument("<replacement>", "替换字符串")
     .option("-e, --exclude <regex>", "排除文件的正则表达式")
     .option(`-d, --duplicate-handling <${DupMethodList.join('|')}>`, "处理重名文件的方式", "no-rename")
@@ -24,10 +24,10 @@ export const CmdMapPath = (program: Command) => program
         if(!DupMethodList.includes(options.duplicateHandling))
             throwError(`${options.duplicateHandling} 不是有效的 duplicate-handling`);
         const duplicateHandling = options.duplicateHandling as DupMethod;
-        const basePath = process.cwd();
+        const basePath = process.cwd().replaceAll('\\','/');
         // 遍历当前目录下的所有文件
         const filePaths = UtilFT.fileSearchRegex(basePath, regex.source,{relative:options.recursive,normalize:"posix"})
-            .map((filePath)=>path.relative(basePath, filePath))
+            .map((filePath)=>path.posix.relative(basePath, filePath))
             .filter((filePath)=>excludeRegex ? (!excludeRegex.test(filePath)) : true);
 
         //对单个路径映射
@@ -49,7 +49,7 @@ export const CmdMapPath = (program: Command) => program
             //如果文件已存在
             if(await UtilFT.pathExists(newFilePath)){
                 await matchProc(duplicateHandling,{
-                    'move': ()=> mapPath(filePath, path.join(options.duplicateOutput, newFilePath)),
+                    'move': ()=> mapPath(filePath, path.posix.join(options.duplicateOutput, newFilePath)),
                     'no-rename': ()=> SLogger.info(`重名文件存在，跳过：${newFilePath}`),
                     'overwrite': ()=> mapPath(filePath,newFilePath),
                 })

package/src/Command/Route.ts

@@ -4,11 +4,13 @@ import { CmdInit } from './Init';
 import { CmdNode } from './Node';
 import { CmdRelease } from './Release';
 import { CmdMapPath } from './MapPath';
+import { CmdScanDups } from './ScanDups';
 
 export async function cliRoute(){
     CmdInit(program);
     CmdNode(program);
     CmdRelease(program);
     CmdMapPath(program);
+    CmdScanDups(program);
     program.parse(process.argv);
 }

package/src/Command/ScanDups.ts

@@ -0,0 +1,46 @@
+import { SLogger, UtilFT } from "@zwa73/utils";
+import { Command } from "commander";
+import fs from "fs";
+import crypto from 'crypto';
+
+async function calculateHash(filePath:string) {
+    return new Promise<string>((resolve, reject) => {
+        const hash = crypto.createHash('md5');
+        const stream = fs.createReadStream(filePath);
+        stream.on('data', (data) => hash.update(data));
+        stream.on('end', () => resolve(hash.digest('hex')));
+        stream.on('error', reject);
+    });
+}
+
+
+/**重命名文件或路径 scan_duplicates */
+export const CmdScanDups = (program: Command) => program
+    .command("scandups")
+    .description("扫描当前目录下hash重复的文件")
+    .option("-re, --regex <regex>", "文件的正则表达式, 使用posix路径",".*")
+    .option("-o, --out <dir|console>", "输出的json文件路径, 默认 scandupsOut.json, 为 \"console\" 时无文件输出", "scandupsOut")
+    .option("-r, --recursive", "是否处理子目录, 默认 true", true)
+    .action(async (options) => {
+        const regex = new RegExp(options.regex);
+        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) }));
+
+        const hashMap = (await Promise.all(pList)).reduce((obj,cur)=>{
+            obj[cur.hash] = (obj[cur.hash]??[]).concat(cur.filePath);
+            return obj;
+        },{} as Record<string,string[]>);
+        const out:Record<string,string[]> = {};
+        for (const hash in hashMap) {
+            const duplicateFiles = hashMap[hash];
+            if(duplicateFiles.length<=1) continue;
+                out[hash] = duplicateFiles;
+        }
+        if(options.out==="console")
+            SLogger.info(out);
+        else
+            await UtilFT.writeJSONFile(options.out,out);
+    });