X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex.c;h=2564b4c7ac1a0cc7a3f963a7aed2ca10142b5f7d;hp=5af55ebd962e64016030e34dc290aca04cbbbf2e;hb=e0d3f9cd10e8517f5b9a46acdb7c7f715cffa6d9;hpb=9bec19341aac9190cd0bd80a6937b02d923dd566

diff --git a/programs/imagex.c b/programs/imagex.c
index 5af55ebd..2564b4c7 100644
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -282,8 +282,10 @@ 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("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,9 +420,10 @@ get_compression_type(const tchar *optarg)
 	}
 }
 
-static void
+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,
@@ -429,7 +432,6 @@ set_compress_slow(void)
 				.use_len2_matches = 1,
 				.num_fast_bytes = 96,
 				.num_optim_passes = 4,
-				.num_split_passes = 0,
 				.max_search_depth = 100,
 				.max_matches_per_pos = 10,
 				.main_nostat_cost = 15,
@@ -438,8 +440,10 @@ set_compress_slow(void)
 			},
 		},
 	};
-	if (wimlib_lzx_set_default_params(&slow_params))
+	ret = wimlib_lzx_set_default_params(&slow_params);
+	if (ret)
 		imagex_error(T("Couldn't set slow compression parameters.!"));
+	return ret;
 }
 
 struct string_set {
@@ -1722,7 +1726,10 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 				goto out_err;
 			break;
 		case IMAGEX_COMPRESS_SLOW_OPTION:
-			set_compress_slow();
+			ret = set_compress_slow();
+			if (ret)
+				goto out_err;
+			compression_type = WIMLIB_COMPRESSION_TYPE_LZX;
 			break;
 		case IMAGEX_FLAGS_OPTION:
 			flags_element = optarg;
@@ -3240,6 +3247,7 @@ 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;
 	int ret;
 	WIMStruct *wim;
 	const tchar *wimfile;
@@ -3256,11 +3264,20 @@ 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:
-			set_compress_slow();
+			write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
+			ret = set_compress_slow();
+			if (ret)
+				goto out_err;
 			break;
 		case IMAGEX_THREADS_OPTION:
 			num_threads = parse_num_threads(optarg);
@@ -3289,6 +3306,12 @@ imagex_optimize(int argc, tchar **argv, int cmd)
 	if (ret)
 		goto out;
 
+	if (compression_type != WIMLIB_COMPRESSION_TYPE_INVALID) {
+		ret = wimlib_set_output_compression_type(wim, compression_type);
+		if (ret)
+			goto out_wimlib_free;
+	}
+
 	old_size = file_get_size(wimfile);
 	tprintf(T("\"%"TS"\" original size: "), wimfile);
 	if (old_size == -1)
@@ -3753,6 +3776,7 @@ T(
 [CMD_OPTIMIZE] =
 T(
 "    %"TS" WIMFILE [--check] [--nocheck] [--recompress]\n"
+"                    [--recompress-slow] [--compress=TYPE]\n"
 "                    [--threads=NUM_THREADS] [--pipable] [--not-pipable]\n"
 ),
 [CMD_SPLIT] =