From d0471190764e98e35da546eba8de7b2d0e25722b Mon Sep 17 00:00:00 2001 From: muwoo <2424880409@qq.com> Date: Thu, 9 Sep 2021 11:21:19 +0800 Subject: [PATCH] =?UTF-8?q?ref:=20=E4=BC=98=E5=8C=96window=E8=AF=BB?= =?UTF-8?q?=E5=8F=96=E7=B3=BB=E7=BB=9F=E5=BA=94=E7=94=A8icon=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- src/renderer/assets/common/win-app.js | 20 ++++++++------------ 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 9aec926..ef3a988 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rubick2", - "version": "0.0.3-beta.14", + "version": "0.0.4", "author": "muwoo <2424880409@qq.com>", "description": "An electron-vue project", "license": null, @@ -69,7 +69,7 @@ "download-git-repo": "^3.0.2", "electron-is-dev": "^2.0.0", "electron-store": "^8.0.0", - "file-icon-info": "^1.1.1", + "extract-file-icon": "^0.3.2", "iohook": "^0.9.3", "is-chinese": "^1.4.2", "jian-pinyin": "^0.2.3", diff --git a/src/renderer/assets/common/win-app.js b/src/renderer/assets/common/win-app.js index 7fb7661..07c76d9 100644 --- a/src/renderer/assets/common/win-app.js +++ b/src/renderer/assets/common/win-app.js @@ -3,8 +3,7 @@ import path from 'path'; import os from 'os'; import translate from './translate'; import {shell} from 'electron'; - -const fii = require('file-icon-info'); +const fileIcon = require('extract-file-icon'); const filePath = path.resolve('C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs'); const fileLists = []; @@ -15,16 +14,13 @@ const exists = fs.existsSync(icondir); if (!exists) { fs.mkdirSync(icondir) } const getico = app =>{ - fii.getIcon(app.desc, data => { - let iconpath = path.join(icondir, `${app.name}.png`) - fs.exists(iconpath, exists => { - if (!exists) { - fs.writeFile(iconpath, data, 'base64', err => { - if (err) { console.log(err); } - }) - } - }); - }); + try { + const buffer = fileIcon(app.desc, 32); + const iconpath = path.join(icondir, `${app.name}.png`); + fs.writeFileSync(iconpath, buffer, 'base64'); + } catch(e) { + console.log(e, app.desc); + } } function fileDisplay(filePath){