From 5ccc2a3b161a3e81475c1818c3ed3758d4c2f760 Mon Sep 17 00:00:00 2001 From: meetqy Date: Fri, 17 Mar 2023 15:57:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20nsfw=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E5=92=8C=E6=97=B6=E9=97=B4=E5=88=A4=E6=96=AD=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/transform-eagle/example/index.ts | 2 +- packages/transform-eagle/lib/image/index.ts | 20 +++++++++++--------- pnpm-lock.yaml | 2 ++ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/packages/transform-eagle/example/index.ts b/packages/transform-eagle/example/index.ts index 7eed3f37..728beb7c 100644 --- a/packages/transform-eagle/example/index.ts +++ b/packages/transform-eagle/example/index.ts @@ -1,5 +1,5 @@ import TransfromEagle from "../lib"; TransfromEagle({ - library: "/Users/qymeet/Pictures/rao.library", + library: "/Users/qymeet/Pictures/test.library", plugin_nsfw: true, }); diff --git a/packages/transform-eagle/lib/image/index.ts b/packages/transform-eagle/lib/image/index.ts index be460346..b4691dc9 100644 --- a/packages/transform-eagle/lib/image/index.ts +++ b/packages/transform-eagle/lib/image/index.ts @@ -186,18 +186,20 @@ const handleImage = async () => { }, }); - // nsfw检测 - if (!image || !image.nsfw) { - // 不支持的扩展名 直接删除并跳过后续执行 - if (supportNSFWExt.includes(metadata.ext.toLocaleLowerCase())) { - metadata = await getNSFWMetadata(metadata, file); - } - } - - const data = getPrismaParams({ ...metadata, metadataMTime: mtime }, image); + let data = getPrismaParams({ ...metadata, metadataMTime: mtime }, image); // 新增 if (!image) { + // nsfw检测 + if (!image || !image.nsfw) { + // 不支持的扩展名 直接删除并跳过后续执行 + if (supportNSFWExt.includes(metadata.ext.toLocaleLowerCase())) { + metadata = await getNSFWMetadata(metadata, file); + } + + data = getPrismaParams({ ...metadata, metadataMTime: mtime }, image); + } + // 使用upsert // 针对: 添加的图片,已经存在当前library中, // Eagle 会弹窗提示是否使用已存在的场景 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8a68c9d6..7124c19a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -98,6 +98,7 @@ importers: packages/prisma-client: specifiers: + '@eagleuse/utils': workspace:* '@prisma/client': ^4.10.1 '@types/lodash': ^4.14.191 '@types/node': ^18.14.6 @@ -105,6 +106,7 @@ importers: lodash: ^4.17.21 prisma: ^4.10.1 dependencies: + '@eagleuse/utils': link:../utils '@prisma/client': 4.10.1_prisma@4.10.1 chokidar: 3.5.3 lodash: 4.17.21