Add WIMLIB_PROGRESS_MSG_EXTRACT_SPWM_PART_BEGIN

[wimlib] / programs / imagex.c

diff --git a/programs/imagex.c b/programs/imagex.c
index 767b67240c6fc448a008454a2d4b7df7b598a9d8..90b53dd6bd815165ca30cb6ede5ee4b29d400338 100644 (file)
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -146,6 +146,7 @@ enum {
        IMAGEX_RECOMPRESS_OPTION,
        IMAGEX_RECURSIVE_OPTION,
        IMAGEX_REF_OPTION,
+       IMAGEX_RESUME_OPTION,
        IMAGEX_RPFIX_OPTION,
        IMAGEX_SOFT_OPTION,
        IMAGEX_SOURCE_LIST_OPTION,
@@ -173,6 +174,7 @@ static const struct option apply_options[] = {
        {T("rpfix"),       no_argument,       NULL, IMAGEX_RPFIX_OPTION},
        {T("norpfix"),     no_argument,       NULL, IMAGEX_NORPFIX_OPTION},
        {T("include-invalid-names"), no_argument,       NULL, IMAGEX_INCLUDE_INVALID_NAMES_OPTION},
+       {T("resume"),      no_argument,       NULL, IMAGEX_RESUME_OPTION},
        {NULL, 0, NULL, 0},
 };
 
@@ -1098,6 +1100,11 @@ imagex_progress_func(enum wimlib_progress_msg msg,
                if (info->extract.completed_bytes >= info->extract.total_bytes)
                        imagex_printf(T("\n"));
                break;
+       case WIMLIB_PROGRESS_MSG_EXTRACT_SPWM_PART_BEGIN:
+               imagex_printf(T("\nReading split pipable WIM part %u of %u\n"),
+                             info->extract.part_number,
+                             info->extract.total_parts);
+               break;
        case WIMLIB_PROGRESS_MSG_APPLY_TIMESTAMPS:
                if (info->extract.extract_root_wim_source_path[0] == T('\0'))
                        imagex_printf(T("Setting timestamps on all extracted files...\n"));
@@ -1125,7 +1132,7 @@ imagex_progress_func(enum wimlib_progress_msg msg,
                break;
        case WIMLIB_PROGRESS_MSG_SPLIT_END_PART:
                if (info->split.completed_bytes == info->split.total_bytes) {
-                       imagex_printf(T("Finished writing part %u of %u WIM parts\n"),
+                       imagex_printf(T("Finished writing split WIM part %u of %u\n"),
                                info->split.cur_part_number,
                                info->split.total_parts);
                }
@@ -1496,6 +1503,9 @@ imagex_apply(int argc, tchar **argv, int cmd)
                        extract_flags |= WIMLIB_EXTRACT_FLAG_REPLACE_INVALID_FILENAMES;
                        extract_flags |= WIMLIB_EXTRACT_FLAG_ALL_CASE_CONFLICTS;
                        break;
+               case IMAGEX_RESUME_OPTION:
+                       extract_flags |= WIMLIB_EXTRACT_FLAG_RESUME;
+                       break;
                default:
                        goto out_usage;
                }
@@ -3449,7 +3459,7 @@ T(
 "                    (DIRECTORY | NTFS_VOLUME) [--check] [--hardlink]\n"
 "                    [--symlink] [--verbose] [--ref=\"GLOB\"] [--unix-data]\n"
 "                    [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n"
-"                    [--include-invalid-names]\n"
+"                    [--include-invalid-names] [--resume]\n"
 ),
 [CMD_CAPTURE] =
 T(