From 8518658c20dde60777889edc4562ca29c803cdaf Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 31 Jul 2024 07:07:06 -0400 Subject: [PATCH] Use dict for commands Signed-off-by: Daniel J Walsh --- ramalama | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/ramalama b/ramalama index 6d76fe8d..cef437d3 100755 --- a/ramalama +++ b/ramalama @@ -279,7 +279,7 @@ def serve_cli(ramalama_store, args): os.execlp("llama-server", "llama-server", "-m", symlink_path) -def usage(): +def usage(cmd=""): print("Usage:") print(f" {os.path.basename(__file__)} COMMAND") print() @@ -323,26 +323,17 @@ def main(args): conman = select_container_manager() ramalama_store = get_ramalama_store() - if conman: - conman_args = [conman, "run", "--rm", "-it", "--security-opt=label=disable", f"-v{ramalama_store}:/var/lib/ramalama", f"-v{os.path.expanduser('~')}:{os.path.expanduser('~')}", "-v/tmp:/tmp", - f"-v{__file__}:{__file__}", "quay.io/ramalama/ramalama:latest", __file__] + args - os.execvp(conman, conman_args) - - if len(args) < 1: - usage() + funcDict={} + funcDict["pull"] = pull_cli + funcDict["run"] = run_cli + funcDict["list"] = list_cli cmd = args.pop(0) - if cmd == "pull": - pull_cli(ramalama_store, args) - elif cmd == "run": - run_cli(ramalama_store, args) - elif cmd == "serve": - serve_cli(ramalama_store, args) - elif cmd in ("list", "ls"): - list_cli(ramalama_store) - else: + try: + funcDict[cmd](ramalama_store, args) + except: + print(cmd + " not valid\n") usage() - if __name__ == "__main__": main(sys.argv[1:])