X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fclient%2Fmain.c;h=bb159059d1011df5ecffe8ff64552ee08762c36f;hb=4343d1b16536d868dce734fdf3a8debf6f7bf890;hp=361d62dbe27fce61d5c89670197eccbc42276add;hpb=1cb4c25d8821698d15bcfe223ee510ebb1b972c2;p=tpg%2Fopendispense2.git diff --git a/src/client/main.c b/src/client/main.c index 361d62d..bb15905 100644 --- a/src/client/main.c +++ b/src/client/main.c @@ -34,12 +34,17 @@ typedef struct sItem { } tItem; // === PROTOTYPES === +// --- GUI --- int ShowNCursesUI(void); +void ShowItemAt(int Row, int Col, int Width, int Index); void PrintAlign(int Row, int Col, int Width, const char *Left, char Pad1, const char *Mid, char Pad2, const char *Right, ...); - - int sendf(int Socket, const char *Format, ...); +// --- Coke Server Communication --- int OpenConnection(const char *Host, int Port); int Authenticate(int Socket); +void PopulateItemList(int Socket); + int DispenseItem(int Socket, int ItemID); +// --- Helpers --- + int sendf(int Socket, const char *Format, ...); char *trim(char *string); int RunRegex(regex_t *regex, const char *string, int nMatches, regmatch_t *matches, const char *errorMessage); void CompileRegex(regex_t *regex, const char *pattern, int flags); @@ -51,18 +56,21 @@ tItem *gaItems; int giNumItems; regex_t gArrayRegex, gItemRegex, gSaltRegex; +char *gsOverrideUser; //!< '-u' argument (dispense as another user) + int gbUseNCurses = 0; //!< '-G' Use the NCurses GUI? + // === CODE === int main(int argc, char *argv[]) { int sock; - int i, responseCode, len; + int i; char buffer[BUFSIZ]; // -- Create regular expressions // > Code Type Count ... CompileRegex(&gArrayRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([0-9]+)", REG_EXTENDED); // // > Code Type Ident Price Desc - CompileRegex(&gItemRegex, "^([0-9]{3})\\s+(.+?)\\s+(.+?)\\s+([0-9]+)\\s+(.+)$", REG_EXTENDED); + CompileRegex(&gItemRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([A-Za-z0-9:]+?)\\s+([0-9]+)\\s+(.+)$", REG_EXTENDED); // > Code 'SALT' salt CompileRegex(&gSaltRegex, "^([0-9]{3})\\s+(.+)\\s+(.+)$", REG_EXTENDED); @@ -70,194 +78,90 @@ int main(int argc, char *argv[]) sock = OpenConnection(gsDispenseServer, giDispensePort); if( sock < 0 ) return -1; - // Determine what to do - if( argc > 1 ) + // Authenticate + Authenticate(sock); + + // Parse Arguments + for( i = 1; i < argc; i ++ ) { - if( strcmp(argv[1], "acct") == 0 ) - { + char *arg = argv[i]; + + if( arg[0] == '-' ) + { + switch(arg[1]) + { + case 'u': // Override User + gsOverrideUser = argv[++i]; + break; + + case 'G': // Use GUI + gbUseNCurses = 1; + break; + } + + continue; + } + + if( strcmp(argv[1], "acct") == 0 ) { // Alter account // List accounts return 0; } + else { + // Item name / pattern + } } - // Ask server for stock list - send(sock, "ENUM_ITEMS\n", 11, 0); - len = recv(sock, buffer, BUFSIZ-1, 0); - buffer[len] = '\0'; + // Get items + PopulateItemList(sock); - trim(buffer); - - printf("Output: %s\n", buffer); - - responseCode = atoi(buffer); - if( responseCode != 201 ) + if( gbUseNCurses ) { - fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n", responseCode); - return -1; + i = ShowNCursesUI(); } - - // Get item list + else { - char *itemType, *itemStart; - int count; - regmatch_t matches[4]; - - // Expected format: 201 Items ... - RunRegex(&gArrayRegex, buffer, 4, matches, "Malformed server response"); - - itemType = &buffer[ matches[2].rm_so ]; buffer[ matches[2].rm_eo ] = '\0'; - count = atoi( &buffer[ matches[3].rm_so ] ); - - // Check array type - if( strcmp(itemType, "Items") != 0 ) { - // What the?! - fprintf(stderr, "Unexpected array type, expected 'Items', got '%s'\n", - itemType); - return -1; + for( i = 0; i < giNumItems; i ++ ) { + printf("%2i %s\t%3i %s\n", i, gaItems[i].Ident, gaItems[i].Price, gaItems[i].Desc); } - - itemStart = &buffer[ matches[3].rm_eo ]; - - gaItems = malloc( count * sizeof(tItem) ); - - for( giNumItems = 0; giNumItems < count && itemStart; giNumItems ++ ) + printf(" q Quit\n"); + for(;;) { - char *next = strchr( ++itemStart, ' ' ); - if( next ) *next = '\0'; - gaItems[giNumItems].Ident = strdup(itemStart); - itemStart = next; - } - } - - // Get item information - for( i = 0; i < giNumItems; i ++ ) - { - regmatch_t matches[6]; - - // Print item Ident - printf("%2i %s\t", i, gaItems[i].Ident); - - // Get item info - sendf(sock, "ITEM_INFO %s\n", gaItems[i].Ident); - len = recv(sock, buffer, BUFSIZ-1, 0); - buffer[len] = '\0'; - trim(buffer); - - responseCode = atoi(buffer); - if( responseCode != 202 ) { - fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n", responseCode); - return -1; - } - - RunRegex(&gItemRegex, buffer, 6, matches, "Malformed server response"); - - buffer[ matches[3].rm_eo ] = '\0'; - - gaItems[i].Price = atoi( buffer + matches[4].rm_so ); - gaItems[i].Desc = strdup( buffer + matches[5].rm_so ); - - printf("%3i %s\n", gaItems[i].Price, gaItems[i].Desc); - } - - // and choose what to dispense - - #if USE_NCURSES_INTERFACE - i = ShowNCursesUI(); - #else - - for(;;) - { - char *buf; - - fgets(buffer, BUFSIZ, stdin); - - buf = trim(buffer); - - if( buf[0] == 'q' ) break; - - i = atoi(buf); - - printf("buf = '%s', atoi(buf) = %i\n", buf, i); - - if( i != 0 || buf[0] == '0' ) - { - printf("i = %i\n", i); + char *buf; + + i = -1; + + fgets(buffer, BUFSIZ, stdin); + + buf = trim(buffer); + + if( buf[0] == 'q' ) break; - if( i < 0 || i >= giNumItems ) { - printf("Bad item (should be between 0 and %i)\n", giNumItems); - continue; + i = atoi(buf); + + if( i != 0 || buf[0] == '0' ) + { + if( i < 0 || i >= giNumItems ) { + printf("Bad item %i (should be between 0 and %i)\n", i, giNumItems); + continue; + } + break; } - break; } } - #endif - // Check for a valid item ID and if so, authenticate - if( i >= 0 && Authenticate(sock) ) - { - // Dispense! - sendf(sock, "DISPENSE %s\n", gaItems[i].Ident); - - len = recv(sock, buffer, BUFSIZ-1, 0); - buffer[len] = '\0'; - trim(buffer); - - responseCode = atoi(buffer); - switch( responseCode ) - { - case 200: - printf("Dispense OK\n"); - break; - case 401: - printf("Not authenticated\n"); - break; - case 402: - printf("Insufficient balance\n"); - break; - case 406: - printf("Bad item name, bug report\n"); - break; - case 500: - printf("Item failed to dispense, is the slot empty?\n"); - break; - case 501: - printf("Dispense not possible (slot empty/permissions)\n"); - break; - default: - printf("Unknown response code %i ('%s')\n", responseCode, buffer); - break; - } - } + // Check for a valid item ID + if( i >= 0 ) + DispenseItem(sock, i); close(sock); return 0; } -/** - * \brief Show item \a Index at (\a Col, \a Row) - * \note Part of the NCurses UI - */ -void ShowItemAt(int Row, int Col, int Width, int Index) -{ - int _x, _y, times; - - move( Row, Col ); - - if( Index < 0 || Index >= giNumItems ) { - printw("%02i OOR", Index); - return ; - } - printw("%02i %s", Index, gaItems[Index].Desc); - - getyx(stdscr, _y, _x); - // Assumes max 4 digit prices - times = Width - 4 - (_x - Col); // TODO: Better handling for large prices - while(times--) addch(' '); - printw("%4i", gaItems[Index].Price); -} - +// ------------------- +// --- NCurses GUI --- +// ------------------- /** * \brief Render the NCurses UI */ @@ -269,19 +173,31 @@ int ShowNCursesUI(void) int ch; int i, times; int xBase, yBase; - const int displayMinWidth = 34; + const int displayMinWidth = 40; const int displayMinItems = 8; char *titleString = "Dispense"; int itemCount = displayMinItems; int itemBase = 0; + int currentItem = 0; + int ret = -2; // -2: Used for marking "no return yet" - int height = itemCount + 3; - int width = displayMinWidth; + int height, width; // Enter curses mode initscr(); raw(); noecho(); + // Get item count + // - 6: randomly chosen (Need at least 3) + itemCount = LINES - 6; + if( itemCount > giNumItems ) + itemCount = giNumItems; + + // Get dimensions + height = itemCount + 3; + width = displayMinWidth; + + // Get positions xBase = COLS/2 - width/2; yBase = LINES/2 - height/2; @@ -294,23 +210,29 @@ int ShowNCursesUI(void) for( i = 0; i < itemCount; i ++ ) { move( yBase + 1 + i, xBase ); - addch('|'); - addch(' '); + + if( currentItem == itemBase + i ) { + printw("| -> "); + } + else { + printw("| "); + } // Check for ... row + // - Oh god, magic numbers! if( i == 0 && itemBase > 0 ) { printw(" ..."); - times = width - 1 - 8; + times = width-1 - 8 - 3; while(times--) addch(' '); } else if( i == itemCount - 1 && itemBase < giNumItems - itemCount ) { printw(" ..."); - times = width - 1 - 8; + times = width-1 - 8 - 3; while(times--) addch(' '); } // Show an item else { - ShowItemAt( yBase + 1 + i, xBase + 2, width - 4, itemBase + i); + ShowItemAt( yBase + 1 + i, xBase + 5, width - 7, itemBase + i); addch(' '); } @@ -351,11 +273,19 @@ int ShowNCursesUI(void) switch(ch) { case 'B': - if( itemBase < giNumItems - (itemCount) ) + //if( itemBase < giNumItems - (itemCount) ) + // itemBase ++; + if( currentItem < giNumItems - 1 ) + currentItem ++; + if( itemBase + itemCount - 1 <= currentItem && itemBase + itemCount < giNumItems ) itemBase ++; break; case 'A': - if( itemBase > 0 ) + //if( itemBase > 0 ) + // itemBase --; + if( currentItem > 0 ) + currentItem --; + if( itemBase + 1 > currentItem && itemBase > 0 ) itemBase --; break; } @@ -365,7 +295,18 @@ int ShowNCursesUI(void) } } else { - break; + switch(ch) + { + case '\n': + ret = currentItem; + break; + case 'q': + ret = -1; // -1: Return with no dispense + break; + } + + // Check if the return value was changed + if( ret != -2 ) break; } } @@ -373,7 +314,37 @@ int ShowNCursesUI(void) // Leave endwin(); - return -1; + return ret; +} + +/** + * \brief Show item \a Index at (\a Col, \a Row) + * \note Part of the NCurses UI + */ +void ShowItemAt(int Row, int Col, int Width, int Index) +{ + int _x, _y, times; + char *name; + int price; + + move( Row, Col ); + + if( Index < 0 || Index >= giNumItems ) { + name = "OOR"; + price = 0; + } + else { + name = gaItems[Index].Desc; + price = gaItems[Index].Price; + } + + printw("%02i %s", Index, name); + + getyx(stdscr, _y, _x); + // Assumes max 4 digit prices + times = Width - 4 - (_x - Col); // TODO: Better handling for large prices + while(times--) addch(' '); + printw("%4i", price); } /** @@ -437,26 +408,9 @@ void PrintAlign(int Row, int Col, int Width, const char *Left, char Pad1, } } -// === HELPERS === -int sendf(int Socket, const char *Format, ...) -{ - va_list args; - int len; - - va_start(args, Format); - len = vsnprintf(NULL, 0, Format, args); - va_end(args); - - { - char buf[len+1]; - va_start(args, Format); - vsnprintf(buf, len+1, Format, args); - va_end(args); - - return send(Socket, buf, len, 0); - } -} - +// --------------------- +// --- Coke Protocol --- +// --------------------- int OpenConnection(const char *Host, int Port) { struct hostent *host; @@ -606,6 +560,147 @@ int Authenticate(int Socket) return 0; // Seems OK } +void PopulateItemList(int Socket) +{ + char buffer[BUFSIZ]; + int len; + int responseCode; + + char *itemType, *itemStart; + int count, i; + regmatch_t matches[4]; + + // Ask server for stock list + send(Socket, "ENUM_ITEMS\n", 11, 0); + len = recv(Socket, buffer, BUFSIZ-1, 0); + buffer[len] = '\0'; + + trim(buffer); + + //printf("Output: %s\n", buffer); + + responseCode = atoi(buffer); + if( responseCode != 201 ) { + fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n", responseCode); + exit(-1); + } + + // - Get item list - + + // Expected format: 201 Items ... + RunRegex(&gArrayRegex, buffer, 4, matches, "Malformed server response"); + + itemType = &buffer[ matches[2].rm_so ]; buffer[ matches[2].rm_eo ] = '\0'; + count = atoi( &buffer[ matches[3].rm_so ] ); + + // Check array type + if( strcmp(itemType, "Items") != 0 ) { + // What the?! + fprintf(stderr, "Unexpected array type, expected 'Items', got '%s'\n", + itemType); + exit(-1); + } + + itemStart = &buffer[ matches[3].rm_eo ]; + + gaItems = malloc( count * sizeof(tItem) ); + + for( giNumItems = 0; giNumItems < count && itemStart; giNumItems ++ ) + { + char *next = strchr( ++itemStart, ' ' ); + if( next ) *next = '\0'; + gaItems[giNumItems].Ident = strdup(itemStart); + itemStart = next; + } + + // Fetch item information + for( i = 0; i < giNumItems; i ++ ) + { + regmatch_t matches[6]; + + // Get item info + sendf(Socket, "ITEM_INFO %s\n", gaItems[i].Ident); + len = recv(Socket, buffer, BUFSIZ-1, 0); + buffer[len] = '\0'; + trim(buffer); + + responseCode = atoi(buffer); + if( responseCode != 202 ) { + fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n", responseCode); + exit(-1); + } + + RunRegex(&gItemRegex, buffer, 6, matches, "Malformed server response"); + + buffer[ matches[3].rm_eo ] = '\0'; + + gaItems[i].Price = atoi( buffer + matches[4].rm_so ); + gaItems[i].Desc = strdup( buffer + matches[5].rm_so ); + } +} + +int DispenseItem(int Socket, int ItemID) +{ + int len, responseCode; + char buffer[BUFSIZ]; + + if( ItemID < 0 || ItemID > giNumItems ) return -1; + + // Dispense! + sendf(Socket, "DISPENSE %s\n", gaItems[ItemID].Ident); + len = recv(Socket, buffer, BUFSIZ-1, 0); + buffer[len] = '\0'; + trim(buffer); + + responseCode = atoi(buffer); + switch( responseCode ) + { + case 200: + printf("Dispense OK\n"); + return 0; + case 401: + printf("Not authenticated\n"); + return 1; + case 402: + printf("Insufficient balance\n"); + return 1; + case 406: + printf("Bad item name, bug report\n"); + return 1; + case 500: + printf("Item failed to dispense, is the slot empty?\n"); + return 1; + case 501: + printf("Dispense not possible (slot empty/permissions)\n"); + return 1; + default: + printf("Unknown response code %i ('%s')\n", responseCode, buffer); + return -2; + } +} + +// --------------- +// --- Helpers --- +// --------------- +int sendf(int Socket, const char *Format, ...) +{ + va_list args; + int len; + + va_start(args, Format); + len = vsnprintf(NULL, 0, Format, args); + va_end(args); + + { + char buf[len+1]; + va_start(args, Format); + vsnprintf(buf, len+1, Format, args); + va_end(args); + + return send(Socket, buf, len, 0); + } +} + char *trim(char *string) { int i;