@wahaha216/koishi-plugin-jmcomic 0.2.2 → 0.2.4

package/lib/index.js

@@ -135,11 +135,15 @@ function fileSizeAsync(path) {
 }
 __name(fileSizeAsync, "fileSizeAsync");
 function sanitizeFileName(fileName) {
-  const forbiddenChars = /[<>:"/\\|?*]/g;
-  fileName = fileName.replace(forbiddenChars, "_");
-  fileName = fileName.replace(/\s+/g, "_");
-  fileName = fileName.replace(/[. ]+$/, "");
-  return fileName;
+  const forbiddenAndShellSpecialChars = /[<>:"/\\|?*()[\]{}!#$&;'`~]/g;
+  let sanitizedFileName = fileName.replace(forbiddenAndShellSpecialChars, "_");
+  sanitizedFileName = sanitizedFileName.replace(/\s+/g, "_");
+  sanitizedFileName = sanitizedFileName.replace(/_+/g, "_");
+  sanitizedFileName = sanitizedFileName.replace(/^[._]+|[._]+$/g, "");
+  if (sanitizedFileName.trim() === "") {
+    return "untitled_document";
+  }
+  return sanitizedFileName;
 }
 __name(sanitizeFileName, "sanitizeFileName");
 async function limitPromiseAll(promises, limit) {
@@ -988,8 +992,8 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
   async photoToPdf(photo, pdfName, type = "photo", albumId = "", single = false, password) {
     const images = photo.getImages();
     const id = photo.getId();
-    if (this.config.debug) this.logger.info(`开始生成PDF ${pdfName}.pdf`);
     pdfName = sanitizeFileName(pdfName);
+    if (this.config.debug) this.logger.info(`开始生成PDF ${pdfName}.pdf`);
     let path = (0, import_path2.join)(this.root, type, `${id}`);
     if (type === "album") {
       path = (0, import_path2.join)(this.root, type, `${albumId}`);
@@ -1041,34 +1045,38 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
     const id = album.getId();
     const series = album.getSeries();
     const zipName = sanitizeFileName(album.getName());
-    const path = `${this.root}/album/${id}`;
+    if (this.config.debug) this.logger.info(`开始生成ZIP ${zipName}.zip`);
+    const path = (0, import_path2.join)(this.root, "album", `${id}`);
     const directorys = [];
     if (series.length > 1) {
       for (const s of series) {
         directorys.push({
-          directory: `${path}/decoded/${s.id}`,
+          directory: (0, import_path2.join)(path, "decoded", s.id),
           destpath: `第${s.sort}章`
         });
       }
     } else {
-      directorys.push({ directory: `${path}/decoded`, destpath: false });
+      directorys.push({ directory: (0, import_path2.join)(path, "decoded"), destpath: false });
     }
-    await archiverImage(directorys, `${path}/${zipName}.zip`, password, level);
+    const zipPath = (0, import_path2.join)(path, `${zipName}.zip`);
+    await archiverImage(directorys, zipPath, password, level);
     if (this.config.debug) this.logger.info(`ZIP ${zipName}.zip 生成完成`);
-    return `${path}/${zipName}.zip`;
+    return zipPath;
   }
   async photoToZip(photo, zipName, password, level = 6) {
     const id = photo.getId();
     zipName = sanitizeFileName(zipName);
-    const path = `${this.root}/photo/${id}`;
+    if (this.config.debug) this.logger.info(`开始生成ZIP ${zipName}.zip`);
+    const path = (0, import_path2.join)(this.root, "photo", `${id}`);
+    const zipPath = (0, import_path2.join)(path, `${zipName}.zip`);
     await archiverImage(
-      [{ directory: `${path}/decoded`, destpath: false }],
-      `${path}/${zipName}.zip`,
+      [{ directory: (0, import_path2.join)(path, "decoded"), destpath: false }],
+      zipPath,
       password,
       level
     );
     if (this.config.debug) this.logger.info(`ZIP ${zipName}.zip 生成完成`);
-    return `${path}/${zipName}.zip`;
+    return zipPath;
   }
   /**
    * 获取时间戳

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wahaha216/koishi-plugin-jmcomic",
   "description": "下载JM本子，无需python。支持pdf、zip加密。",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/readme.md

@@ -17,6 +17,22 @@ jm queue
 
 ## 更新日志
 
+<details>
+<summary>0.2.4</summary>
+
+1. 调整debug日志
+2. 修正文化名返回值
+
+</details>
+
+<details>
+<summary>0.2.3</summary>
+
+1. 将手动路径拼接替换为join
+2. 健壮文件名序列化，尝试修复部分文件名导致无法创建文件
+
+</details>
+
 <details>
 <summary>0.2.2</summary>