diff --git a/src/morevna.py b/src/morevna.py --- a/src/morevna.py +++ b/src/morevna.py @@ -25,10 +25,12 @@ def buildTree(args): def push(args): _checkFile(args.datafile) + if args.tree: + _checkFile(args.tree) if args.host: conf.hosts.insert(0,args.host) if args.port: conf.port=args.port - c=Client(args.datafile) + c=Client(args.datafile,args.tree) with ClientConnection() as con: c.setConnection(con) blocksToTransfer=c.negotiate() @@ -38,10 +40,12 @@ def push(args): def pull(args): _checkFile(args.datafile) + if args.tree: + _checkFile(args.tree) if args.host: conf.hosts.insert(0,args.host) if args.port: conf.port=args.port - c=Client(args.datafile) + c=Client(args.datafile,args.tree) with ClientConnection() as con: c.setConnection(con) blocksToTransfer=c.negotiate() @@ -74,12 +78,14 @@ pBuild.set_defaults(func=buildTree) pUpdate=subparsers.add_parser("push") pUpdate.add_argument("-p","--port",type=int) pUpdate.add_argument("--host",default="127.0.0.1") +pUpdate.add_argument("-t","--tree",help="stored hash tree location") pUpdate.add_argument("datafile") pUpdate.set_defaults(func=push) pUpdate=subparsers.add_parser("pull") pUpdate.add_argument("-p","--port",type=int) pUpdate.add_argument("--host",default="127.0.0.1") +pUpdate.add_argument("-t","--tree",help="stored hash tree location") pUpdate.add_argument("datafile") pUpdate.set_defaults(func=pull)