X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fitemdb.c;h=e48ab868a7a50278cd0479a7c0933566ee69b6a0;hb=ec400f11ebc2e81079e464145915fb2d25602fbc;hp=87ced4ec392078706edf884a3f71efe1228a5476;hpb=4b597ccec76234944c19a9fb5d4f5d63e5671807;p=tpg%2Fopendispense2.git

diff --git a/src/server/itemdb.c b/src/server/itemdb.c
index 87ced4e..e48ab86 100644
--- a/src/server/itemdb.c
+++ b/src/server/itemdb.c
@@ -13,21 +13,32 @@
 #include <ctype.h>
 #include "common.h"
 #include <regex.h>
+#include <sys/stat.h>
+#include <time.h>
 
 // === IMPORTS ===
 extern tHandler	gCoke_Handler;
+extern tHandler	gSnack_Handler;
+extern tHandler	gDoor_Handler;
 
 // === PROTOTYPES ===
+void	Init_Handlers(void);
 void	Load_Itemlist(void);
+void	Items_ReadFromFile(void);
 char	*trim(char *__str);
 
 // === GLOBALS ===
  int	giNumItems = 0;
 tItem	*gaItems = NULL;
+time_t	gItems_LastUpdated;
 tHandler	gPseudo_Handler = {Name:"pseudo"};
-tHandler	*gaHandlers[] = {&gPseudo_Handler, &gCoke_Handler};
+tHandler	*gaHandlers[] = {&gPseudo_Handler, &gCoke_Handler, &gSnack_Handler, &gDoor_Handler};
  int	giNumHandlers = sizeof(gaHandlers)/sizeof(gaHandlers[0]);
 char	*gsItemListFile = DEFAULT_ITEM_FILE;
+#if USE_INOTIFY
+ int	giItem_INotifyFD;
+#endif
+regex_t	gItemFile_Regex;
 
 // === CODE ===
 void Init_Handlers()
@@ -38,33 +49,87 @@ void Init_Handlers()
 		if( gaHandlers[i]->Init )
 			gaHandlers[i]->Init(0, NULL);	// TODO: Arguments
 	}
+	
+	// Use inotify to watch the snack config file
+	#if USE_INOTIFY
+	{
+		int oflags;
+		
+		giItem_INotifyFD = inotify_init();
+		inotify_add_watch(giItem_INotifyFD, gsItemListFile, IN_MODIFY);
+		
+		// Handle SIGIO
+		signal(SIGIO, &ItemList_Changed);
+		
+		// Fire SIGIO when data is ready on the FD
+		fcntl(giItem_INotifyFD, F_SETOWN, getpid());
+		oflags = fcntl(giItem_INotifyFD, F_GETFL);
+		fcntl(giItem_INotifyFD, F_SETFL, oflags | FASYNC);
+	}
+	#endif
+}
+
+#if USE_INOTIFY
+void ItemList_Changed(int signum)
+{
+	char	buf[512];
+	read(giItem_INotifyFD, buf, 512);
+	Load_Itemlist();
+	
+	signum = 0;	// Shut up GCC
 }
+#endif
 
 /**
- * \brief Read the item list from disk
+ * \brief Read the initiali item list
  */
 void Load_Itemlist(void)
 {
-	FILE	*fp = fopen(gsItemListFile, "r");
+	 int	rv;
+	rv = regcomp(&gItemFile_Regex, "^-?([a-zA-Z][a-zA-Z]*)\\s+([0-9]+)\\s+([0-9]+)\\s+(.*)", REG_EXTENDED);
+	if( rv )
+	{
+		size_t	len = regerror(rv, &gItemFile_Regex, NULL, 0);
+		char	errorStr[len];
+		regerror(rv, &gItemFile_Regex, errorStr, len);
+		fprintf(stderr, "Rexex compilation failed - %s\n", errorStr);
+		exit(-1);
+	}
+	
+	Items_ReadFromFile();
+	
+	// Re-read the item file periodically
+	// TODO: Be less lazy here and check the timestamp
+	AddPeriodicFunction( Items_ReadFromFile );
+}
+/**
+ * \brief Read the item list from disk
+ */
+void Items_ReadFromFile(void)
+{
+	FILE	*fp;
 	char	buffer[BUFSIZ];
 	char	*line;
 	 int	lineNum = 0;
-	 int	i;
-	regex_t	regex;
+	 int	i, numItems = 0;
+	tItem	*items = NULL;
 	regmatch_t	matches[5];
-	
-	i = regcomp(&regex, "^([a-zA-Z][a-zA-Z0-9]*)\\s+([0-9]+)\\s+([0-9]+)\\s+(.*)", REG_EXTENDED);
-	if( i )
+
+	if( gItems_LastUpdated ) 
 	{
-		size_t	len = regerror(i, &regex, NULL, 0);
-		char	*errorStr = malloc(len);
-		regerror(i, &regex, errorStr, len);
-		fprintf(stderr, "Rexex compilation failed - %s\n", errorStr);
-		free(errorStr);
-		exit(-1);
+		struct stat buf;
+		if( stat(gsItemListFile, &buf) ) {
+			fprintf(stderr, "Unable to stat() item file '%s'\n", gsItemListFile);
+			return ;
+		}
+		
+		// Check if the update is needed
+		if( gItems_LastUpdated > buf.st_mtime )
+			return ;
 	}
 
 	// Error check
+	fp = fopen(gsItemListFile, "r");
 	if(!fp) {
 		fprintf(stderr, "Unable to open item file '%s'\n", gsItemListFile);
 		perror("Unable to open item file");
@@ -91,13 +156,9 @@ void Load_Itemlist(void)
 		if(strlen(line) == 0)	continue;
 		
 		// Pass regex over line
-		if( (i = regexec(&regex, line, 5, matches, 0)) ) {
-			size_t  len = regerror(i, &regex, NULL, 0);
-			char    *errorStr = malloc(len);
-			regerror(i, &regex, errorStr, len);
-			fprintf(stderr, "Syntax error on line %i of item file '%s'\n%s", lineNum, gsItemListFile, errorStr);
-			free(errorStr);
-			exit(-1);
+		if( RunRegex( &gItemFile_Regex, line, 5, matches, NULL) ) {
+			fprintf(stderr, "Syntax error on line %i of item file '%s'\n", lineNum, gsItemListFile);
+			return ;
 		}
 
 		// Read line data
@@ -122,26 +183,41 @@ void Load_Itemlist(void)
 			continue ;
 		}
 
-		for( i = 0; i < giNumItems; i ++ )
+		for( i = 0; i < numItems; i ++ )
 		{
-			if( gaItems[i].Handler != handler )	continue;
-			if( gaItems[i].ID != num )	continue;
+			if( items[i].Handler != handler )	continue;
+			if( items[i].ID != num )	continue;
 
 			printf("Redefinition of %s:%i, updated\n", handler->Name, num);
-			gaItems[i].Price = price;
-			free(gaItems[i].Name);
-			gaItems[i].Name = strdup(desc);
+			items[i].Price = price;
+			free(items[i].Name);
+			items[i].Name = strdup(desc);
 			break;
 		}
-		if( i < giNumItems )	continue;
-
-		gaItems = realloc( gaItems, (giNumItems + 1)*sizeof(gaItems[0]) );
-		gaItems[giNumItems].Handler = handler;
-		gaItems[giNumItems].ID = num;
-		gaItems[giNumItems].Price = price;
-		gaItems[giNumItems].Name = strdup(desc);
-		giNumItems ++;
-	}	
+		if( i < numItems )	continue;
+
+		items = realloc( items, (numItems + 1)*sizeof(items[0]) );
+		items[numItems].Handler = handler;
+		items[numItems].ID = num;
+		items[numItems].Price = price;
+		items[numItems].Name = strdup(desc);
+		items[numItems].bHidden = (line[0] == '-');
+		numItems ++;
+	}
+	
+	// Clean up old
+	if( giNumItems )
+	{
+		giNumItems = 0;
+		free(gaItems);
+		gaItems = NULL;
+	}
+	
+	// Replace with new
+	giNumItems = numItems;
+	gaItems = items;
+	
+	gItems_LastUpdated = time(NULL);
 }
 
 char *trim(char *__str)