cmd_prompt

Author: hqwrong

cfg.py

@@ -8,6 +8,7 @@ def parse_args():
                         help = 'game server ip address')
     parser.add_argument('-p', '--port', type=int, dest = 'port',
                         help = 'game server tcp port')
+    parser.add_argument('-u', '--uid', dest = 'uid', help="login as UID")
     parser.add_argument("-m", '--mode', dest = "mode", choices = ["simulator", "client"])
     parser.add_argument(dest="config", help = "config file")
     args = parser.parse_args()
@@ -20,5 +21,4 @@ def parse_args():
             Config[k] = v
 
     sys.path.insert(0, Config["proto_path"])
-    
-CLIENT_PROMPT = "> "
+

cmdclient.py

@@ -1,17 +1,34 @@
 import sys,traceback
 from game import Game
-from command import do_cmdstr,has_cmd
+from command import do_cmdstr,find_cmd
+
+import pprint
+
+from cfg import Config
 
-import cfg
 
 class Client(object):
     def __init__(self, srv_addr):
         self.game = Game(srv_addr)
 
+    def docmd(self, tokens):
+        cmdname = tokens[0]
+        ok,similars = find_cmd(cmdname)
+        if not ok:
+            print "cmd not found:", cmdname
+            print "Did you mean this?"
+            print "\t", ", ".join(similars)
+            return
+        result = do_cmdstr(self.game, cmdname, tokens[1] if len(tokens) > 1 else "")
+        if result != None:
+            pprint.pprint(result)
+    
     def interact(self):
+        if "uid" in Config:
+            self.docmd(["login", Config["uid"]])
         while True:
             try:
-                sys.stdout.write(cfg.CLIENT_PROMPT)
+                sys.stdout.write(Config["client_prompt"])
                 sys.stdout.flush()
                 l = sys.stdin.read(1)
                 if not l: # eof
@@ -24,13 +41,7 @@ def interact(self):
                 tokens = l.split(None, 1)
                 if not tokens:
                     continue
-                cmdname = tokens[0]
-                if not has_cmd(cmdname):
-                    print("cmd not found:", cmdname)
-                    continue
-                result = do_cmdstr(self.game, cmdname, tokens[1] if len(tokens) > 1 else "")
-                if result != None:
-                    print(result)
+                self.docmd(tokens)
 
             except Exception as e:
                 print "error occured", e, traceback.format_exc()

command.py

@@ -1,4 +1,5 @@
 import sys, os, importlib
+import inspect
 
 cmddir = "cmd"
 
@@ -41,9 +42,36 @@ def _parseargs(argstr):
     for i in xrange(len(args)):
         args[i] = eval(args[i], {}, {})
     return args
-    
-def has_cmd(cmdname):
-    return cmdname in commands
+
+def find_cmd(cmdname):
+    if cmdname in commands:
+        return True,[]
+
+    similars = []
+    for n in commands:
+        if n.startswith(cmdname):
+            similars.append(n)
+
+    if not similars:
+        mindiff = 100000
+        for n in commands:
+            d = abs(len(n) - len(cmdname))
+            for i in range(min(len(n), len(cmdname))):
+                if n[i] != cmdname[i]:
+                    d += 1
+            if d < mindiff:
+                similars = [n]
+                mindiff = d
+            elif d == mindiff:
+                similars.append(n)
+
+    return False, similars
+
+def inspect_cmd(cmdname):
+    cmd = commands[cmdname]
+    args = inspect.getargspec(cmd["handle"]).args
+    del args[0]             # remove `self' arg
+    return cmdname, args
 
 def do_cmd(player, cmdname, args):
     cmd = commands[cmdname]
@@ -82,3 +110,7 @@ def _decorator(f):
         return f
 
     return _decorator
+
+def listcmd():
+    return [cmdname for cmdname in commands]
+

game.py

@@ -7,7 +7,7 @@
 import gevent
 
 from command import *
-import cfg
+from cfg import Config
 
 def _get_secret(uid, token, salt):
     m = md5.new()
@@ -35,16 +35,19 @@ def send(self, protoname, msg = {}):
         return self.srv.invoke(protoname, msg)
 
     ################################ Test #########################################
-    @addcmd("create")
-    def create_user(self):
-        resp = self.call("client.create", {"platform" : 1})
-        print resp["uid"], resp["token"]
+    @addcmd()
+    def help(self, cmdname = ""):
+        ok,similars = find_cmd(cmdname)
+        cmds = [cmdname] if ok else similars
+        for cmdname in cmds:
+            cmdname,args = inspect_cmd(cmdname)
+            print cmdname,args
 
     @addcmd()
     def login(self, user):
         '''for sproto test login '''
         resp = self.call("login", {"account": user})
-        cfg.CLIENT_PROMPT = "[%s] > " % user
+        Config["client_prompt"] = "[%s] > " % user
         print(resp["prompt"])
 
     @addcmd()

test/config.py

@@ -26,6 +26,7 @@
 
 ## client mode
 mode = "client"
+client_prompt = "> "
 
 # mode = "simulator"                 # client / simulator
 # run = [