1. fix bug for image filename;

2. support more image type.
Doradx · Sep 6, 2023 · 8ef37dc · 8ef37dc
1 parent 09c2951
commit 8ef37dc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -282190,7 +282190,7 @@ const imageminSvgo = __nccwpck_require__(14038);
 
 async function migrateNotionImageFromURL(ctx, url) {
   // 检查图片是否为notion的图片
-  const urlReg = /^https:\/\/.*?amazonaws\.com\/.+\.(?:jpg|jpeg|png|gif|webp)\?.+/;
+  const urlReg = /^https:\/\/.*?amazonaws\.com\/.+\.(?:jpg|jpeg|bmp|tif|tiff|svg|png|gif|webp)\?.+/;
   if (!urlReg.test(url)) {
     console.log(`Image ${url} is not a notion image, skip`);
     return url;
@@ -282213,11 +282213,11 @@ async function migrateNotionImageFromURL(ctx, url) {
     // 从URL获取图片信息
     let imageItem = await handlePicFromURL(ctx, url);
     // 检查是否需要压缩图片
-    if (ctx.getConfig('compress')) {
+    if (ctx.getConfig('compress') && ext!=='svg') {
       // 压缩图片
       imageItem = await compressPic(imageItem);
     }
-    imageItem.fileName = `${uuid}${ext}`;
+    imageItem.fileName = `${uuid}.${ext}`;
     // 上传图片
     const result = await ctx.upload([imageItem]);
     if (result && result[0] && result[0].imgUrl) {

diff --git a/src/migrateNotionImage.js b/src/migrateNotionImage.js
@@ -23,7 +23,7 @@ const imageminSvgo = require("imagemin-svgo");
 
 async function migrateNotionImageFromURL(ctx, url) {
   // 检查图片是否为notion的图片
-  const urlReg = /^https:\/\/.*?amazonaws\.com\/.+\.(?:jpg|jpeg|png|gif|webp)\?.+/;
+  const urlReg = /^https:\/\/.*?amazonaws\.com\/.+\.(?:jpg|jpeg|bmp|tif|tiff|svg|png|gif|webp)\?.+/;
   if (!urlReg.test(url)) {
     console.log(`Image ${url} is not a notion image, skip`);
     return url;
@@ -46,11 +46,11 @@ async function migrateNotionImageFromURL(ctx, url) {
     // 从URL获取图片信息
     let imageItem = await handlePicFromURL(ctx, url);
     // 检查是否需要压缩图片
-    if (ctx.getConfig('compress')) {
+    if (ctx.getConfig('compress') && ext!=='svg') {
       // 压缩图片
       imageItem = await compressPic(imageItem);
     }
-    imageItem.fileName = `${uuid}${ext}`;
+    imageItem.fileName = `${uuid}.${ext}`;
     // 上传图片
     const result = await ctx.upload([imageItem]);
     if (result && result[0] && result[0].imgUrl) {