X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fitemdb.c;h=8f2cfeccd0a1cad82cb33f153b85413ea30c048f;hb=0e15ed888a4d398530a74a6b713414e649767358;hp=e48ab868a7a50278cd0479a7c0933566ee69b6a0;hpb=76d7ff31e2bb0ace116d9c995c007d857c41cdff;p=tpg%2Fopendispense2.git

diff --git a/src/server/itemdb.c b/src/server/itemdb.c
index e48ab86..8f2cfec 100644
--- a/src/server/itemdb.c
+++ b/src/server/itemdb.c
@@ -16,6 +16,8 @@
 #include <sys/stat.h>
 #include <time.h>
 
+#define DUMP_ITEMS	0
+
 // === IMPORTS ===
 extern tHandler	gCoke_Handler;
 extern tHandler	gSnack_Handler;
@@ -31,7 +33,7 @@ char	*trim(char *__str);
  int	giNumItems = 0;
 tItem	*gaItems = NULL;
 time_t	gItems_LastUpdated;
-tHandler	gPseudo_Handler = {Name:"pseudo"};
+tHandler	gPseudo_Handler = {.Name="pseudo"};
 tHandler	*gaHandlers[] = {&gPseudo_Handler, &gCoke_Handler, &gSnack_Handler, &gDoor_Handler};
  int	giNumHandlers = sizeof(gaHandlers)/sizeof(gaHandlers[0]);
 char	*gsItemListFile = DEFAULT_ITEM_FILE;
@@ -81,7 +83,7 @@ void ItemList_Changed(int signum)
 #endif
 
 /**
- * \brief Read the initiali item list
+ * \brief Read the initial item list
  */
 void Load_Itemlist(void)
 {
@@ -102,6 +104,7 @@ void Load_Itemlist(void)
 	// TODO: Be less lazy here and check the timestamp
 	AddPeriodicFunction( Items_ReadFromFile );
 }
+
 /**
  * \brief Read the item list from disk
  */
@@ -133,6 +136,7 @@ void Items_ReadFromFile(void)
 	if(!fp) {
 		fprintf(stderr, "Unable to open item file '%s'\n", gsItemListFile);
 		perror("Unable to open item file");
+		return ;
 	}
 	
 	while( fgets(buffer, BUFSIZ, fp) )
@@ -167,7 +171,9 @@ void Items_ReadFromFile(void)
 		price = atoi( line + matches[3].rm_so );
 		desc  = line + matches[4].rm_so;	
 
+		#if DUMP_ITEMS
 		printf("Item '%s' - %i cents, %s:%i\n", desc, price, type, num);
+		#endif
 
 		handler = NULL;
 		for( i = 0; i < giNumHandlers; i ++ )
@@ -188,7 +194,9 @@ void Items_ReadFromFile(void)
 			if( items[i].Handler != handler )	continue;
 			if( items[i].ID != num )	continue;
 
+			#if DUMP_ITEMS
 			printf("Redefinition of %s:%i, updated\n", handler->Name, num);
+			#endif
 			items[i].Price = price;
 			free(items[i].Name);
 			items[i].Name = strdup(desc);
@@ -220,6 +228,168 @@ void Items_ReadFromFile(void)
 	gItems_LastUpdated = time(NULL);
 }
 
+/**
+ * \brief Update the item file from the internal database
+ */
+void Items_UpdateFile(void)
+{
+	FILE	*fp;
+	char	buffer[BUFSIZ];
+	char	*line;
+	 int	lineNum = 0;
+	 int	i;
+	regmatch_t	matches[5];
+	char	**line_comments;
+	 int	*line_items;
+
+	// Error check
+	fp = fopen(gsItemListFile, "r");
+	if(!fp) {
+		fprintf(stderr, "Unable to open item file '%s'\n", gsItemListFile);
+		perror("Unable to open item file");
+		return ;
+	}
+	
+	// Count lines
+	while( fgets(buffer, BUFSIZ, fp) )
+	{
+		lineNum ++;
+	}
+	
+	line_comments = malloc(lineNum * sizeof(char*));
+	line_items = malloc(lineNum * sizeof(int));
+	
+	// Parse file
+	lineNum = 0;
+	fseek(fp, 0, SEEK_SET);
+	while( fgets(buffer, BUFSIZ, fp) )
+	{
+		char	*hashPos, *semiPos;
+		char	*type;
+		 int	num;
+		tHandler	*handler;
+
+		trim(buffer);
+
+		lineNum ++;
+		line_items[lineNum-1] = -1;
+		line_comments[lineNum-1] = NULL;
+
+		// Get comments
+		hashPos = strchr(buffer, '#');
+		semiPos = strchr(buffer, ';');
+		if( hashPos && semiPos ) {
+			if( hashPos < semiPos )
+				line_comments[lineNum-1] = strdup(hashPos);
+		}
+		else if( hashPos ) {
+			line_comments[lineNum-1] = strdup(hashPos);
+		}
+		else if( semiPos ) {
+			line_comments[lineNum-1] = strdup(semiPos);
+		}
+		if(hashPos)	*hashPos = '\0';
+		if(semiPos)	*semiPos = '\0';
+		
+		// Trim whitespace
+		line = trim(buffer);
+		if(strlen(line) == 0)	continue;
+		
+		// Pass regex over line
+		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
+		type  = line + matches[1].rm_so;	line[ matches[1].rm_eo ] = '\0';
+		num   = atoi( line + matches[2].rm_so );
+
+		// Find handler
+		handler = NULL;
+		for( i = 0; i < giNumHandlers; i ++ )
+		{
+			if( strcmp(type, gaHandlers[i]->Name) == 0 ) {
+				handler = gaHandlers[i];
+				break;
+			}
+		}
+		if( !handler ) {
+			fprintf(stderr, "Warning: Unknown item type '%s' on line %i\n", type, lineNum);
+			continue ;
+		}
+
+		for( i = 0; i < giNumItems; i ++ )
+		{
+			if( gaItems[i].Handler != handler )	continue;
+			if( gaItems[i].ID != num )	continue;
+			
+			line_items[lineNum-1] = i;
+			break;
+		}
+		if( i >= giNumItems ) {
+			continue;
+		}
+	}
+	
+	fclose(fp);
+	
+	//fp = fopen("items.cfg.new", "w");	// DEBUG: Don't kill the real item file until debugged
+	fp = fopen(gsItemListFile, "w");
+	
+	// Create new file
+	{
+		 int	done_items[giNumItems];
+		memset(done_items, 0, sizeof(done_items));
+		
+		// Existing items
+		for( i = 0; i < lineNum; i ++ )
+		{
+			if( line_items[i] != -1 ) {
+				tItem	*item = &gaItems[ line_items[i] ];
+				
+				if( done_items[ line_items[i] ] ) {
+					fprintf(fp, "; DUP -");
+				}
+				done_items[ line_items[i] ] = 1;
+				
+				if( item->bHidden )
+					fprintf(fp, "-");
+				
+				fprintf(fp, "%s\t%i\t%i\t%s\t",
+					item->Handler->Name, item->ID, item->Price, item->Name
+					);
+			}
+			
+			if( line_comments[i] ) {
+				fprintf(fp, "%s", line_comments[i]);
+				free( line_comments[i] );
+			}
+			
+			fprintf(fp, "\n");
+		}
+		
+		// New items
+		for( i = 0; i < giNumItems; i ++ )
+		{
+			tItem	*item = &gaItems[i];
+			if( done_items[i] )	continue ;
+			
+			if( item->bHidden )
+				fprintf(fp, "-");
+			
+			fprintf(fp, "%s\t%i\t%i\t%s\n",
+				item->Handler->Name, item->ID, item->Price, item->Name
+				);
+		}
+	}
+	
+	free( line_comments );
+	free( line_items );
+	fclose(fp);
+}
+
+
 char *trim(char *__str)
 {
 	char	*ret;