zero-tools 1.4.0 → 1.4.3

package/bin.ts

@@ -187,6 +187,7 @@ let fn = {
             await p.parserConfig()
             await p.loadInfo()
             await p.readDir("")
+            console.log("转换结束", p.count)
         }
 
         test().then(() => {
@@ -205,7 +206,7 @@ let fn = {
         console.log(helpString)
     },
     v: () => {
-        console.log("1.4.0")
+        console.log("1.4.3")
     }
 }
 let isFree = true

package/dist/bin.js

@@ -136,6 +136,7 @@ var fn = {
                             return [4 /*yield*/, p.readDir("")];
                         case 3:
                             _a.sent();
+                            console.log("转换结束", p.count);
                             return [2 /*return*/];
                     }
                 });
@@ -154,7 +155,7 @@ var fn = {
         console.log(helpString);
     },
     v: function () {
-        console.log("1.4.0");
+        console.log("1.4.2");
     }
 };
 var isFree = true;

package/dist/tinify.js

@@ -149,7 +149,7 @@ var TaskParser = /** @class */ (function () {
     };
     TaskParser.prototype.pick = function (element) {
         return __awaiter(this, void 0, void 0, function () {
-            var inPath, outPath, info, reg, buffer, md5, code, _a, doc;
+            var inPath, outPath, info, reg, buffer, md5, code, _a, pathKey, doc;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -179,7 +179,8 @@ var TaskParser = /** @class */ (function () {
                         if (!_a) return [3 /*break*/, 6];
                         return [3 /*break*/, 15];
                     case 6:
-                        doc = this.info[inPath];
+                        pathKey = inPath.replace(new RegExp("\\", 'g'), "/");
+                        doc = this.info[pathKey];
                         if (!(doc == null)) return [3 /*break*/, 9];
                         //没有记录
                         // this.count++
@@ -224,7 +225,7 @@ var TaskParser = /** @class */ (function () {
     };
     TaskParser.prototype.tinify = function (inPath, outPath, buffer, code) {
         return __awaiter(this, void 0, void 0, function () {
-            var outBuffer, md5Hash, inMd5, outMd5;
+            var outBuffer, md5Hash, inMd5, outMd5, pathKey;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -237,11 +238,11 @@ var TaskParser = /** @class */ (function () {
                         outMd5 = md5Hash.update(outBuffer).digest('hex');
                         this.witeBuffer(outPath, outBuffer);
                         console.log(inMd5, outMd5);
-                        // await this.db.updateOne({ inPath }, { inPath, outPath, inMd5, outMd5 }, { upsert: true })
-                        this.info[inPath] = { outPath: outPath, inMd5: inMd5, outMd5: outMd5 };
+                        pathKey = inPath.replace(new RegExp("\\", 'g'), "/");
+                        outPath = outPath.replace(new RegExp("\\", 'g'), "/");
+                        this.info[pathKey] = { outPath: outPath, inMd5: inMd5, outMd5: outMd5 };
                         this.saveInfo();
                         this.count++;
-                        console.log("转换结束", this.count);
                         return [2 /*return*/];
                 }
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zero-tools",
-  "version": "1.4.0",
+  "version": "1.4.3",
   "description": "Zero游戏开发工具",
   "main": "index.ts",
   "scripts": {
@@ -31,4 +31,4 @@
   "bin": {
     "zero": "dist/bin.js"
   }
-}
+}

package/tinify.ts

@@ -79,7 +79,8 @@ export class TaskParser {
                     if (this.config.skipSpine && await this.isSpine(inPath)) {
                     } else {
                         // let doc = await this.db.findOne({ inPath })
-                        let doc = this.info[inPath]
+                        let pathKey = inPath.replace("/\\/g", "/")
+                        let doc = this.info[pathKey]
 
                         if (doc == null) {
                             //没有记录
@@ -115,10 +116,11 @@ export class TaskParser {
         this.witeBuffer(outPath, outBuffer)
         console.log(inMd5, outMd5)
         // await this.db.updateOne({ inPath }, { inPath, outPath, inMd5, outMd5 }, { upsert: true })
-        this.info[inPath] = { outPath, inMd5, outMd5 }
+        let pathKey = inPath.replace("/\\/g", "/")
+        outPath = outPath.replace("/\\/g", "/")
+        this.info[pathKey] = { outPath, inMd5, outMd5 }
         this.saveInfo()
         this.count++
-        console.log("转换结束", this.count)
     }
     async copy(inPath: string, outPath: string, buffer: Buffer, code: string): Promise<void> {
         await this.witeBuffer(inPath, await this.readBuffer(outPath))