summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2018-04-17 11:49:06 +0200
committerJules Laplace <julescarbon@gmail.com>2018-04-17 11:49:06 +0200
commit41661dffb0980b92479533e616eed2b43859ec62 (patch)
treeea71ff99ff9465f040a256cda3e82287a60f087f
parentcd7eba6fba6dccfe619d321e937f2193a639f405 (diff)
filename
-rw-r--r--lib/worker/processFiles.js4
-rw-r--r--lib/worker/processTasks.js5
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/worker/processFiles.js b/lib/worker/processFiles.js
index 9073d63..2b89aea 100644
--- a/lib/worker/processFiles.js
+++ b/lib/worker/processFiles.js
@@ -99,7 +99,7 @@ function convertToAiff(fullPath) {
console.log('convert to aiff')
const aiffPath = fullPath + '.aiff'
execFile(process.env.FFMPEG_BINARY, ['-y', '-i', fullPath, '-acodec', 'pcm_s16le', '-ar', '44100', aiffPath], (err, stdout, stderr) => {
- console.log(stdout, stderr)
+ // console.log(stdout, stderr)
resolve()
})
})
@@ -112,7 +112,7 @@ function convertToMp3(fullPath) {
}
const mp3Path = fullPath + '.mp3'
execFile(process.env.FFMPEG_BINARY, ['-y', '-i', fullPath, '-q:a', '6', mp3Path], (err, stdout, stderr) => {
- console.log(stdout, stderr)
+ // console.log(stdout, stderr)
resolve()
})
})
diff --git a/lib/worker/processTasks.js b/lib/worker/processTasks.js
index 16d4efa..00e0d2e 100644
--- a/lib/worker/processTasks.js
+++ b/lib/worker/processTasks.js
@@ -63,7 +63,10 @@ function initTask(task) {
ipc.of.cortex && ipc.of.cortex.emit("updateTask", { task })
db.models.folder.findOrCreate({ name: 'output' })
.then( (folder) => {
- var fn = task.content_file.substr(0,12) + '_' + task.style_file.substr(0,12)
+ function fpart (s) {
+ return (s.split('.')[0] || 'output').substr(0,12)
+ }
+ var fn = fpart(task.content_file.name) + '_' fpart(task.style_file.name)
task.output_file = {
type: 'audio',
name: fn + '_' + Date.now() + '.aiff',