From 893a92c87b61c0795d340d03786da75190c82035 Mon Sep 17 00:00:00 2001 From: asmsuechan Date: Sun, 19 Mar 2017 12:34:31 -0700 Subject: [PATCH] Fix from reviews --- browser/main/lib/dataApi/copyImage.js | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/browser/main/lib/dataApi/copyImage.js b/browser/main/lib/dataApi/copyImage.js index 75e2f4a4..8c6f1787 100644 --- a/browser/main/lib/dataApi/copyImage.js +++ b/browser/main/lib/dataApi/copyImage.js @@ -10,29 +10,20 @@ const sander = require('sander') * @return {String} an image path */ function copyImage (filePath, storageKey) { - const targetStorage = (() => { + return new Promise((resolve, reject) => { try { const cachedStorageList = JSON.parse(localStorage.getItem('storages')) if (!_.isArray(cachedStorageList)) throw new Error('Target storage doesn\'t exist.') - const storage = _.find(cachedStorageList, {key: storageKey}) - if (storage == null) throw new Error('Target storage doesn\'t exist.') - return storage - } catch (e) { - return Promise.reject(e) - } - })() + if (storage === undefined) throw new Error('Target storage doesn\'t exist.') + const targetStorage = storage - return new Promise((resolve, reject) => { - try { const inputImage = fs.createReadStream(filePath) const imageName = path.basename(filePath) - sander.mkdirSync(`${targetStorage.path}/images`) const outputImage = fs.createWriteStream(path.join(targetStorage.path, 'images', imageName)) inputImage.pipe(outputImage) resolve(`${encodeURI(targetStorage.path)}/images/${encodeURI(imageName)}`) - } - catch(e) { + } catch (e) { return reject(e) } })