From bd088b9d332ade02f8d6fb9742bd6d3f24f2d587 Mon Sep 17 00:00:00 2001 From: Mike Fix Date: Fri, 24 Feb 2017 19:53:42 -0600 Subject: [PATCH] Add file name adjustments (noneditable). Need to compose it --- src/api.js | 5 ++--- src/components/Converter.jsx | 12 +++++++----- src/helpers/util.js | 22 ++++++++++++++++++++++ 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/src/api.js b/src/api.js index a6898b8..483b2d2 100644 --- a/src/api.js +++ b/src/api.js @@ -1,6 +1,5 @@ const execS = require('child_process').exec - -const { replaceSpaceCharacters, concatFiles } = require('./helpers/util') +const { replaceSpaceCharacters, createOutputFileName } = require('./helpers/util') const convert = ({ files, outputPath, outputType, name }) => { // eslint-disable-next-line dot-notation @@ -10,7 +9,7 @@ const convert = ({ files, outputPath, outputType, name }) => { execS('which convert', (error) => { if (error) reject(error) - const outputName = name || `ALCHEMY-${concatFiles(files)}.${outputType || 'pdf'}` + const outputName = name || createOutputFileName({ files, outputType }) const command = [ 'convert', ...files.map(replaceSpaceCharacters), // input files diff --git a/src/components/Converter.jsx b/src/components/Converter.jsx index 5608afe..6e8901d 100644 --- a/src/components/Converter.jsx +++ b/src/components/Converter.jsx @@ -12,7 +12,7 @@ import ArrowDown from './svg/ArrowDown' import Cancel from './svg/Cancel' import { convert } from '../api' -import { removeByKey, uniqueFiles } from '../helpers/util' +import { removeByKey, uniqueFiles, displayOutputFileName, filterImages } from '../helpers/util' import { fileTypes, MERGE, @@ -123,7 +123,11 @@ class Sanitizer extends Component { case CONVERTING: return case STAGING: return (
- + {/* TODO make this compose better */} +