X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=programs%2Fimagex.c;h=d3588a9e5175f94fc10b393b31d8b0df6fa73b09;hb=49a63aa13cdeb4c1348697ccd92207a1a65ec7b0;hp=628205a080f465084e0171b82e8faa7d79d9c90e;hpb=c5bfd142ec8316173720f0f3dfcb23a744743214;p=wimlib diff --git a/programs/imagex.c b/programs/imagex.c index 628205a0..d3588a9e 100644 --- a/programs/imagex.c +++ b/programs/imagex.c @@ -120,9 +120,11 @@ enum { IMAGEX_ALLOW_OTHER_OPTION, IMAGEX_BOOT_OPTION, IMAGEX_CHECK_OPTION, + IMAGEX_CHUNK_SIZE_OPTION, IMAGEX_COMMAND_OPTION, IMAGEX_COMMIT_OPTION, IMAGEX_COMPRESS_OPTION, + IMAGEX_COMPRESS_SLOW_OPTION, IMAGEX_CONFIG_OPTION, IMAGEX_DEBUG_OPTION, IMAGEX_DELTA_FROM_OPTION, @@ -188,6 +190,8 @@ static const struct option capture_or_append_options[] = { {T("no-check"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, {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}, @@ -280,7 +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}, @@ -415,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; @@ -1242,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. * @@ -1639,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; @@ -1694,6 +1742,17 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) goto out_err; break; + case IMAGEX_COMPRESS_SLOW_OPTION: + 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; break; @@ -1778,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(¶ms, 0, sizeof(params)); + params.size_of_this = sizeof(params); + params.algorithm = WIMLIB_LZX_ALGORITHM_FAST; + params.use_defaults = 1; + + wimlib_lzx_set_default_params(¶ms); + compression_type = WIMLIB_COMPRESSION_TYPE_LZX; + } + if (!tstrcmp(wimfile, T("-"))) { /* Writing captured WIM to standard output. */ #if 0 @@ -1912,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. */ @@ -1955,7 +2033,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) base_wims = calloc(base_wimfiles.num_strings, sizeof(base_wims[0])); if (base_wims == NULL) { - imagex_error("Out of memory!"); + imagex_error(T("Out of memory!")); ret = -1; goto out_free_wim; } @@ -2437,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); @@ -2696,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); @@ -3198,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; @@ -3214,9 +3298,27 @@ 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_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); if (num_threads == UINT_MAX) @@ -3244,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) @@ -3630,12 +3746,12 @@ static const tchar *usage_strings[] = { [CMD_APPEND] = T( " %"TS" (DIRECTORY | NTFS_VOLUME) WIMFILE\n" -" [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot] [--check]\n" -" [--nocheck] [--flags EDITION_ID] [--verbose]\n" +" [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot]\n" +" [--check] [--nocheck] [--flags EDITION_ID] [--verbose]\n" " [--dereference] [--config=FILE] [--threads=NUM_THREADS]\n" -" [--rebuild] [--unix-data] [--source-list] [--no-acls]\n" -" [--strict-acls] [--rpfix] [--norpfix] [--pipable]\n" -" [--not-pipable] [--update-of=[WIMFILE:]IMAGE]\n" +" [--source-list] [--no-acls] [--strict-acls] [--rpfix]\n" +" [--norpfix] [--unix-data] [--pipable]\n" +" [--update-of=[WIMFILE:]IMAGE]\n" ), [CMD_APPLY] = T( @@ -3648,12 +3764,13 @@ T( [CMD_CAPTURE] = T( " %"TS" (DIRECTORY | NTFS_VOLUME) WIMFILE\n" -" [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot] [--check]\n" -" [--nocheck] [--compress=TYPE] [--flags EDITION_ID]\n" -" [--verbose] [--dereference] [--config=FILE]\n" -" [--threads=NUM_THREADS] [--unix-data] [--source-list]\n" -" [--no-acls] [--strict-acls] [--norpfix] [--pipable]\n" -" [--update-of=[WIMFILE:]IMAGE] [--delta-from=WIMFILE]\n" +" [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot]\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" +" [--unix-data] [--pipable] [--update-of=[WIMFILE:]IMAGE]\n" +" [--delta-from=WIMFILE]\n" ), [CMD_DELETE] = T( @@ -3707,6 +3824,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] =