From 9277c3c674256dc2399678d4fbb9cc7f6633c83e Mon Sep 17 00:00:00 2001
From: Jack <jack@lbry.io>
Date: Wed, 6 Jul 2016 03:02:55 -0400
Subject: [PATCH] add help for when things go wrong

---
 lbrynet/lbrynet_daemon/LBRYDaemonCLI.py | 33 ++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/lbrynet/lbrynet_daemon/LBRYDaemonCLI.py b/lbrynet/lbrynet_daemon/LBRYDaemonCLI.py
index 91e7f2068..b146cb1a6 100644
--- a/lbrynet/lbrynet_daemon/LBRYDaemonCLI.py
+++ b/lbrynet/lbrynet_daemon/LBRYDaemonCLI.py
@@ -4,6 +4,13 @@ import json
 from lbrynet.conf import API_CONNECTION_STRING, LOG_FILE_NAME
 from jsonrpc.proxy import JSONRPCProxy
 
+help_msg = "Useage: lbrynet-cli method json-args\n" \
+             + "Examples: " \
+             + "lbrynet-cli resolve_name '{\"name\": \"what\"}'\n" \
+             + "lbrynet-cli get_balance\n" \
+             + "lbrynet-cli help '{\"function\": \"resolve_name\"}'\n" \
+             + "\n******lbrynet-cli functions******\n"
+
 
 def main():
     api = JSONRPCProxy.from_url(API_CONNECTION_STRING)
@@ -16,6 +23,15 @@ def main():
 
     args = sys.argv[1:]
     meth = args[0]
+
+    msg = help_msg
+    for f in api.help():
+        msg += f + "\n"
+
+    if meth in ['--help', '-h', 'help']:
+        print msg
+        sys.exit(1)
+
     if len(args) > 1:
         if isinstance(args[1], dict):
             params = args[1]
@@ -25,13 +41,18 @@ def main():
         params = None
 
     if meth in api.help():
-        if params:
-            r = api.call(meth, params)
-        else:
-            r = api.call(meth)
-        print r
+        try:
+            if params:
+                r = api.call(meth, params)
+            else:
+                r = api.call(meth)
+            print r
+        except:
+            print "Something went wrong, here's the usage for %s:" % meth
+            print api.help({'function': meth})
     else:
-        print "Unrecognized function"
+        print "Unknown function"
+        print msg
 
 
 if __name__ == '__main__':