mirror of
https://github.com/fofolee/uTools-quickcommand.git
synced 2025-06-09 06:54:11 +08:00
feat: 更详细的报错信息;不压缩图片
This commit is contained in:
parent
2c0d9d1afc
commit
a17e53d24b
@ -558,24 +558,28 @@ runCodeInVm = (cmd, cb, enterData = {}) => {
|
|||||||
cb(null, stderr.toString())
|
cb(null, stderr.toString())
|
||||||
});
|
});
|
||||||
|
|
||||||
|
let liteErr = e => {
|
||||||
|
return e.stack.replace(/([ ] +at.+)|(.+\.js:\d+)/g, '').trim()
|
||||||
|
}
|
||||||
|
|
||||||
// 错误处理
|
// 错误处理
|
||||||
try {
|
try {
|
||||||
vm.run(cmd, path.join(__dirname, 'preload.js'));
|
vm.run(cmd, path.join(__dirname, 'preload.js'));
|
||||||
} catch (error) {
|
} catch (e) {
|
||||||
console.log(error)
|
console.log('Error: ',e)
|
||||||
cb(null, error.toString())
|
cb(null, liteErr(e))
|
||||||
}
|
}
|
||||||
|
|
||||||
let cbUnhandledError = e => {
|
let cbUnhandledError = e => {
|
||||||
removeAllListener()
|
removeAllListener()
|
||||||
console.log(e)
|
console.log('UnhandledError: ', e)
|
||||||
cb(null, e.error.toString())
|
cb(null, liteErr(e.error))
|
||||||
}
|
}
|
||||||
|
|
||||||
let cbUnhandledRejection = e => {
|
let cbUnhandledRejection = e => {
|
||||||
removeAllListener()
|
removeAllListener()
|
||||||
console.log(e)
|
console.log('UnhandledRejection: ',e)
|
||||||
cb(null, e.reason.toString())
|
cb(null, liteErr(e.reason))
|
||||||
}
|
}
|
||||||
|
|
||||||
let removeAllListener = () => {
|
let removeAllListener = () => {
|
||||||
@ -687,11 +691,12 @@ getBase64Ico = async filepath => {
|
|||||||
if (['png', 'jpg', 'jpeg', 'bmp', 'ico', 'gif', 'svg'].includes(ext)) {
|
if (['png', 'jpg', 'jpeg', 'bmp', 'ico', 'gif', 'svg'].includes(ext)) {
|
||||||
if (ext == 'svg') ext = 'svg+xml'
|
if (ext == 'svg') ext = 'svg+xml'
|
||||||
sourceImage = `data:image/${ext};base64,` + fs.readFileSync(filepath, 'base64')
|
sourceImage = `data:image/${ext};base64,` + fs.readFileSync(filepath, 'base64')
|
||||||
|
if (ext == 'png') return sourceImage
|
||||||
} else {
|
} else {
|
||||||
sourceImage = utools.getFileIcon(filepath)
|
sourceImage = utools.getFileIcon(filepath)
|
||||||
|
return sourceImage
|
||||||
}
|
}
|
||||||
let compressedImage = await getCompressedIco(sourceImage)
|
let compressedImage = await getCompressedIco(sourceImage)
|
||||||
if (sourceImage.length < compressedImage.length && ext == 'png') compressedImage = sourceImage
|
|
||||||
return compressedImage
|
return compressedImage
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user