Reverted f158146

Signed-off-by: Vincent Frentzel <vincent@frentzel.eu>

bin/cmd.js

@@ -263,7 +263,7 @@ function runCreate (input) {
   })
 }
 
-var client, href, playerName, server
+var client, href, playerName, server, serving
 
 function runDownload (torrentId) {
   if (!argv.out && !argv.stdout && !playerName) {
@@ -306,7 +306,22 @@ function runDownload (torrentId) {
     )
   })
 
-  torrent.on('done', torrentDone)
+  torrent.on('done', function () {
+    if (!argv.quiet) {
+      var numActiveWires = torrent.swarm.wires.reduce(function (num, wire) {
+        return num + (wire.downloaded > 0)
+      }, 0)
+      clivas.line('')
+      clivas.line(
+        'torrent downloaded {green:successfully} from {bold:%s/%s} {green:peers} ' +
+        'in {bold:%ss}!',
+        numActiveWires,
+        torrent.numPeers,
+        getRuntime()
+      )
+    }
+    torrentDone()
+  })
 
   // Start http server
   server = torrent.createServer()
@@ -327,6 +342,10 @@ function runDownload (torrentId) {
       }
     })
 
+  server.once('connection', function () {
+    serving = true
+  })
+
   function onReady () {
     // if no index specified, use largest file
     var index = (typeof argv.index === 'number')
@@ -592,7 +611,7 @@ function drawTorrent (torrent) {
 
 function torrentDone () {
   if (argv['on-done']) cp.exec(argv['on-done']).unref()
-  if (argv['exit']) gracefulExit()
+  if (argv['exit'] && !playerName && !serving && argv.out) gracefulExit()
 }
 
 function fatalError (err) {