pug-site-core 2.0.14 → 2.0.16

package/lib/generate.js

@@ -272,7 +272,7 @@ export async function fetchDataToJsonFile(args) {
             return Promise.reject(new Error(obj.getDataFn + "获取数据函数不存在"));
           }
 
-          if (filterFun.length && !filterFun.includes(obj.getDataFn)) {
+          if (!isFillFun(obj.getDataFn)) {
             continue;
           }
 
@@ -282,6 +282,13 @@ export async function fetchDataToJsonFile(args) {
             await checkData(data, language, obj.getDataFn);
             let outPutPath = obj.outPutPath.split("/").join(pathSymbol);
             if (Array.isArray(data)) {
+              await fse.remove(
+                paths.resolveRoot(
+                  "jsonData",
+                  language,
+                  ...outPutPath.split(pathSymbol).slice(0, -1)
+                )
+              );
               let name = outPutPath.split(pathSymbol).pop().replace(/\..*$/, "");
               const regex = /^\[.+\]$/;
               if (regex.test(name)) {
@@ -321,7 +328,7 @@ export async function fetchDataToJsonFile(args) {
           return Promise.reject(new Error(`${funName} 获取数据函数不存在`));
         }
 
-        if (filterFun.length && !filterFun.includes(funName)) {
+        if (!isFillFun(funName)) {
           continue;
         }
 
@@ -330,6 +337,9 @@ export async function fetchDataToJsonFile(args) {
           let data = await getData[funName](language);
           await checkData(data, language, funName);
           if (Array.isArray(data)) {
+            await fse.remove(
+              paths.resolveRoot("jsonData", language, ...jsonFilePath.slice(0, -1))
+            );
             await async.eachLimit(data, 12, async (item, index) => {
               let lastJsonFilePath;
               if (item.page_name) {

package/lib/imagemin.js

@@ -74,6 +74,11 @@ export async function compressImages(inputPath, quality = 0.7) {
       return acc;
     }, {});
     
+    // 统计所有图片压缩前后的总大小
+    let totalAllOriginalSize = 0;
+    let totalAllCompressedSize = 0;
+    let totalProcessedFiles = 0;
+    
     // 处理每个目录中的图片
     for (const [dir, files] of Object.entries(filesByDir)) {
       const relativeDir = path.relative(stats.isFile() ? path.dirname(targetPath) : targetPath, dir);
@@ -94,7 +99,8 @@ export async function compressImages(inputPath, quality = 0.7) {
         continue;
       }
       
-      console.log(`处理目录: ${relativeDir || '.'}`);
+      // 显示当前处理的目录的绝对路径
+      console.log(`处理目录: ${dir}`);
       
       // 压缩图片
       await imagemin(validFiles, {
@@ -133,7 +139,10 @@ export async function compressImages(inputPath, quality = 0.7) {
         if (originalSize > 0 && compressedSize > 0) {
           totalOriginalSize += originalSize;
           totalCompressedSize += compressedSize;
+          totalAllOriginalSize += originalSize;
+          totalAllCompressedSize += compressedSize;
           processedFiles++;
+          totalProcessedFiles++;
           
           const savingPercent = ((originalSize - compressedSize) / originalSize * 100).toFixed(2);
           console.log(`  ${path.basename(file)}: ${formatBytes(originalSize)} → ${formatBytes(compressedSize)} (节省 ${savingPercent}%)`);
@@ -149,6 +158,14 @@ export async function compressImages(inputPath, quality = 0.7) {
     
     const endTime = Date.now();
     console.log(`图片压缩完成，共处理 ${imageFiles.length} 个文件，耗时 ${(endTime - startTime) / 1000} 秒`);
+    
+    // 输出所有图片的总体压缩情况
+    if (totalProcessedFiles > 0) {
+      const totalAllSavingPercent = ((totalAllOriginalSize - totalAllCompressedSize) / totalAllOriginalSize * 100).toFixed(2);
+      const savedSize = formatBytes(Math.abs(totalAllOriginalSize - totalAllCompressedSize));
+      console.log(`总体压缩情况: ${formatBytes(totalAllOriginalSize)} → ${formatBytes(totalAllCompressedSize)}`);
+      console.log(`共节省: ${savedSize} (${totalAllSavingPercent}%)`);
+    }
   } catch (error) {
     console.error('图片压缩失败:', error);
     throw error;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "pug-site-core",
-  "version": "2.0.14",
+  "version": "2.0.16",
   "main": "index.js",
   "type": "module",
   "scripts": {
-    "dev": "nodemon --ext js --ignore node_modules/ --ignore template/ index.js",
+    "dev": "nodemon --ignore jsonData/ --ignore node_modules/ --ignore template/ --ext js index.js",
     "getData": "node index.js",
     "getFun": "node index.js",
     "compileFn": "node index.js",
@@ -45,7 +45,7 @@
     "imagemin-svgo": "^10.0.1"
   },
   "license": "ISC",
-  "description": "图片压缩模块导出问题",
+  "description": "修复带getData排除函数参数时无法删掉以前json文件问题、优化代码",
   "files": [
     "lib/",
     "index.js"