X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/a2a69d5803d05ce9ccd2d911389b8aa28239dfba..7ecd4644e7fe48309d4b8445ec62c7fe8c0443ff:/src/redis-cli.c diff --git a/src/redis-cli.c b/src/redis-cli.c index 865f0931..2aedcc4a 100644 --- a/src/redis-cli.c +++ b/src/redis-cli.c @@ -39,6 +39,7 @@ #include #include #include +#include #include "hiredis.h" #include "sds.h" @@ -88,59 +89,143 @@ static long long mstime(void) { * Help functions *--------------------------------------------------------------------------- */ -/* Output command help to stdout. */ -static void outputCommandHelp(struct commandHelp *help) { - printf("\n \x1b[1m%s\x1b[0m \x1b[90m%s\x1b[0m\n", help->name, help->params); - printf(" \x1b[33msummary:\x1b[0m %s\n", help->summary); - printf(" \x1b[33msince:\x1b[0m %s\n", help->since); - printf(" \x1b[33mgroup:\x1b[0m %s\n", commandGroups[help->group]); +#define CLI_HELP_COMMAND 1 +#define CLI_HELP_GROUP 2 + +typedef struct { + int type; + int argc; + sds *argv; + sds full; + + /* Only used for help on commands */ + struct commandHelp *org; +} helpEntry; + +static helpEntry *helpEntries; +static int helpEntriesLen; + +static void cliInitHelp() { + int commandslen = sizeof(commandHelp)/sizeof(struct commandHelp); + int groupslen = sizeof(commandGroups)/sizeof(char*); + int i, len, pos = 0; + helpEntry tmp; + + helpEntriesLen = len = commandslen+groupslen; + helpEntries = malloc(sizeof(helpEntry)*len); + + for (i = 0; i < groupslen; i++) { + tmp.argc = 1; + tmp.argv = malloc(sizeof(sds)); + tmp.argv[0] = sdscatprintf(sdsempty(),"@%s",commandGroups[i]); + tmp.full = tmp.argv[0]; + tmp.type = CLI_HELP_GROUP; + tmp.org = NULL; + helpEntries[pos++] = tmp; + } + + for (i = 0; i < commandslen; i++) { + tmp.argv = sdssplitargs(commandHelp[i].name,&tmp.argc); + tmp.full = sdsnew(commandHelp[i].name); + tmp.type = CLI_HELP_COMMAND; + tmp.org = &commandHelp[i]; + helpEntries[pos++] = tmp; + } } -/* Return command group type by name string. */ -static int commandGroupIndex(const char *name) { - int i, len = sizeof(commandGroups)/sizeof(char*); - for (i = 0; i < len; i++) - if (strcasecmp(name, commandGroups[i]) == 0) - return i; - return -1; +/* Output command help to stdout. */ +static void cliOutputCommandHelp(struct commandHelp *help, int group) { + printf("\r\n \x1b[1m%s\x1b[0m \x1b[90m%s\x1b[0m\r\n", help->name, help->params); + printf(" \x1b[33msummary:\x1b[0m %s\r\n", help->summary); + printf(" \x1b[33msince:\x1b[0m %s\r\n", help->since); + if (group) { + printf(" \x1b[33mgroup:\x1b[0m %s\r\n", commandGroups[help->group]); + } } -/* Output group names. */ -static void outputGroupHelp() { - int i, len = sizeof(commandGroups)/sizeof(char*); - for (i = 0; i < len; i++) - printf(" \x1b[90m-\x1b[0m %s\n", commandGroups[i]); +/* Print generic help. */ +static void cliOutputGenericHelp() { + printf( + "redis-cli %s\r\n" + "Type: \"help @\" to get a list of commands in \r\n" + " \"help \" for help on \r\n" + " \"help \" to get a list of possible help topics\r\n" + " \"quit\" to exit\r\n", + REDIS_VERSION + ); } /* Output all command help, filtering by group or command name. */ -static void outputHelp(int argc, char **argv) { - int i, len = sizeof(commandHelp) / sizeof(struct commandHelp); - int group; +static void cliOutputHelp(int argc, char **argv) { + int i, j, len; + int group = -1; + helpEntry *entry; struct commandHelp *help; - if (argc && strcasecmp("groups", argv[0]) == 0) { - outputGroupHelp(); + if (argc == 0) { + cliOutputGenericHelp(); return; + } else if (argc > 0 && argv[0][0] == '@') { + len = sizeof(commandGroups)/sizeof(char*); + for (i = 0; i < len; i++) { + if (strcasecmp(argv[0]+1,commandGroups[i]) == 0) { + group = i; + break; + } + } } - group = argc ? commandGroupIndex(argv[0]) : -1; - for (i = 0; i < len; i++) { - help = &commandHelp[i]; + assert(argc > 0); + for (i = 0; i < helpEntriesLen; i++) { + entry = &helpEntries[i]; + if (entry->type != CLI_HELP_COMMAND) continue; + + help = entry->org; if (group == -1) { - if (argc) { - if (strcasecmp(help->name, argv[0]) == 0) { - outputCommandHelp(help); + /* Compare all arguments */ + if (argc == entry->argc) { + for (j = 0; j < argc; j++) { + if (strcasecmp(argv[j],entry->argv[j]) != 0) break; + } + if (j == argc) { + cliOutputCommandHelp(help,1); } - } else { - outputCommandHelp(help); } } else { if (group == help->group) { - outputCommandHelp(help); + cliOutputCommandHelp(help,0); } } } - puts(""); + printf("\r\n"); +} + +static void completionCallback(const char *buf, linenoiseCompletions *lc) { + size_t startpos = 0; + int mask; + int i; + size_t matchlen; + sds tmp; + + if (strncasecmp(buf,"help ",5) == 0) { + startpos = 5; + while (isspace(buf[startpos])) startpos++; + mask = CLI_HELP_COMMAND | CLI_HELP_GROUP; + } else { + mask = CLI_HELP_COMMAND; + } + + for (i = 0; i < helpEntriesLen; i++) { + if (!(helpEntries[i].type & mask)) continue; + + matchlen = strlen(buf+startpos); + if (strncasecmp(buf+startpos,helpEntries[i].full,matchlen) == 0) { + tmp = sdsnewlen(buf,startpos); + tmp = sdscat(tmp,helpEntries[i].full); + linenoiseAddCompletion(lc,tmp); + sdsfree(tmp); + } + } } /*------------------------------------------------------------------------------ @@ -317,9 +402,14 @@ static int cliSendCommand(int argc, char **argv, int repeat) { size_t *argvlen; int j; + if (context == NULL) { + printf("Not connected, please use: connect \n"); + return REDIS_OK; + } + config.raw_output = !strcasecmp(command,"info"); - if (!strcasecmp(command,"help")) { - outputHelp(--argc, ++argv); + if (!strcasecmp(command,"help") || !strcasecmp(command,"?")) { + cliOutputHelp(--argc, ++argv); return REDIS_OK; } if (!strcasecmp(command,"shutdown")) config.shutdown = 1; @@ -363,7 +453,8 @@ static int parseOptions(int argc, char **argv) { int lastarg = i==argc-1; if (!strcmp(argv[i],"-h") && !lastarg) { - config.hostip = argv[i+1]; + sdsfree(config.hostip); + config.hostip = sdsnew(argv[i+1]); i++; } else if (!strcmp(argv[i],"-h") && lastarg) { usage(); @@ -450,7 +541,9 @@ static void repl() { sds *argv; config.interactive = 1; - while((line = linenoise("redis> ")) != NULL) { + linenoiseSetCompletionCallback(completionCallback); + + while((line = linenoise(context ? "redis> " : "not connected> ")) != NULL) { if (line[0] != '\0') { argv = sdssplitargs(line,&argc); linenoiseHistoryAdd(line); @@ -463,14 +556,18 @@ static void repl() { strcasecmp(argv[0],"exit") == 0) { exit(0); + } else if (argc == 3 && !strcasecmp(argv[0],"connect")) { + sdsfree(config.hostip); + config.hostip = sdsnew(argv[1]); + config.hostport = atoi(argv[2]); + cliConnect(1); + } else if (argc == 1 && !strcasecmp(argv[0],"clear")) { + linenoiseClearScreen(); } else { long long start_time = mstime(), elapsed; if (cliSendCommand(argc,argv,1) != REDIS_OK) { - printf("Reconnecting... "); - fflush(stdout); - if (cliConnect(1) != REDIS_OK) exit(1); - printf("OK\n"); + cliConnect(1); /* If we still cannot send the command, * print error and abort. */ @@ -510,7 +607,7 @@ static int noninteractive(int argc, char **argv) { int main(int argc, char **argv) { int firstarg; - config.hostip = "127.0.0.1"; + config.hostip = sdsnew("127.0.0.1"); config.hostport = 6379; config.hostsocket = NULL; config.repeat = 1; @@ -525,6 +622,7 @@ int main(int argc, char **argv) { config.historyfile = NULL; config.tty = isatty(fileno(stdout)) || (getenv("FAKETTY") != NULL); config.mb_sep = '\n'; + cliInitHelp(); if (getenv("HOME") != NULL) { config.historyfile = malloc(256);