#define DEBUG_TRACE_SERVER 0
#define USE_AUTOAUTH 1
+enum eUI_Modes
+{
+ UI_MODE_BASIC, // Non-NCurses
+ UI_MODE_STANDARD,
+ UI_MODE_DRINKSONLY,
+ UI_MODE_ALL,
+ NUM_UI_MODES
+};
+
// === TYPES ===
typedef struct sItem {
char *Type;
int ID;
+ int Status; // 0: Availiable, 1: Sold out, -1: Error
char *Desc;
int Price;
} tItem;
void ShowUsage(void);
// --- GUI ---
int ShowNCursesUI(void);
-void ShowItemAt(int Row, int Col, int Width, int Index);
+ int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted);
void PrintAlign(int Row, int Col, int Width, const char *Left, char Pad1, const char *Mid, char Pad2, const char *Right, ...);
// --- Coke Server Communication ---
int OpenConnection(const char *Host, int Port);
char *gsItemPattern; //!< Item pattern
char *gsEffectiveUser; //!< '-u' Dispense as another user
- int gbUseNCurses = 0; //!< '-G' Use the NCurses GUI?
+ int giUIMode = UI_MODE_STANDARD;
int gbDryRun = 0; //!< '-n' Read-only
int giMinimumBalance = INT_MIN; //!< '-m' Minumum balance for `dispense acct`
int giMaximumBalance = INT_MAX; //!< '-M' Maximum balance for `dispense acct`
// -- 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+([A-Za-z]+)\\s+([A-Za-z]+):([0-9]+)\\s+([0-9]+)\\s+(.+)$", REG_EXTENDED);
+ // > Code Type Ident Status Price Desc
+ CompileRegex(&gItemRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([A-Za-z]+):([0-9]+)\\s+(avail|sold|error)\\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
giDispensePort = atoi(argv[++i]);
break;
- case 'G': // Use GUI
- gbUseNCurses = 1;
+ case 'G': // Don't use GUI
+ giUIMode = UI_MODE_BASIC;
+ break;
+ case 'D': // Drinks only
+ giUIMode = UI_MODE_DRINKSONLY;
break;
case 'n': // Dry Run / read-only
gbDryRun = 1;
i = best;
}
}
- else if( gbUseNCurses )
+ else if( giUIMode != UI_MODE_BASIC )
{
i = ShowNCursesUI();
}
{
// Very basic dispense interface
for( i = 0; i < giNumItems; i ++ ) {
- if( strcmp(gaItems[i].Desc, "-") == 0 )
- printf("\n");
- else
- printf("%2i %s:%i\t%3i %s\n", i, gaItems[i].Type, gaItems[i].ID,
- gaItems[i].Price, gaItems[i].Desc);
+ // Add a separator
+ if( i && strcmp(gaItems[i].Type, gaItems[i-1].Type) != 0 )
+ printf(" ---\n");
+
+ 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(;;)
int i, times;
int xBase, yBase;
const int displayMinWidth = 40;
- const int displayMinItems = 8;
char *titleString = "Dispense";
- int itemCount = displayMinItems;
+ int itemCount;
+ int maxItemIndex;
int itemBase = 0;
- int currentItem = 0;
+ int currentItem;
int ret = -2; // -2: Used for marking "no return yet"
char balance_str[5+1+2+1]; // If $9999.99 is too little, something's wrong
initscr();
raw(); noecho();
- // Get item count
+ // Get max index
+ maxItemIndex = ShowItemAt(0, 0, 0, -1, 0);
+ // Get item count per screen
// - 6: randomly chosen (Need at least 3)
itemCount = LINES - 6;
- if( itemCount > giNumItems )
- itemCount = giNumItems;
+ if( itemCount > maxItemIndex )
+ itemCount = maxItemIndex;
+ // Get first index
+ currentItem = 0;
+ while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
+ currentItem ++;
+
// Get dimensions
height = itemCount + 3;
// Items
for( i = 0; i < itemCount; i ++ )
{
+ int pos = 0;
+
move( yBase + 1 + i, xBase );
+ printw("| ");
- if( currentItem == itemBase + i ) {
- printw("| -> ");
- }
- else {
- printw("| ");
- }
+ pos += 2;
// Check for the '...' row
// - Oh god, magic numbers!
- if( i == 0 && itemBase > 0 ) {
- printw(" ...");
- times = width-1 - 8 - 3;
- while(times--) addch(' ');
- }
- else if( i == itemCount - 1 && itemBase < giNumItems - itemCount ) {
- printw(" ...");
- times = width-1 - 8 - 3;
+ if( (i == 0 && itemBase > 0)
+ || (i == itemCount - 1 && itemBase < maxItemIndex - itemCount) )
+ {
+ printw(" ..."); pos += 8;
+ times = (width - pos) - 1;
while(times--) addch(' ');
}
// Show an item
else {
- ShowItemAt( yBase + 1 + i, xBase + 5, width - 7, itemBase + i);
- addch(' ');
+ ShowItemAt(
+ yBase + 1 + i, xBase + pos, // Position
+ (width - pos) - 3, // Width
+ itemBase + i, // Index
+ !!(currentItem == itemBase + i) // Hilighted
+ );
+ printw(" ");
}
// Scrollbar (if needed)
- if( giNumItems > itemCount ) {
+ if( maxItemIndex > itemCount ) {
if( i == 0 ) {
addch('A');
}
addch('V');
}
else {
- int percentage = itemBase * 100 / (giNumItems-itemCount);
+ int percentage = itemBase * 100 / (maxItemIndex-itemCount);
if( i-1 == percentage*(itemCount-3)/100 ) {
addch('#');
}
switch(ch)
{
case 'B':
- //if( itemBase < giNumItems - (itemCount) )
- // itemBase ++;
- if( currentItem < giNumItems - 1 )
+ currentItem ++;
+ // Skip over spacers
+ while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
currentItem ++;
- else {
+
+ if( currentItem >= maxItemIndex ) {
currentItem = 0;
+ // Skip over spacers
+ while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
+ currentItem ++;
}
break;
case 'A':
- //if( itemBase > 0 )
- // itemBase --;
- if( currentItem > 0 )
+ currentItem --;
+ // Skip over spacers
+ while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
currentItem --;
- else {
- currentItem = giNumItems - 1;
+
+ if( currentItem < 0 ) {
+ currentItem = maxItemIndex - 1;
+ // Skip over spacers
+ while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
+ currentItem --;
}
break;
}
}
- if( currentItem < itemBase + 1 && itemBase > 0 )
- itemBase = currentItem - 1;
- if( currentItem > itemBase + itemCount - 1 && itemBase < itemCount-1 )
- itemBase = currentItem - itemCount + 1;
-
- #if 0
- if( itemBase + itemCount - 1 <= currentItem && itemBase + itemCount < giNumItems )
- {
- itemBase += ;
- }
- if( itemBase + 1 > currentItem && itemBase > 0 )
- itemBase --;
- #endif
+ if( itemCount > maxItemIndex && currentItem < itemBase + 2 && itemBase > 0 )
+ itemBase = currentItem - 2;
+ if( itemCount > maxItemIndex && currentItem > itemBase + itemCount - 2 && itemBase < maxItemIndex-1 )
+ itemBase = currentItem - itemCount + 2;
}
else {
switch(ch)
{
case '\n':
- ret = currentItem;
+ ret = ShowItemAt(0, 0, 0, currentItem, 0);
break;
case 'q':
ret = -1; // -1: Return with no dispense
/**
* \brief Show item \a Index at (\a Col, \a Row)
+ * \return Dispense index of item
* \note Part of the NCurses UI
*/
-void ShowItemAt(int Row, int Col, int Width, int Index)
+int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted)
{
int _x, _y, times;
- char *name;
- int price;
+ char *name = NULL;
+ int price = 0;
+ int status = -1;
- move( Row, Col );
-
- if( Index < 0 || Index >= giNumItems ) {
- name = "OOR";
- price = 0;
- }
- else {
+ switch(giUIMode)
+ {
+ // Standard UI
+ // - This assumes that
+ case UI_MODE_STANDARD:
+ // Bounds check
+ // Index = -1, request limit
+ if( Index < 0 || Index >= giNumItems+2 )
+ return giNumItems+2;
+ // Drink label
+ if( Index == 0 )
+ {
+ price = 0;
+ name = "Coke Machine";
+ Index = -1; // -1 indicates a label
+ break;
+ }
+ Index --;
+ // Drinks 0 - 6
+ if( Index <= 6 )
+ {
+ name = gaItems[Index].Desc;
+ price = gaItems[Index].Price;
+ status = gaItems[Index].Status;
+ break;
+ }
+ Index -= 7;
+ // EPS label
+ if( Index == 0 )
+ {
+ price = 0;
+ name = "Electronic Payment System";
+ Index = -1; // -1 indicates a label
+ break;
+ }
+ Index --;
+ Index += 7;
name = gaItems[Index].Desc;
price = gaItems[Index].Price;
+ status = gaItems[Index].Status;
+ break;
+ default:
+ return -1;
}
- // Spacer hack (Desc = "-")
- if( gaItems[Index].Desc[0] == '-' && gaItems[Index].Desc[1] == '\0' )
+ // Width = 0, don't print
+ if( Width > 0 )
{
- return;
+ move( Row, Col );
+
+ if( Index >= 0 )
+ {
+ // Show hilight and status
+ switch( status )
+ {
+ case 0:
+ if( bHilighted )
+ printw("-> ");
+ else
+ printw(" ");
+ break;
+ case 1:
+ printw("SLD");
+ break;
+
+ default:
+ case -1:
+ printw("ERR");
+ break;
+ }
+
+ printw(" %s", name);
+
+ getyx(stdscr, _y, _x);
+ // Assumes max 4 digit prices
+ times = Width - 5 - (_x - Col); // TODO: Better handling for large prices
+ while(times--) addch(' ');
+
+ printw(" %4i", price);
+ }
+ else
+ {
+ printw("-- %s", name);
+ getyx(stdscr, _y, _x);
+ times = Width - 4 - (_x - Col);
+ while(times--) addch(' ');
+ printw(" ");
+ }
}
-
- 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);
+ // If the item isn't availiable for sale, return -1 (so it's skipped)
+ if( status )
+ Index = -1;
+
+ return Index;
}
/**
return 0;
}
+/**
+ * \brief Read an item info response from the server
+ * \param Dest Destination for the read item (strings will be on the heap)
+ */
+int ReadItemInfo(int Socket, tItem *Dest)
+{
+ char *buf;
+ int responseCode;
+
+ regmatch_t matches[8];
+ char *statusStr;
+
+ // Get item info
+ buf = ReadLine(Socket);
+ responseCode = atoi(buf);
+
+ switch(responseCode)
+ {
+ case 202: break;
+
+ case 406:
+ printf("Bad item name\n");
+ free(buf);
+ return 1;
+
+ default:
+ fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n%s", responseCode, buf);
+ exit(-1);
+ }
+
+ RunRegex(&gItemRegex, buf, 8, matches, "Malformed server response");
+
+ buf[ matches[3].rm_eo ] = '\0';
+ buf[ matches[5].rm_eo ] = '\0';
+ buf[ matches[7].rm_eo ] = '\0';
+
+ statusStr = &buf[ matches[5].rm_so ];
+
+ Dest->ID = atoi( buf + matches[4].rm_so );
+
+ if( strcmp(statusStr, "avail") == 0 )
+ Dest->Status = 0;
+ else if( strcmp(statusStr, "sold") == 0 )
+ Dest->Status = 1;
+ else if( strcmp(statusStr, "error") == 0 )
+ Dest->Status = -1;
+ else {
+ fprintf(stderr, "Unknown response from dispense server (status '%s')\n",
+ statusStr);
+ return 1;
+ }
+ Dest->Price = atoi( buf + matches[6].rm_so );
+
+ // Hack a little to reduce heap fragmentation
+ {
+ char tmpType[strlen(buf + matches[3].rm_so) + 1];
+ char tmpDesc[strlen(buf + matches[7].rm_so) + 1];
+ strcpy(tmpType, buf + matches[3].rm_so);
+ strcpy(tmpDesc, buf + matches[7].rm_so);
+ free(buf);
+ Dest->Type = strdup( tmpType );
+ Dest->Desc = strdup( tmpDesc );
+ }
+
+ return 0;
+}
/**
* \brief Fill the item information structure
// Fetch item information
for( i = 0; i < giNumItems; i ++ )
{
- regmatch_t matches[7];
-
- // Get item info
- buf = ReadLine(Socket);
- responseCode = atoi(buf);
-
- if( responseCode != 202 ) {
- fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n", responseCode);
- exit(-1);
- }
-
- RunRegex(&gItemRegex, buf, 7, matches, "Malformed server response");
-
- buf[ matches[3].rm_eo ] = '\0';
-
- 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);
+ ReadItemInfo( Socket, &gaItems[i] );
}
// Read end of list
*/
int Dispense_ItemInfo(int Socket, const char *Type, int ID)
{
- int responseCode;
- char *buf;
- regmatch_t matches[7];
- char *type, *desc;
- int id, price;
+ tItem item;
- // Dispense!
+ // Query
sendf(Socket, "ITEM_INFO %s:%i\n", Type, ID);
- buf = ReadLine(Socket);
- responseCode = atoi(buf);
- switch( responseCode )
+ if( ReadItemInfo(Socket, &item) )
{
- case 202:
- break;
-
- case 406:
- printf("Bad item name\n");
- free(buf);
- return 1;
-
- default:
- printf("Unknown response code %i ('%s')\n", responseCode, buf);
- free(buf);
return -1;
}
-
- RunRegex(&gItemRegex, buf, 7, matches, "Malformed server response");
-
- buf[ matches[3].rm_eo ] = '\0';
+ printf("%8s:%-2i %2i.%02i %s\n",
+ item.Type, item.ID,
+ item.Price/100, item.Price%100,
+ item.Desc);
- type = buf + matches[3].rm_so; buf[matches[3].rm_eo] = '\0';
- id = atoi( buf + matches[4].rm_so );
- price = atoi( buf + matches[5].rm_so );
- desc = buf + matches[6].rm_so; buf[matches[6].rm_eo] = '\0';
-
- printf("%8s:%-2i %2i.%02i %s\n", type, id, price/100, price%100, desc);
-
- free(buf);
+ free(item.Type);
+ free(item.Desc);
return 0;
}
git.ucc.asn.au / tpg / opendispense2.git / blobdiff
UCC git Repository :: git.ucc.asn.au