Zergling_man/thedesk
Zergling_man/thedesk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix: cannot upload

Browse Source
This commit is contained in:
cutls 2020-05-11 18:42:43 +09:00
parent 783ceec8de
commit c005b546ba
1 changed files with 33 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/main/img.js
View File

@ -6,23 +6,20 @@ function img(mainWindow, dir) {
var ipc = electron.ipcMain var ipc = electron.ipcMain
const BrowserWindow = electron.BrowserWindow const BrowserWindow = electron.BrowserWindow
ipc.on('file-select', (e, args) => { ipc.on('file-select', (e, args) => {
dialog.showOpenDialog( let fileNames = dialog.showOpenDialogSync(mainWindow, {
null,
{
properties: ['openFile', 'multiSelections'], properties: ['openFile', 'multiSelections'],
title: '添付ファイルを選択', title: '添付ファイルを選択',
defaultPath: '.', defaultPath: '.',
filters: [ filters: [
{ {
name: 'メディアファイル', name: 'メディアファイル',
extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg', 'mp4', 'webm'] extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg', 'mp4', 'webm'],
}, },
{ name: '画像', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg'] }, { name: '画像', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg'] },
{ name: '動画', extensions: ['mp4', 'webm'] }, { name: '動画', extensions: ['mp4', 'webm'] },
{ name: '全てのファイル', extensions: ['*'] } { name: '全てのファイル', extensions: ['*'] },
] ],
}, })
fileNames => {
if (!fileNames) { if (!fileNames) {
return false return false
} }
@ -31,8 +28,6 @@ function img(mainWindow, dir) {
var bin = fs.readFileSync(path, 'base64') var bin = fs.readFileSync(path, 'base64')
e.sender.webContents.send('resizeJudgement', [bin, 'new']) e.sender.webContents.send('resizeJudgement', [bin, 'new'])
} }
}
)
}) })
ipc.on('bmp-image', (e, args) => { ipc.on('bmp-image', (e, args) => {
Jimp.read(args[0], function (err, lenna) { Jimp.read(args[0], function (err, lenna) {
@ -65,7 +60,7 @@ function img(mainWindow, dir) {
console.log(text) console.log(text)
Jimp.read(decodedFile, function (err, image) { Jimp.read(decodedFile, function (err, image) {
if (err) throw err if (err) throw err
Jimp.loadFont(Jimp.FONT_SANS_16_BLACK).then(font => { Jimp.loadFont(Jimp.FONT_SANS_16_BLACK).then((font) => {
var evWidth = Jimp.measureText(font, text) var evWidth = Jimp.measureText(font, text)
var width = image.bitmap.width var width = image.bitmap.width
var height = image.bitmap.height var height = image.bitmap.height
@ -79,7 +74,7 @@ function img(mainWindow, dir) {
e.sender.webContents.send('bmp-img-comp', [src, args[1], true]) e.sender.webContents.send('bmp-img-comp', [src, args[1], true])
}) })
} else { } else {
Jimp.loadFont(Jimp.FONT_SANS_16_WHITE).then(font => { Jimp.loadFont(Jimp.FONT_SANS_16_WHITE).then((font) => {
image.print(font, left, top, args[1]).getBase64(Jimp.MIME_PNG, function (err, src) { image.print(font, left, top, args[1]).getBase64(Jimp.MIME_PNG, function (err, src) {
e.sender.webContents.send('bmp-img-comp', [src, args[1], true]) e.sender.webContents.send('bmp-img-comp', [src, args[1], true])
}) })