Merge branch 'master' of github.com:edamameldn/tape-cli

* 'master' of github.com:edamameldn/tape-cli:
  Fix windows gifs + non-TTY shells (#57)

Author: dac09

src/commands/video.ts

@@ -60,10 +60,6 @@ export default class Video extends GithubIssueOnErrorCommand {
 
     const video = new VideoKlass({ device, verbose: flags.debug })
     video.record()
-    cli.action.start(
-      ' 🎬 Recording started. Press SPACE to save or ESC to abort.'
-    )
-
     const success = await waitForKeys('space', 'escape')
 
     cli.action.start(' 📼 Processing your tape')

src/helpers/keyboard.ts

@@ -1,3 +1,4 @@
+import cli from 'cli-ux'
 const readline = require('readline')
 
 // TODO these should be arrays..maybeh?
@@ -12,7 +13,18 @@ export const waitForKeys = (
     })
 
     readline.emitKeypressEvents(rl.input)
-    rl.input.setRawMode(true)
+
+    if (process.stdin.isTTY) {
+      rl.input.setRawMode(true)
+      cli.action.start(
+        ' 🎬 Recording started. Press SPACE to save or ESC to abort.'
+      )
+    } else {
+      cli.action.start(
+        ' 🎬 Recording started. Press Ctrl + C to save.'
+      )
+      process.on('SIGINT', function() { resolve(true) })
+    }
 
     process.stdin.on('keypress', (str, key) => {
       // console.log({ str, key })

src/services/ffmpeg.service.ts

@@ -88,20 +88,13 @@ export const makeGif = async (
   if (frameOptions) {
     const intermediary = `${os.tmpdir()}/intermediary.mov`
     const { extraInputs, complexFilter } = decodeFrameOptions(frameOptions)
-    await exec(
-      `
-      ${getFfmpegBin()} -i "${inputVideoFile}" ${extraInputs} -vcodec prores_ks -pix_fmt yuva444p10le -profile:v 4444 -q:v 23 -preset fastest ${complexFilter} -y ${intermediary} &&
-      ${getFfmpegBin()} -i "${intermediary}" -vf "${gifFilters},palettegen=stats_mode=diff:max_colors=${maxColors}" -y ${palette} &&
-      ${getFfmpegBin()} -i "${intermediary}" -i "${palette}" -lavfi "${gifFilters},paletteuse=dither=${dither}" -y "${outputFile}.gif"
-      `
-    )
+    await exec(`${getFfmpegBin()} -i "${inputVideoFile}" ${extraInputs} -vcodec prores_ks -pix_fmt yuva444p10le -profile:v 4444 -q:v 23 -preset fastest ${complexFilter} -y ${intermediary}`)
+    await exec(`${getFfmpegBin()} -i "${intermediary}" -vf "${gifFilters},palettegen=stats_mode=diff:max_colors=${maxColors}" -y ${palette}`)
+    await exec(`${getFfmpegBin()} -i "${intermediary}" -i "${palette}" -lavfi "${gifFilters},paletteuse=dither=${dither}" -y "${outputFile}.gif"`)
+
   } else {
-    await exec(
-      `
-      ${getFfmpegBin()} -i "${inputVideoFile}" -vf "${gifFilters},palettegen=stats_mode=diff:max_colors=${maxColors}" -y ${palette} &&
-      ${getFfmpegBin()} -i "${inputVideoFile}" -i "${palette}" -lavfi "${gifFilters},paletteuse=dither=${dither}" -y "${outputFile}.gif"
-      `
-    )
+    await exec(`${getFfmpegBin()} -i "${inputVideoFile}" -vf "${gifFilters},palettegen=stats_mode=diff:max_colors=${maxColors}" -y ${palette}`)
+    await exec(`${getFfmpegBin()} -i "${inputVideoFile}" -i "${palette}" -lavfi "${gifFilters},paletteuse=dither=${dither}" -y "${outputFile}.gif"`)
   }
 
   return `${outputFile}.gif`