X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fclient%2Fmain.c;h=9b136f896fc80cdb662b3a3b9c679a41a99396b7;hb=eaaa22b9437e80a965c8bcec480d5d023dec3a03;hp=2d03c282a3aee5f223c0847a32fac0dfeed1b774;hpb=02f0775b2a83325fe9b8768dc19bcf2ef35d1cf2;p=tpg%2Fopendispense2.git diff --git a/src/client/main.c b/src/client/main.c index 2d03c28..9b136f8 100644 --- a/src/client/main.c +++ b/src/client/main.c @@ -30,7 +30,8 @@ // === TYPES === typedef struct sItem { - char *Ident; + char *Type; + int ID; char *Desc; int Price; } tItem; @@ -48,7 +49,7 @@ void PrintAlign(int Row, int Col, int Width, const char *Left, char Pad1, const void PopulateItemList(int Socket); int DispenseItem(int Socket, int ItemID); int Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const char *Reason); - int Dispense_SetBalance(int Socket, const char *Username, int Ammount, const char *Reason); + int Dispense_Give(int Socket, const char *Username, int Ammount, const char *Reason); int Dispense_EnumUsers(int Socket); int Dispense_ShowUser(int Socket, const char *Username); void _PrintUserLine(const char *Line); @@ -87,7 +88,7 @@ int main(int argc, char *argv[]) // > 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+([A-Za-z]+)\\s+([A-Za-z0-9:]+?)\\s+([0-9]+)\\s+(.+)$", REG_EXTENDED); + CompileRegex(&gItemRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([A-Za-z]+):([0-9]+)\\s+([0-9]+)\\s+(.+)$", REG_EXTENDED); // > Code 'SALT' salt CompileRegex(&gSaltRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+(.+)$", REG_EXTENDED); // > Code 'User' Username Balance Flags @@ -156,21 +157,46 @@ int main(int argc, char *argv[]) // argv[i+2]: Ammount // argv[i+3]: Reason - if( argv[i+2][0] == '=' ) { - // Set balance - Dispense_SetBalance(sock, argv[i+1], atoi(argv[i+2] + 1), argv[i+3]); - } - else { - // Alter balance - Dispense_AlterBalance(sock, argv[i+1], atoi(argv[i+2]), argv[i+3]); - } + // Alter balance + Dispense_AlterBalance(sock, argv[i+1], atoi(argv[i+2]), argv[i+3]); } + // Show user information Dispense_ShowUser(sock, argv[i+1]); close(sock); return 0; } + // + // `dispense give` + // - "Here, have some money." + else if( strcmp(arg, "give") == 0 ) + { + if( i + 3 >= argc ) { + fprintf(stderr, "`dispense give` takes three arguments\n"); + ShowUsage(); + return -1; + } + // TODO: `dispense give` + + // argv[i+1]: Destination + // argv[i+2]: Ammount + // argv[i+3]: Reason + + // Connect to server + sock = OpenConnection(gsDispenseServer, giDispensePort); + if( sock < 0 ) return -1; + + // Authenticate + if( Authenticate(sock) ) + return -1; + + Dispense_Give(sock, argv[i+1], atoi(argv[i+2]), argv[i+3]); + return 0; + } + // + // `dispense user` + // - User administration (Wheel Only) else if( strcmp(arg, "user") == 0 ) { // Check argument count @@ -237,7 +263,9 @@ int main(int argc, char *argv[]) if( gsItemPattern ) { - + // TODO: Implement `dispense ` + printf("TODO: Implement `dispense `\n"); + i = -1; } else if( gbUseNCurses ) { @@ -246,7 +274,8 @@ int main(int argc, char *argv[]) else { for( i = 0; i < giNumItems; i ++ ) { - printf("%2i %s\t%3i %s\n", i, gaItems[i].Ident, gaItems[i].Price, gaItems[i].Desc); + printf("%2i %s:%i\t%3i %s\n", i, gaItems[i].Type, gaItems[i].ID, + gaItems[i].Price, gaItems[i].Desc); } printf(" q Quit\n"); for(;;) @@ -295,7 +324,7 @@ void ShowUsage(void) " Give some of your money away\n" " dispense acct []\n" " Show user balances\n" - " dispense acct [+-=] \"\"\n" + " dispense acct [+-] \"\"\n" " Alter a account value (Coke members only)\n" " dispense user add \n" " Create new coke account (Wheel members only)\n" @@ -640,8 +669,7 @@ int Authenticate(int Socket) responseCode = atoi(buf); switch( responseCode ) { - - case 200: // Authenticated, return :) + case 200: // Autoauth succeeded, return free(buf); break; @@ -818,7 +846,7 @@ void PopulateItemList(int Socket) // Fetch item information for( i = 0; i < giNumItems; i ++ ) { - regmatch_t matches[6]; + regmatch_t matches[7]; // Get item info buf = ReadLine(Socket); @@ -829,13 +857,14 @@ void PopulateItemList(int Socket) exit(-1); } - RunRegex(&gItemRegex, buf, 6, matches, "Malformed server response"); + RunRegex(&gItemRegex, buf, 7, matches, "Malformed server response"); buf[ matches[3].rm_eo ] = '\0'; - gaItems[i].Ident = strdup( buf + matches[3].rm_so ); - gaItems[i].Price = atoi( buf + matches[4].rm_so ); - gaItems[i].Desc = strdup( buf + matches[5].rm_so ); + gaItems[i].Type = strdup( buf + matches[3].rm_so ); + gaItems[i].ID = atoi( buf + matches[4].rm_so ); + gaItems[i].Price = atoi( buf + matches[5].rm_so ); + gaItems[i].Desc = strdup( buf + matches[6].rm_so ); free(buf); } @@ -866,7 +895,7 @@ int DispenseItem(int Socket, int ItemID) if( ItemID < 0 || ItemID > giNumItems ) return -1; // Dispense! - sendf(Socket, "DISPENSE %s\n", gaItems[ItemID].Ident); + sendf(Socket, "DISPENSE %s:%i\n", gaItems[ItemID].Type, gaItems[ItemID].ID); buf = ReadLine(Socket); responseCode = atoi(buf); @@ -923,6 +952,9 @@ int Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const c switch(responseCode) { case 200: return 0; // OK + case 402: + fprintf(stderr, "Insufficient balance\n"); + return 1; case 403: // Not in coke fprintf(stderr, "You are not in coke (sucker)\n"); return 1; @@ -940,12 +972,23 @@ int Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const c /** * \brief Alter a user's balance */ -int Dispense_SetBalance(int Socket, const char *Username, int Ammount, const char *Reason) +int Dispense_Give(int Socket, const char *Username, int Ammount, const char *Reason) { char *buf; int responseCode; - sendf(Socket, "SET %s %i %s\n", Username, Ammount, Reason); + if( Ammount < 0 ) { + printf("Sorry, you can only give, you can't take.\n"); + return -1; + } + + // Fast return on zero + if( Ammount == 0 ) { + printf("Are you actually going to give any?\n"); + return 0; + } + + sendf(Socket, "GIVE %s %i %s\n", Username, Ammount, Reason); buf = ReadLine(Socket); responseCode = atoi(buf); @@ -954,12 +997,15 @@ int Dispense_SetBalance(int Socket, const char *Username, int Ammount, const cha switch(responseCode) { case 200: return 0; // OK - case 403: // Not in coke - fprintf(stderr, "You are not in coke (sucker)\n"); + + case 402: + fprintf(stderr, "Insufficient balance\n"); return 1; + case 404: // Unknown user fprintf(stderr, "Unknown user '%s'\n", Username); return 2; + default: fprintf(stderr, "Unknown response code %i\n", responseCode); return -1;