Fix wrong packer args detection

* Also added packer flags description.
* And packer --help message.
* Fixed pack-info items print.

Author: cfnptr

README.md

@@ -106,7 +106,14 @@ Creates compressed data pack from files.
 
 * Usage: ```packer [-z, -v, -s] <pack-path> <file-path-1> <item-path-1>...```
 * Example: ```packer resources.pack C:/Users/user/Desktop/sky.png images/sky.png```
-* Arguments: [-z zipThreshold, -v dataVersion, -s preferSpeed]
+
+#### Arguments:
+
+* ```-z <zipThreshold>```: Specifies file compression threshold when we just pack file without compressing it. 
+It's used for already compressed resources like images. Default value is 10. (0% - 100% range)
+* ```-v <dataVersion>```: Specifies ```resources.pack``` file version. It's used to check if we are 
+loading correct resources pack for a current game or application version. Default value is 0.
+* ```-s```: Use faster decompression algorithm sacrificing resources pack file size.
 
 ### unpacker
 

source/reader.c

@@ -123,7 +123,6 @@ PackResult createFilePackReader(const char* filePath, uint32_t dataVersion,
 	PackReader packReaderInstance = calloc(1, sizeof(PackReader_T));
 	if (!packReaderInstance)
 		return FAILED_TO_ALLOCATE_PACK_RESULT;
-
 	packReaderInstance->threadCount = threadCount;
 
 	char* path;

utilities/pack_info.c

@@ -17,11 +17,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+static void printPackInfoHelp()
+{
+	printf("Usage: pack-info <pack-path>\n");
+}
+
 int main(int argc, char *argv[])
 {
 	if (argc != 2)
 	{
-		printf("Usage: pack-info <pack-path>\n");
+		printPackInfoHelp();
 		return EXIT_FAILURE;
 	}
 
@@ -34,8 +39,8 @@ int main(int argc, char *argv[])
 		return EXIT_FAILURE;
 	}
 
-	printf("Pack [v%d.%d.%d]\n\n"
-		"Pack information:\n"
+	printf("pack-info [v%d.%d.%d]\n\n"
+		"Pack header:\n"
 		"    File version: %d.%d.%d\n"
 		"    Data version: %u\n"
 		"    Big endian: %s\n"
@@ -47,30 +52,35 @@ int main(int argc, char *argv[])
 		(long long unsigned int)header.itemCount);
 
 	PackReader packReader;
-	result = createFilePackReader(argv[1], 0, false, header.dataVersion, &packReader);
+	result = createFilePackReader(argv[1], header.dataVersion, false, 1, &packReader);
 	if (result != SUCCESS_PACK_RESULT)
 	{
 		printf("\nError: %s.\n", packResultToString(result));
 		return EXIT_FAILURE;
 	}
 
 	uint64_t itemCount = getPackItemCount(packReader);
+	uint64_t totalDataSize = 0, totalZipSize = 0;
+
 	for (uint64_t i = 0; i < itemCount; ++i)
 	{
+		uint32_t dataSize = getPackItemDataSize(packReader, i);
+		uint32_t zipSize = getPackItemZipSize(packReader, i);
+		totalDataSize += dataSize; totalZipSize += zipSize;
+
 		printf("Item %llu:\n"
 			"    Path: %s\n"
-			"    Data size: %u\n"
-			"    Zip size: %u\n"
-			"    File offset: %llu\n"
-			"    Reference: %s\n",
-			(long long unsigned int)i,
-			getPackItemPath(packReader, i),
-			getPackItemDataSize(packReader, i),
-			getPackItemZipSize(packReader, i),
-			(long long unsigned int)getPackItemFileOffset(packReader, i),
+			"    Data size: %u bytes\n"
+			"    Zip size: %u bytes\n"
+			"    File offset: %llu bytes\n"
+			"    Is reference: %s\n",
+			(long long unsigned int)i, getPackItemPath(packReader, i), dataSize, 
+			zipSize, (long long unsigned int)getPackItemFileOffset(packReader, i),
 			isPackItemReference(packReader, i) ? "true" : "false");
 		fflush(stdout);
 	}
 
+	printf("\nTotal zip/data size: %llu/%llu bytes.\n",
+		(long long unsigned int)totalZipSize, (long long unsigned int)totalDataSize);
 	return EXIT_SUCCESS;
 }

utilities/packer.c

@@ -18,11 +18,29 @@
 #include <stdlib.h>
 #include <string.h>
 
+static void printPackerHelp()
+{
+	/////////////////////////////////////////////////////////////////////////////////////
+	printf("Usage: packer [-z, -v, -s] <pack-path> <file-path-1> <item-path-1>...\n"
+		"\n"
+		"Note that file path and item path may differ!\n"
+		"\n"
+		"Options:\n"
+		"  -z <zipThreshold> Specifies file compression threshold when we just pack file \n"
+		"                    without compressing it. It's used for already compressed \n"
+		"                    resources like images. Default value is 10. (0% - 100% range)\n"
+		"  -v <dataVersion>  Specifies pack file version. It's used to check if we are \n"
+		"                    loading correct resources pack for a current game or \n"
+		"                    application version. Default value is 0.\n"
+		" -s Use faster decompression algorithm sacrificing resources pack file size.\n"
+	);
+}
+
 int main(int argc, char *argv[])
 {
 	if (argc <= 2)
 	{
-		printf("Usage: packer [-z, -v, -s] <pack-path> <file-path-1> <item-path-1>...\n");
+		printPackerHelp();
 		return EXIT_FAILURE;
 	}
 
@@ -66,19 +84,25 @@ int main(int argc, char *argv[])
 			argOffset += 1;
 			continue;
 		}
+		else if (strcmp(arg, "-h") == 0 || strcmp(arg, "--help") == 0)
+		{
+			printPackerHelp();
+			return EXIT_SUCCESS;
+		}
 		break;
 	}
 
 	char* packPath = argv[argOffset++];
+	int itemCount = argc - argOffset;
 
-	if ((argc - argOffset) % 2 != 0)
+	if (itemCount <= 0 || itemCount % 2 != 0)
 	{
 		printf("Bad pack file and item count, missing some of the items.\n");
 		return EXIT_FAILURE;
 	}
 
-	PackResult result = packFiles(packPath, (argc - argOffset) / 2, (const char**)argv + argOffset, 
-		dataVersion, zipThreshold, preferSpeed, true, NULL, NULL);
+	PackResult result = packFiles(packPath, itemCount / 2, (const char**)argv + 
+		argOffset, dataVersion, zipThreshold, preferSpeed, true, NULL, NULL);
 
 	if (result != SUCCESS_PACK_RESULT)
 	{

utilities/unpacker.c

@@ -17,11 +17,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+static void printUnpackerHelp()
+{
+	printf("Usage: unpacker <pack-path>\n");
+}
+
 int main(int argc, char *argv[])
 {
 	if (argc != 2)
 	{
-		printf("Usage: unpacker <pack-path>\n");
+		printUnpackerHelp();
 		return EXIT_FAILURE;
 	}