study/uTools-quickcommand
1
0
Fork 0
mirror of https://github.com/fofolee/uTools-quickcommand.git synced 2025-06-07 13:34:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

jschardet判断编码，增加 hostname 判断

Browse Source
This commit is contained in:
fofolee 2019-06-11 17:04:16 +08:00
parent 6a4cd2f9c8
commit a2bb06eea2
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
preload.js
View File

@ -4,6 +4,7 @@ const { spawn, exec } = require("child_process")
const iconv = require('iconv-lite')
const { clipboard } = require('electron')
const robot = require('./robotjs')
const jschardet = require("jschardet")
//-------checkUpdate------
const path = require("path")
@ -144,6 +145,12 @@ special = async cmd => {
cmd = cmd.replace(/\{\{isWin\}\}/mg, repl)
}
// 获取电脑名
if (cmd.includes('{{HostName}}')) {
let repl = os.hostname();
cmd = cmd.replace(/\{\{HostName\}\}/mg, repl)
}
// 获取资源管理器或访达当前目录
if (cmd.includes('{{pwd}}')) {
let repl = await pwd();
@ -193,12 +200,11 @@ run = async (cmd, option, codec, callback) => {
}
var chunks = [],
err_chunks = [];
codec = isWin ? codec : 'utf8';
child.stdout.on('data', chunk => {
chunks.push(iconv.decode(chunk, codec))
chunks.push(iconv.decode(chunk, jschardet.detect(chunk).encoding))
})
child.stderr.on('data', err_chunk => {
err_chunks.push(iconv.decode(err_chunk, codec))
err_chunks.push(iconv.decode(err_chunk, jschardet.detect(err_chunk).encoding))
})
child.on('close', code => {
let stdout = chunks.join("");