feat: allow script arguments (#176)

* fix: playerArgs.smplayer typo * fix: chromecast logic * feat: allow script arguments Co-authored-by: Diego Rodríguez Baquero <[email protected]>
webtorrent · Jul 14, 2021 · e6228ab · e6228ab
1 parent 310f04f
commit e6228ab
Showing 1 changed file with 12 additions and 18 deletions.
diff --git a/bin/cmd.js b/bin/cmd.js
@@ -199,13 +199,11 @@ function init (_argv) {
   }
 
   if (argv.onDone) {
-    checkPermission(argv.onDone)
-    argv.onDone = argv['on-done'] = fs.realpathSync(argv.onDone)
+    argv.onDone = argv['on-done'] = argv.onDone.split(' ')
   }
 
   if (argv.onExit) {
-    checkPermission(argv.onExit)
-    argv.onExit = argv['on-exit'] = fs.realpathSync(argv.onExit)
+    argv.onExit = argv['on-exit'] = argv.onExit.split(' ')
   }
 
   if (playerName && argv.playerArgs) {
@@ -319,8 +317,11 @@ function runDownload (torrentId) {
 
       console.log(chalk`\ntorrent downloaded {green successfully} from {bold ${numActiveWires}/${torrent.numPeers}} {green peers} in {bold ${getRuntime()}s}!`)
     }
-    if (argv['on-done']) {
-      cp.exec(argv['on-done']).unref()
+    if (argv.onDone) {
+      cp.spawn(argv.onDone[0], argv.onDone.slice(1), { shell: true } )
+      .on('error', (err) => fatalError(err))
+      .stderr.on('data', (err) => fatalError(err))
+      .unref()
     }
     if (!playerName && !serving && argv.out && !argv['keep-seeding']) {
       torrent.destroy()
@@ -763,8 +764,11 @@ function gracefulExit () {
 
   clearInterval(drawInterval)
 
-  if (argv['on-exit']) {
-    cp.exec(argv['on-exit']).unref()
+  if (argv.onExit) {
+    cp.spawn(argv.onExit[0], argv.onExit.slice(1), { shell: true } )
+    .on('error', (err) => fatalError(err))
+    .stderr.on('data', (err) => fatalError(err))
+    .unref()
   }
 
   client.destroy(err => {
@@ -779,16 +783,6 @@ function gracefulExit () {
   })
 }
 
-function checkPermission (filename) {
-  try {
-    if (!executable.sync(filename)) {
-      return errorAndExit(`Script "${filename}" is not executable`)
-    }
-  } catch (err) {
-    return errorAndExit(`Script "${filename}" does not exist`)
-  }
-}
-
 function enableQuiet () {
   argv.quiet = argv.q = true
 }