From 7ccf09ae62cd67fadc2ff1c16b57c40ff1378f08 Mon Sep 17 00:00:00 2001
From: yeyang <746659424@qq.com>
Date: Tue, 7 Feb 2023 13:42:45 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=BD=91=E7=BB=9C=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.js        | 16 ----------------
 model/CPU.js    | 20 +++++++++++++++++++-
 tools/sagiri.js |  2 +-
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/index.js b/index.js
index 2489690..e378178 100644
--- a/index.js
+++ b/index.js
@@ -1,7 +1,6 @@
 import fs from 'node:fs'
 import Ver from './components/Version.js'
 import chalk from 'chalk'
-import { CPU } from './model/index.js'
 const files = fs.readdirSync('./plugins/yenai-plugin/apps').filter(file => file.endsWith('.js'))
 
 let ret = []
@@ -10,21 +9,6 @@ logger.info(chalk.rgb(253, 235, 255)('----ヾ(￣▽￣)Bye~Bye~----'))
 logger.info(chalk.rgb(255, 207, 247)(`椰奶插件${Ver.ver}初始化~`))
 logger.info(chalk.rgb(253, 235, 255)('-------------------------'))
 
-try {
-  CPU.si = await import('systeminformation')
-} catch (error) {
-  if (error.stack?.includes('Cannot find package')) {
-    logger.warn('--------椰奶依赖缺失--------')
-    logger.warn(`yenai-plugin 缺少依赖将无法使用 ${logger.yellow('椰奶状态')}`)
-    logger.warn(`如需使用请运行：${logger.red('pnpm add systeminformation -w')}`)
-    logger.warn('---------------------------')
-    logger.debug(decodeURI(error.stack))
-  } else {
-    logger.error(`椰奶载入依赖错误：${logger.red('systeminformation')}`)
-    logger.error(decodeURI(error.stack))
-  }
-}
-
 files.forEach((file) => {
   ret.push(import(`./apps/${file}`))
 })
diff --git a/model/CPU.js b/model/CPU.js
index 1c185bf..6e9c5af 100644
--- a/model/CPU.js
+++ b/model/CPU.js
@@ -14,8 +14,26 @@ export default new class OSUtils {
     this.init()
   }
 
+  async initDependence () {
+    try {
+      this.si = await import('systeminformation')
+      return this.si
+    } catch (error) {
+      if (error.stack?.includes('Cannot find package')) {
+        logger.warn('--------椰奶依赖缺失--------')
+        logger.warn(`yenai-plugin 缺少依赖将无法使用 ${logger.yellow('椰奶状态')}`)
+        logger.warn(`如需使用请运行：${logger.red('pnpm add systeminformation -w')}`)
+        logger.warn('---------------------------')
+        logger.debug(decodeURI(error.stack))
+      } else {
+        logger.error(`椰奶载入依赖错误：${logger.red('systeminformation')}`)
+        logger.error(decodeURI(error.stack))
+      }
+    }
+  }
+
   async init () {
-    if (!this.si) return
+    if (!await this.initDependence()) return
     // 初始化GPU获取
     if ((await this.si.graphics()).controllers.find(item => item.memoryUsed && item.memoryFree && item.utilizationGpu)) {
       this.isGPU = true
diff --git a/tools/sagiri.js b/tools/sagiri.js
index 5fb6b8b..68cbfe1 100644
--- a/tools/sagiri.js
+++ b/tools/sagiri.js
@@ -9,7 +9,7 @@ const Pixiv = {
   name: 'Pixiv',
   index: 5,
   urlMatcher: /(?:https?:\/\/)?(?:www\.)?pixiv\.net\/member_illust\.php\?mode=.+&illust_id=\d+/i,
-  backupUrl: ({ data: { pixiv_id } }) => `https://www.pixiv.net/member_illust.php?mode=medium&illust_id=${pixiv_id}`,
+  backupUrl: ({ data: { pixiv_id } }) => `https://www.pixiv.net/artworks/${pixiv_id}`,
   authorData: ({ member_id, member_name }) => ({
     authorName: member_name,
     authorUrl: `https://www.pixiv.net/users/${member_id}`