X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=programs%2Fimagex.c;h=d3588a9e5175f94fc10b393b31d8b0df6fa73b09;hb=4ecf344e77e1f5891055881950a6e89e32b16008;hp=f23f043897d42dd7b90da85d4a527a3857db518d;hpb=2254a0fc3f1d7af1151ee83f3458f44339b5028b;p=wimlib

diff --git a/programs/imagex.c b/programs/imagex.c
index f23f0438..d3588a9e 100644
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -120,6 +120,7 @@ enum {
 	IMAGEX_ALLOW_OTHER_OPTION,
 	IMAGEX_BOOT_OPTION,
 	IMAGEX_CHECK_OPTION,
+	IMAGEX_CHUNK_SIZE_OPTION,
 	IMAGEX_COMMAND_OPTION,
 	IMAGEX_COMMIT_OPTION,
 	IMAGEX_COMPRESS_OPTION,
@@ -190,6 +191,7 @@ static const struct option capture_or_append_options[] = {
 	{T("nocheck"),     no_argument,       NULL, IMAGEX_NOCHECK_OPTION},
 	{T("compress"),    required_argument, NULL, IMAGEX_COMPRESS_OPTION},
 	{T("compress-slow"), no_argument,     NULL, IMAGEX_COMPRESS_SLOW_OPTION},
+	{T("chunk-size"),  required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION},
 	{T("config"),      required_argument, NULL, IMAGEX_CONFIG_OPTION},
 	{T("dereference"), no_argument,       NULL, IMAGEX_DEREFERENCE_OPTION},
 	{T("flags"),       required_argument, NULL, IMAGEX_FLAGS_OPTION},
@@ -282,8 +284,11 @@ static const struct option optimize_options[] = {
 	{T("check"),       no_argument,       NULL, IMAGEX_CHECK_OPTION},
 	{T("nocheck"),     no_argument,       NULL, IMAGEX_NOCHECK_OPTION},
 	{T("no-check"),    no_argument,       NULL, IMAGEX_NOCHECK_OPTION},
+	{T("compress"),    required_argument, NULL, IMAGEX_COMPRESS_OPTION},
 	{T("recompress"),  no_argument,       NULL, IMAGEX_RECOMPRESS_OPTION},
 	{T("compress-slow"), no_argument,     NULL, IMAGEX_COMPRESS_SLOW_OPTION},
+	{T("recompress-slow"), no_argument,     NULL, IMAGEX_COMPRESS_SLOW_OPTION},
+	{T("chunk-size"),  required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION},
 	{T("threads"),     required_argument, NULL, IMAGEX_THREADS_OPTION},
 	{T("pipable"),     no_argument,       NULL, IMAGEX_PIPABLE_OPTION},
 	{T("not-pipable"), no_argument,       NULL, IMAGEX_NOT_PIPABLE_OPTION},
@@ -418,6 +423,32 @@ get_compression_type(const tchar *optarg)
 	}
 }
 
+static int
+set_compress_slow(void)
+{
+	int ret;
+	static const struct wimlib_lzx_params slow_params = {
+		.size_of_this = sizeof(struct wimlib_lzx_params),
+		.algorithm = WIMLIB_LZX_ALGORITHM_SLOW,
+		.alg_params = {
+			.slow = {
+				.use_len2_matches = 1,
+				.num_fast_bytes = 96,
+				.num_optim_passes = 4,
+				.max_search_depth = 100,
+				.max_matches_per_pos = 10,
+				.main_nostat_cost = 15,
+				.len_nostat_cost = 15,
+				.aligned_nostat_cost = 7,
+			},
+		},
+	};
+	ret = wimlib_lzx_set_default_params(&slow_params);
+	if (ret)
+		imagex_error(T("Couldn't set slow compression parameters.!"));
+	return ret;
+}
+
 struct string_set {
 	const tchar **strings;
 	unsigned num_strings;
@@ -1245,6 +1276,19 @@ parse_num_threads(const tchar *optarg)
 	}
 }
 
+static uint32_t parse_chunk_size(const char *optarg)
+{
+       char *tmp;
+       unsigned long chunk_size = strtoul(optarg, &tmp, 10);
+       if (chunk_size >= UINT32_MAX || *tmp || tmp == optarg) {
+               imagex_error(T("Chunk size must be a non-negative integer!"));
+               return UINT32_MAX;
+       } else {
+               return chunk_size;
+       }
+}
+
+
 /*
  * Parse an option passed to an update command.
  *
@@ -1642,7 +1686,8 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 	int add_image_flags = WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE |
 			      WIMLIB_ADD_IMAGE_FLAG_WINCONFIG;
 	int write_flags = 0;
-	int compression_type = WIMLIB_COMPRESSION_TYPE_LZX;
+	int compression_type = WIMLIB_COMPRESSION_TYPE_INVALID;
+	uint32_t chunk_size = UINT32_MAX;
 	const tchar *wimfile;
 	int wim_fd;
 	const tchar *name;
@@ -1698,7 +1743,15 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 				goto out_err;
 			break;
 		case IMAGEX_COMPRESS_SLOW_OPTION:
-			write_flags |= WIMLIB_WRITE_FLAG_COMPRESS_SLOW;
+			ret = set_compress_slow();
+			if (ret)
+				goto out_err;
+			compression_type = WIMLIB_COMPRESSION_TYPE_LZX;
+			break;
+		case IMAGEX_CHUNK_SIZE_OPTION:
+			chunk_size = parse_chunk_size(optarg);
+			if (chunk_size == UINT32_MAX)
+				goto out_err;
 			break;
 		case IMAGEX_FLAGS_OPTION:
 			flags_element = optarg;
@@ -1784,6 +1837,18 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 	source = argv[0];
 	wimfile = argv[1];
 
+	/* Set default compression type.  */
+	if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) {
+		struct wimlib_lzx_params params;
+		memset(&params, 0, sizeof(params));
+		params.size_of_this = sizeof(params);
+		params.algorithm = WIMLIB_LZX_ALGORITHM_FAST;
+		params.use_defaults = 1;
+
+		wimlib_lzx_set_default_params(&params);
+		compression_type = WIMLIB_COMPRESSION_TYPE_LZX;
+	}
+
 	if (!tstrcmp(wimfile, T("-"))) {
 		/* Writing captured WIM to standard output.  */
 	#if 0
@@ -1918,6 +1983,13 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 	if (ret)
 		goto out_free_config;
 
+	/* Set chunk size if non-default.  */
+	if (chunk_size != UINT32_MAX) {
+		ret = wimlib_set_output_chunk_size(wim, chunk_size);
+		if (ret)
+			goto out_free_wim;
+	}
+
 #ifndef __WIN32__
 	/* Detect if source is regular file or block device and set NTFS volume
 	 * capture mode.  */
@@ -2443,6 +2515,8 @@ imagex_export(int argc, tchar **argv, int cmd)
 		ret = wimlib_create_new_wim(compression_type, &dest_wim);
 		if (ret)
 			goto out_free_src_wim;
+
+		wimlib_set_output_chunk_size(dest_wim, src_info.chunk_size);
 	}
 
 	image = wimlib_resolve_image(src_wim, src_image_num_or_name);
@@ -2702,6 +2776,8 @@ print_wim_information(const tchar *wimfile, const struct wimlib_wim_info *info)
 	tprintf(T("Image Count:    %d\n"), info->image_count);
 	tprintf(T("Compression:    %"TS"\n"),
 		wimlib_get_compression_type_string(info->compression_type));
+	tprintf(T("Chunk Size:     %"PRIu32" bytes\n"),
+		info->chunk_size);
 	tprintf(T("Part Number:    %d/%d\n"), info->part_number, info->total_parts);
 	tprintf(T("Boot Index:     %d\n"), info->boot_index);
 	tprintf(T("Size:           %"PRIu64" bytes\n"), info->total_bytes);
@@ -3204,6 +3280,8 @@ imagex_optimize(int argc, tchar **argv, int cmd)
 	int c;
 	int open_flags = WIMLIB_OPEN_FLAG_WRITE_ACCESS;
 	int write_flags = WIMLIB_WRITE_FLAG_REBUILD;
+	int compression_type = WIMLIB_COMPRESSION_TYPE_INVALID;
+	uint32_t chunk_size = UINT32_MAX;
 	int ret;
 	WIMStruct *wim;
 	const tchar *wimfile;
@@ -3220,11 +3298,26 @@ imagex_optimize(int argc, tchar **argv, int cmd)
 		case IMAGEX_NOCHECK_OPTION:
 			write_flags |= WIMLIB_WRITE_FLAG_NO_CHECK_INTEGRITY;
 			break;
+		case IMAGEX_COMPRESS_OPTION:
+			write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
+			compression_type = get_compression_type(optarg);
+			if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID)
+				goto out_err;
+			break;
 		case IMAGEX_RECOMPRESS_OPTION:
 			write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
 			break;
 		case IMAGEX_COMPRESS_SLOW_OPTION:
-			write_flags |= WIMLIB_WRITE_FLAG_COMPRESS_SLOW;
+			write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
+			compression_type = WIMLIB_COMPRESSION_TYPE_LZX;
+			ret = set_compress_slow();
+			if (ret)
+				goto out_err;
+			break;
+		case IMAGEX_CHUNK_SIZE_OPTION:
+			chunk_size = parse_chunk_size(optarg);
+			if (chunk_size == UINT32_MAX)
+				goto out_err;
 			break;
 		case IMAGEX_THREADS_OPTION:
 			num_threads = parse_num_threads(optarg);
@@ -3253,6 +3346,20 @@ imagex_optimize(int argc, tchar **argv, int cmd)
 	if (ret)
 		goto out;
 
+	if (compression_type != WIMLIB_COMPRESSION_TYPE_INVALID) {
+		/* Change compression type.  */
+		ret = wimlib_set_output_compression_type(wim, compression_type);
+		if (ret)
+			goto out_wimlib_free;
+	}
+
+	if (chunk_size != UINT32_MAX) {
+		/* Change chunk size.  */
+		ret = wimlib_set_output_chunk_size(wim, chunk_size);
+		if (ret)
+			goto out_wimlib_free;
+	}
+
 	old_size = file_get_size(wimfile);
 	tprintf(T("\"%"TS"\" original size: "), wimfile);
 	if (old_size == -1)
@@ -3640,11 +3747,11 @@ static const tchar *usage_strings[] = {
 T(
 "    %"TS" (DIRECTORY | NTFS_VOLUME) WIMFILE\n"
 "                    [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot]\n"
-"                    [--check] [--nocheck] [--compress-slow]\n"
-"                    [--flags EDITION_ID] [--verbose] [--dereference]\n"
-"                    [--config=FILE] [--threads=NUM_THREADS] [--source-list]\n"
-"                    [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n"
-"                    [--unix-data] [--pipable] [--update-of=[WIMFILE:]IMAGE]\n"
+"                    [--check] [--nocheck] [--flags EDITION_ID] [--verbose]\n"
+"                    [--dereference] [--config=FILE] [--threads=NUM_THREADS]\n"
+"                    [--source-list] [--no-acls] [--strict-acls] [--rpfix]\n"
+"                    [--norpfix] [--unix-data] [--pipable]\n"
+"                    [--update-of=[WIMFILE:]IMAGE]\n"
 ),
 [CMD_APPLY] =
 T(
@@ -3658,7 +3765,7 @@ T(
 T(
 "    %"TS" (DIRECTORY | NTFS_VOLUME) WIMFILE\n"
 "		     [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot]\n"
-"                    [--check] [--nocheck] [--compress=TYPE] [--compress-slow]\n"
+"                    [--check] [--nocheck] [--compress=TYPE]\n"
 "                    [--flags EDITION_ID] [--verbose] [--dereference]\n"
 "                    [--config=FILE] [--threads=NUM_THREADS] [--source-list]\n"
 "                    [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n"
@@ -3717,8 +3824,8 @@ T(
 [CMD_OPTIMIZE] =
 T(
 "    %"TS" WIMFILE [--check] [--nocheck] [--recompress]\n"
-"                    [--compress-slow] [--threads=NUM_THREADS]\n"
-"                    [--pipable] [--not-pipable]\n"
+"                    [--recompress-slow] [--compress=TYPE]\n"
+"                    [--threads=NUM_THREADS] [--pipable] [--not-pipable]\n"
 ),
 [CMD_SPLIT] =
 T(