diff --git a/demo.c b/demo.c index cdb6869..58ada31 100644 --- a/demo.c +++ b/demo.c @@ -1,30 +1,90 @@ -#include +// #include +// #include +// +// int main() { +// char* string = intToString(1729843); +// +// printf("final string: %s\n", string); +// +// char* sstring = intToString(123); +// +// printf("final string: %s\n", sstring); +// +// return 0; +// } + +#include #include int main() { - list_t* l = listInit(); + printf("creating a file using 'fileInit()' (returns a file_t*)\n"); + file_t* f = fileInit("test.txt"); - listPush(l, INT, &(int){5}); - listPush(l, INT, &(int){2}); - listPush(l, INT, &(int){1}); + printf("printing the file contents\n\n"); + filePrint(f); - listSetAt(l, 1, FLOAT, &(float){3.14}); + printf("\nconvering the file contents into a string (char*)\n"); + char* string = fileToString(f); + printf("\"\"\"\n%s\"\"\"\n", string); - printf("value at index 2 in list l:\n"); - int val = *((int*)listGetAt(l, 2)); - printf("%d\n", val); + printf("writing is quite simple, just call the 'fileWrite(file_t*, char*)' or 'fileWriteln(file_t*, char*)' function, where the second argument is the string you want to write into a file\nthe 'fileWriteln()' function writes the specified string AND a '\\n' after it, whereas the 'fileWrite()' function does not append the '\\n'\n"); + fileWrite(f, "'this will not end with a \"\\n\"' "); + fileWriteln(f, "this line was appended"); + filePrint(f); - list_t* m = listInit(); + printf("if you are finished working with the file BEFORE the immediate end of the program, run 'fileCleanup(file_t*)', otherwise it is not strictly necessary\nit will, though, append a '\\n' at the end of the file if you have not done so, making writing into files more consistent, so for this reason, I recommend you use it with every file_t*\n"); + fileCleanup(f); - listPush(m, CHAR, &(char){'a'}); - listPush(m, CHAR, &(char){'b'}); - listPush(m, CHAR, &(char){'c'}); + printf("copying and moving\nafter this block of code, the contents of test.txt will have been copied into copy_of_test.txt and moved to moved_copy_of_test.txt, which means that copy_of_test.txt is deleted and the contents of test.txt are only in test.txt and moved_copy_of_test.txt\n"); - listSetAt(l, 2, LIST, m); + file_t* src = fileInit("test.txt"); - listPrint(l); + fileCopy(src, "copy_of_test.txt"); - listCleanup(l); + printf("src:\n"); + filePrint(src); + + printf("\ndst:\n"); + file_t* dst = fileInit("copy_of_test.txt"); + filePrint(dst); + + fileMove(dst, "moved_copy_of_test.txt"); + + printf("moved file:\n"); + file_t* move_dst = fileInit("moved_copy_of_test.txt"); + filePrint(move_dst); + + fileCleanup(src); + printf("DO NOT cleanup a deleted file! (dst, in this case) it is already done for you by the 'fileMove(file_t*, char*)' function\n"); + // fileCleanup(dst); + fileCleanup(move_dst); + + printf("when copying and moving files, the first argument is a file_t* (source file) and the second argument is a char* (the path of the destination file), not a file_t*!\n"); + + printf("prepending line numbers at the beggining of each line in a file\n"); + + file_t* g = fileInit("test.txt"); + fileCopy(g, "copy_of_test.txt"); + file_t* g_copy = fileInit("copy_of_test.txt"); + fileNumberLines(g_copy); + + printf("file withOUT prepended numbers:\n"); + filePrint(g); + + printf("file with prepended numbers:\n"); + filePrint(g_copy); + + fileCleanup(g); + //fileCleanup(g_copy); + + printf("counting words in a file\n"); + + file_t* words = fileInit("test.txt"); + + int word_count = fileCountWords(words); + printf("word count of file %s is %d\n", words->path, word_count); + + fileCleanup(words); return 0; } diff --git a/examples/file/filedemo.c b/examples/file/filedemo.c index b5bd377..58ada31 100644 --- a/examples/file/filedemo.c +++ b/examples/file/filedemo.c @@ -77,5 +77,14 @@ int main() { fileCleanup(g); //fileCleanup(g_copy); + printf("counting words in a file\n"); + + file_t* words = fileInit("test.txt"); + + int word_count = fileCountWords(words); + printf("word count of file %s is %d\n", words->path, word_count); + + fileCleanup(words); + return 0; } diff --git a/include/file.h b/include/file.h index 6decd7c..036f82d 100644 --- a/include/file.h +++ b/include/file.h @@ -34,4 +34,6 @@ void fileCreateEmpty(char* path); // create an empty file with the given name void fileNumberLines(file_t* f); // prepend line numbers in front of each line in a file +int fileCountWords(file_t* f); // counts the number of words in a file + #endif diff --git a/src/file.c b/src/file.c index 522990b..075b82a 100644 --- a/src/file.c +++ b/src/file.c @@ -256,3 +256,24 @@ fileNumberLines(file_t* f) { fclose(fd); } + +int +fileCountWords(file_t* f) { + int num_words = 0; + char prev; + for (int i = 0; i < f->length; i++) { + for (int j = 0; j < ((vector_t*)vectorGetAt(f->lines, i))->size; j++) { + char ch = *((char*)vectorGetAt((vector_t*)vectorGetAt(f->lines, i), j)); + if ( + (ch == ' ' && prev != ' ') || + (i == f->length-1 && j == ((vector_t*)vectorGetAt(f->lines, i))->size-1) || + (j == ((vector_t*)vectorGetAt(f->lines, i))->size-1 && j != 0) + ) { + num_words++; + } + prev = ch; + } + } + + return num_words; +} diff --git a/test.txt b/test.txt index 872a1fa..57a33df 100644 --- a/test.txt +++ b/test.txt @@ -4,4 +4,5 @@ and this was an empty line !#%!@# <- symbols! -about 1100 lines of implementation code, not including .h files and demos nad Makefiles and stuff like that +about 1100 lines of implementation code, not including .h files and demos and Makefiles and stuff like that +'this will not end with a "\n"' this line was appended