Added: support for upload notice & auto rename before upload

This commit is contained in:
Molunerfinn
2018-06-04 20:13:17 +08:00
parent 0b5981a27d
commit 9e2834c0f9
3 changed files with 39 additions and 7 deletions

View File

@@ -32,10 +32,16 @@ const createRenameWindow = () => {
const imgFromPath = async (imgPath) => {
let results = []
let rename = db.read().get('picBed.rename').value()
const rename = db.read().get('picBed.rename').value()
const autoRename = db.read().get('picBed.autoRename').value()
await Promise.all(imgPath.map(async item => {
let name
let fileName = path.basename(item)
let fileName
if (autoRename) {
fileName = fecha.format(new Date(), 'YYYYMMDDHHmmss') + path.extname(item)
} else {
fileName = path.basename(item)
}
if (rename) {
const window = createRenameWindow()
await waitForShow(window.webContents)
@@ -81,22 +87,28 @@ const imgFromClipboard = async (file) => {
const imgFromUploader = async (files) => {
let results = []
let rename = db.read().get('picBed.rename').value()
const rename = db.read().get('picBed.rename').value()
const autoRename = db.read().get('picBed.autoRename').value()
await Promise.all(files.map(async item => {
let name
let fileName
if (autoRename) {
fileName = fecha.format(new Date(), 'YYYYMMDDHHmmss') + path.extname(item.name)
} else {
fileName = path.basename(item.path)
}
if (rename) {
const window = createRenameWindow()
await waitForShow(window.webContents)
window.webContents.send('rename', item.name, window.webContents.id)
window.webContents.send('rename', fileName, window.webContents.id)
name = await waitForRename(window, window.webContents.id)
}
let buffer = await fs.readFile(item.path)
let base64Image = Buffer.from(buffer, 'binary').toString('base64')
let fileName = name || item.name
let imgSize = sizeOf(item.path)
results.push({
base64Image,
fileName,
fileName: name || fileName,
width: imgSize.width,
height: imgSize.height,
extname: path.extname(item.name)

View File

@@ -4,6 +4,7 @@ import tcYunUpload from './tcYunUpload'
import upYunUpload from './upYunUpload'
import githubUpload from './githubUpload'
import db from '../../datastore/index'
import { Notification } from 'electron'
const checkUploader = (type) => {
const currentUploader = db.read().get(`picBed.${type}`).value()
@@ -15,6 +16,11 @@ const checkUploader = (type) => {
}
const uploader = (img, type, webContents) => {
const notification = new Notification({
title: '上传进度',
body: '正在上传'
})
notification.show()
const uploadType = db.read().get('picBed.current').value()
if (checkUploader(uploadType)) {
switch (uploadType) {