Skip to content

Commit c9a6d99

Browse files
chore: refactor
1 parent ce54fab commit c9a6d99

File tree

8 files changed

+26
-27
lines changed

8 files changed

+26
-27
lines changed

Diff for: bin/ffmpeg-concat

-5
This file was deleted.

Diff for: index.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
"use strict";
2-
module.exports = require('./lib');
1+
'use strict'
2+
3+
module.exports = require('./lib')

Diff for: lib/cli.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#!/usr/bin/env node
22
'use strict'
33

4-
const concat = require('.')
54
const fs = require('fs')
65
const program = require('commander')
6+
7+
const concat = require('.')
78
const { version } = require('../package')
89

910
module.exports = async (argv) => {
@@ -60,3 +61,5 @@ module.exports = async (argv) => {
6061
throw err
6162
}
6263
}
64+
65+
module.exports(process.argv)

Diff for: lib/index.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ module.exports = async (opts) => {
3333

3434
const temp = tempDir || tempy.directory()
3535

36-
console.time(`ffmpeg-concat`)
36+
console.time('ffmpeg-concat')
3737

3838
try {
39-
console.time(`init-frames`)
39+
console.time('init-frames')
4040
const {
4141
frames,
4242
scenes,
@@ -52,9 +52,9 @@ module.exports = async (opts) => {
5252
renderAudio: !audio,
5353
verbose
5454
})
55-
console.timeEnd(`init-frames`)
55+
console.timeEnd('init-frames')
5656

57-
console.time(`render-frames`)
57+
console.time('render-frames')
5858
const framePattern = await renderFrames({
5959
log,
6060
concurrency,
@@ -66,9 +66,9 @@ module.exports = async (opts) => {
6666
log(`render ${(100 * p).toFixed()}%`)
6767
}
6868
})
69-
console.timeEnd(`render-frames`)
69+
console.timeEnd('render-frames')
7070

71-
console.time(`render-audio`)
71+
console.time('render-audio')
7272
let concatAudioFile = audio
7373
if (!audio && scenes.filter(s => s.sourceAudioPath).length === scenes.length) {
7474
concatAudioFile = await renderAudio({
@@ -78,9 +78,9 @@ module.exports = async (opts) => {
7878
fileName: 'audioConcat.mp3'
7979
})
8080
}
81-
console.timeEnd(`render-audio`)
81+
console.timeEnd('render-audio')
8282

83-
console.time(`transcode-video`)
83+
console.time('transcode-video')
8484
await transcodeVideo({
8585
args,
8686
log,
@@ -94,19 +94,19 @@ module.exports = async (opts) => {
9494
log(`transcode ${(100 * p).toFixed()}%`)
9595
}
9696
})
97-
console.timeEnd(`transcode-video`)
97+
console.timeEnd('transcode-video')
9898
} catch (err) {
9999
if (cleanupFrames) {
100100
await rmfr(temp)
101101
}
102102

103-
console.timeEnd(`ffmpeg-concat`)
103+
console.timeEnd('ffmpeg-concat')
104104
throw err
105105
}
106106

107107
if (cleanupFrames && !tempDir) {
108108
await rmfr(temp)
109109
}
110110

111-
console.timeEnd(`ffmpeg-concat`)
111+
console.timeEnd('ffmpeg-concat')
112112
}

Diff for: lib/index.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const tempy = require('tempy')
88

99
const concat = require('.')
1010

11-
const fixturesPath = path.join(__dirname, '..', `media`)
11+
const fixturesPath = path.join(__dirname, '..', 'media')
1212
const videos = [
1313
path.join(fixturesPath, '0.mp4'),
1414
path.join(fixturesPath, '1.mp4'),

Diff for: lib/transcode-video.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ module.exports = async (opts) => {
5656
])
5757

5858
// audio
59-
.concat(!audio ? [ ] : [
59+
.concat(!audio ? [] : [
6060
'-c:a', 'copy',
6161
'-shortest'
6262
])

Diff for: lib/transition.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module.exports = (opts) => {
1414
} = opts
1515

1616
const buffer = createBuffer(gl,
17-
[ -1, -1, -1, 4, 4, -1 ],
17+
[-1, -1, -1, 4, 4, -1],
1818
gl.ARRAY_BUFFER,
1919
gl.STATIC_DRAW
2020
)

Diff for: package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
"name": "ffmpeg-concat",
33
"version": "1.1.0",
44
"description": "Concats a list of videos together using ffmpeg with sexy OpenGL transitions.",
5-
"main": "index.js",
65
"repository": "transitive-bullshit/ffmpeg-concat",
76
"author": "Travis Fischer <[email protected]>",
87
"license": "MIT",
9-
"scripts": {
10-
"test": "ava -v && standard"
11-
},
8+
"main": "index.js",
129
"bin": {
13-
"ffmpeg-concat": "./bin/ffmperg-concat"
10+
"ffmpeg-concat": "./lib/cli"
1411
},
1512
"engines": {
1613
"node": ">=10.13.0"
1714
},
15+
"scripts": {
16+
"test": "ava -v && standard"
17+
},
1818
"keywords": [
1919
"ffmpeg",
2020
"fluent-ffmpeg",

0 commit comments

Comments
 (0)