progress on command line client

2 files changed, 26 insertions, 11 deletions

diff --git a/bin/ascii-logo.txt b/bin/ascii-logo.txt
new file mode 100644
index 0000000..cb2f440
--- /dev/null
+++ b/bin/ascii-logo.txt
@@ -0,0 +1,5 @@
+               _     _                            _
+ __      _____| |__ | |_ ___  _ __ _ __ ___ _ __ | |_
+ \ \ /\ / / _ \ '_ \| __/ _ \| '__| '__/ _ \ '_ \| __|
+  \ V  V /  __/ |_) | || (_) | |  | | |  __/ | | | |_
+   \_/\_/ \___|_.__/ \__\___/|_|  |_|  \___|_| |_|\__|
diff --git a/bin/cmd.js b/bin/cmd.js
index 1137fc7..6736a52 100755
--- a/bin/cmd.js
+++ b/bin/cmd.js
@@ -2,50 +2,60 @@
 
 // TODO: add terminal UI
 
+var clivas = require('clivas')
 var cp = require('child_process')
+var fs = require('fs')
 var minimist = require('minimist')
 var os = require('os')
+var path = require('path')
 var WebTorrent = require('../')
 
 var TMP = os.tmp
 
 function usage () {
+  console.log(fs.readFileSync(path.join(__dirname, 'ascii-logo.txt'), 'utf8'))
   console.log('Usage: webtorrent [magnet/torrent url] {OPTIONS}')
   console.log('')
   console.log('Options:')
-  console.log('  -p, --port       change the http port')
-  console.log('  -v, --vlc        autoplay in VLC')
-  console.log('  -t, --subtitles  load subtitles file ')
+  console.log('  --vlc            autoplay in vlc')
+  console.log('  --mplayer        autoplay in mplayer')
+  console.log('  --omx [jack]     autoplay in omx')
   console.log('')
-  console.log('  -h, --help  display this help message')
-  console.log('  --version   print the current version')
+  console.log('  -p, --port       change the http port                  [default: 9000]')
+  console.log('  -l, --list       list available files in the torrent')
+  console.log('  -t, --subtitles  load subtitles file')
+  console.log('  -h, --help       display this help message')
+  console.log('  -v, --version    print the current version')
   console.log('')
 }
 
 var argv = minimist(process.argv.slice(2))
+
 var url = argv._[0]
-var port = Number(argv.port || argv.p) || 9999
-var useVLC = !!(argv.vlc || argv.v)
-var subtitles = argv.subtitles || argv.t
+
+var port = Number(argv.port || argv.p) || 9000
 var list = argv.list || argv.l
+var subtitles = argv.subtitles || argv.t
 
 if (argv.help || argv.h) {
   usage()
   process.exit(0)
 }
 
-if (argv.version) {
+if (argv.version || argv.v) {
   console.log(require('../package.json').version)
   process.exit(0)
 }
 
 if (!url) {
   usage()
-  process.exit(1)
+  process.exit(0)
 }
 
 var VLC_ARGS = '-q --video-on-top --play-and-exit'
-var OMX_EXEC = argv.jack ? 'omxplayer -r -o local ' : 'omxplayer -r -o hdmi '
+var OMX_EXEC = 'omxplayer -r -o ' + (typeof argv.omx === 'string')
+  ? arg.omx + ' '
+  : 'hdmi '
 var MPLAYER_EXEC = 'mplayer -ontop -really-quiet -noidx -loop 0 '
 
 if (subtitles) {