incremental updates and command-list/update kung fu

TODO

 1) non-blocking (for other clients) update
-	a) have two commands, one that blocks and returns updated info and another command that doesn't block
-	b) allow incremental updating, either a directory recursively or a specific song
-	c) fork on update
-	d) have a special case where if a update is in a command list, it only forks at the beginning of the list, and writes at the end of the command list
-	e) add an element to status stating the "update state"
-	f) store stuff to updated in a linked list prior to update fork
-	g) update child writes db file, parents reads db file when done (the msells/sbh alogrithm)
-	h) when reading directory db and checking for deleted, new, or changed stuff, assume all info is sorted (so we can deterimine if its new very quickly without searching through lists of stuff every time).  Also, for new stuff, insert it with insertInListBeforeNode() function, to keep lists sorted.
 	j) when reading new directory db, we should block some signals when manipulating the directorydb, so we don't receive a signal to quit in the middle of an update
 	k) when bg-update, have parent print out new old stuff to log on reading db, not the child
-	l) return a job-id for each update-job, the job id can be polled in status
+	l) IMPORTANT: look over new command list shiznit and make it much cleaner, please! (in particular, move buffer2array code from interface.c to command.c, and have command stuff do buffer2array)
 
 2) rewrite interface stuff, specifically command list handling etc so its less of a hack and deals with the above update stuff better
 

src/command.h

@@ -21,6 +21,8 @@
 
 #include "../config.h"
 
+#include "list.h"
+
 #include <stdio.h>
 
 #define COMMAND_RETURN_KILL	10
@@ -30,7 +32,7 @@
 #define COMMAND_RESPOND_OK	"OK"
 
 int processCommand(FILE * fp, unsigned int * permission, int argArrayLength, 
-		char ** argArray);
+		char ** argArray, ListNode * commandNode);
 
 void initCommands();
 

src/directory.c

@@ -90,8 +90,15 @@ int updateDirectory(Directory * directory);
 
 void deleteEmptyDirectoriesInDirectory(Directory * directory);
 
+void removeSongFromDirectory(Directory * directory, char * shortname);
+
 int addSubDirectoryToDirectory(Directory * directory, char * shortname, char * name);
 
+Directory * getDirectory(char * name);
+
+Song * getSongDetails(char * file, char ** shortnameRet, 
+		Directory ** directoryRet);
+
 int isUpdatingDB() {
 	if(directory_updatePid>0) return directory_updateJobId;
 	return 0;
@@ -114,7 +121,7 @@ void directory_sigChldHandler(int pid, int status) {
 	}
 }
 
-int updateInit(FILE * fp) {
+int updateInit(FILE * fp, List * pathList) {
 	if(directory_updatePid > 0) {
 		myfprintf(fp,"%s already updating\n",COMMAND_RESPOND_ERROR);
 		return -1;
@@ -137,7 +144,41 @@ int updateInit(FILE * fp) {
                	finishPlaylist();
 		finishVolume();
 
-		if(updateMp3Directory(stderr)) exit(EXIT_FAILURE);
+		if(pathList) {
+			ListNode * node = pathList->firstNode;
+			Directory * directory;
+			Song * song;
+			char * shortname;
+
+			while(node) {
+				if(NULL==(directory = getDirectory(node->key)))
+				{
+					song = getSongDetails(node->key,
+							&shortname,&directory);
+					if(song && updateSongInfo(song)<0) {
+						removeSongFromDirectory(
+							directory,
+							shortname);
+					}
+				}
+				else {
+					if(updateDirectory(directory)<0)  {
+						ERROR("problems updating music "
+							"db\n");
+						exit(EXIT_FAILURE);
+					}
+				}
+				node = node->nextNode;
+			}
+		}
+		else if(updateDirectory(mp3rootDirectory)<0) exit(EXIT_FAILURE);
+		if(writeDirectoryDB()<0) {
+			ERROR("problems writing music db file, \"%s\"\n",
+					directorydb);
+			myfprintf(fp,"%s problems writing music db\n",
+					COMMAND_RESPOND_ERROR);
+			exit(EXIT_FAILURE);
+		}
 		exit(EXIT_SUCCESS);
 	}
 	else if(directory_updatePid < 0) {
@@ -950,7 +991,9 @@ void initMp3Directory() {
 	exploreDirectory(mp3rootDirectory);
 }
 
-Song * getSong(char * file) {
+Song * getSongDetails(char * file, char ** shortnameRet, 
+		Directory ** directoryRet)
+{
 	void * song;
 	Directory * directory;
 	char * dir = NULL;
@@ -983,9 +1026,15 @@ Song * getSong(char * file) {
 	}
 
 	free(dup);
+	if(shortnameRet) *shortnameRet = shortname;
+	if(directoryRet) *directoryRet = directory;
 	return (Song *)song;
 }
 
+Song * getSong(char * file) {
+	return getSongDetails(file,NULL,NULL);
+}
+
 time_t getDbModTime() {
 	time_t mtime = 0;
 	struct stat st;

src/directory.h

@@ -22,6 +22,7 @@
 #include "../config.h"
 
 #include "song.h"
+#include "list.h"
 
 #include <stdio.h>
 #include <sys/param.h>
@@ -32,7 +33,7 @@ int isUpdatingDB();
 
 void directory_sigChldHandler(int pid, int status);
 
-int updateInit(FILE * fp);
+int updateInit(FILE * fp, List * pathList);
 
 void initMp3Directory();
 

src/interface.c

@@ -233,6 +233,7 @@ int interfaceReadInput(Interface * interface) {
 				if(argArrayLength==0);
 				else if(strcmp(argArray[0],INTERFACE_LIST_MODE_END)==0) {
 					ListNode * node = interface->commandList->firstNode;
+					ListNode * tempNode;
 					ret = 0;
 
 					while(node!=NULL) {
@@ -240,12 +241,16 @@ int interfaceReadInput(Interface * interface) {
 						int argArrayLength;
 						argArrayLength = buffer2array((char *)node->data,&argArray);
 						DEBUG("interface %i: process command \"%s\"\n",interface->num,node->data);
-						ret = processCommand(interface->fp,&(interface->permission),argArrayLength,argArray);
+						ret = processCommand(interface->fp,&(interface->permission),argArrayLength,argArray,node);
 						DEBUG("interface %i: command returned %i\n",interface->num,ret);
 						freeArgArray(argArray,argArrayLength);
-						node = node->nextNode;
-						if(ret!=0 || 
-							interface->expired) {
+						tempNode = node->nextNode;
+						deleteNodeFromList(
+							interface->commandList,
+							node);
+						node = tempNode;
+						if(ret!=0 || interface->expired)
+						{
 							node = NULL;
 						}
 					}
@@ -295,7 +300,7 @@ int interfaceReadInput(Interface * interface) {
 					}
 					else {
 						DEBUG("interface %i: process command \"%s\"\n",interface->num,interface->buffer);
-						ret = processCommand(interface->fp,&(interface->permission),argArrayLength,argArray);
+						ret = processCommand(interface->fp,&(interface->permission),argArrayLength,argArray,NULL);
 						DEBUG("interface %i: command returned %i\n",interface->num,ret);
 					}
 					if(ret==0) {