diff -ur v3/fsyn.py v4/fsyn.py --- v3/fsyn.py 2020-04-22 22:24:17.000000000 +0900 +++ v4/fsyn.py 2020-04-26 17:39:47.000000000 +0900 @@ -389,59 +389,21 @@ return empty.new( locals() ) - -def get_name_args(): - cmd_new = lambda name, args=[], comment='': empty.new( name=name, args=args, comment=comment ) - +if __name__ == "__main__": cmds = [ - cmd_new( 'create' ), - cmd_new( 'commit' ), - cmd_new( 'log' ), - cmd_new( 'curr', comment='show current id' ), - cmd_new( 'ids', comment='show all id' ), - cmd_new( 'tails', comment='show tail ids' ), - cmd_new( 'checkout', [ 'id' ] ), - cmd_new( 'check', comment='show dirty' ), - cmd_new( 'fixlink', comment='fix link info' ), - cmd_new( 'push', [ 'to_path' ] ), - cmd_new( 'pull', [ 'from_path' ] ), + arg.cmd_new( 'create' ), + arg.cmd_new( 'commit' ), + arg.cmd_new( 'log' ), + arg.cmd_new( 'curr', comment='show current id' ), + arg.cmd_new( 'ids', comment='show all id' ), + arg.cmd_new( 'tails', comment='show tail ids' ), + arg.cmd_new( 'checkout', [ 'id' ] ), + arg.cmd_new( 'check', comment='show dirty' ), + arg.cmd_new( 'fixlink', comment='fix link info' ), + arg.cmd_new( 'push', [ 'to_path' ] ), + arg.cmd_new( 'pull', [ 'from_path' ] ), ] - - dic = dict( map( lambda cmd: ( cmd.name, cmd ), cmds ) ) - - def help(): - def get(cmd): - lst = [ cmd.name ] + cmd.args - return to_str( lst, delim=' ' ) - - max_n = max( map( lambda cmd: len( get( cmd ) ), cmds ) ) - - def get_(cmd): - s = get( cmd ) - if cmd.comment: - s += ' ' * ( max_n - len(s) ) - s += ' # ' + cmd.comment - return s - - msg = 'cmd arg ...\n' - msg += to_str( map( get_, cmds ), ' ' ) - dbg.help_exit( msg ) - - a = arg.new() - name = a.pop() - if name not in dic: - help() - - cmd = dic.get( name ) - n = len( cmd.args ) - av = a.get_av() - if len( av ) < n: - help() - - return cmd_new( cmd.name, av[ :n ] ) - -if __name__ == "__main__": - cmd = get_name_args() + cmd = arg.get_name_args( cmds ) dir_path = os.getcwd() fsyn = fsyn_new( dir_path )