Tweak progress messages for imagex apply

diff --git a/programs/imagex.c b/programs/imagex.c
index 93c4d29761d89295898d212782c02b0b8381fd95..41aba7ebc2dd5188e7c8def71570563eb8355216 100644 (file)
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -407,13 +407,6 @@ static int imagex_progress_func(enum wimlib_progress_msg msg,
                                "NTFS volume" : "directory"),
                       info->extract.target);
                break;
                                "NTFS volume" : "directory"),
                       info->extract.target);
                break;

-       case WIMLIB_PROGRESS_MSG_EXTRACT_IMAGE_END:
-               printf("Done applying WIM image.\n");
-               if (info->extract.extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) {
-                       printf("Unmounting NTFS volume `%s'...\n",
-                              info->extract.target);
-               }
-               break;

        /*case WIMLIB_PROGRESS_MSG_EXTRACT_DIR_STRUCTURE_BEGIN:*/
                /*printf("Applying directory structure to %s\n",*/
                       /*info->extract.target);*/
        /*case WIMLIB_PROGRESS_MSG_EXTRACT_DIR_STRUCTURE_BEGIN:*/
                /*printf("Applying directory structure to %s\n",*/
                       /*info->extract.target);*/


@@ -432,6 +425,15 @@ static int imagex_progress_func(enum wimlib_progress_msg msg,
        case WIMLIB_PROGRESS_MSG_EXTRACT_DENTRY:
                puts(info->extract.cur_path);
                break;
        case WIMLIB_PROGRESS_MSG_EXTRACT_DENTRY:
                puts(info->extract.cur_path);
                break;

+       case WIMLIB_PROGRESS_MSG_APPLY_TIMESTAMPS:
+               printf("Setting timestamps on all extracted files...\n");
+               break;
+       case WIMLIB_PROGRESS_MSG_EXTRACT_IMAGE_END:
+               if (info->extract.extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) {
+                       printf("Unmounting NTFS volume `%s'...\n",
+                              info->extract.target);
+               }
+               break;

        case WIMLIB_PROGRESS_MSG_JOIN_STREAMS:
                percent_done = TO_PERCENT(info->join.completed_bytes,
                                          info->join.total_bytes);
        case WIMLIB_PROGRESS_MSG_JOIN_STREAMS:
                percent_done = TO_PERCENT(info->join.completed_bytes,
                                          info->join.total_bytes);


@@ -637,6 +639,8 @@ static int imagex_apply(int argc, const char **argv)
        ret = wimlib_extract_image(w, image, target, extract_flags,
                                   additional_swms, num_additional_swms,
                                   imagex_progress_func);
        ret = wimlib_extract_image(w, image, target, extract_flags,
                                   additional_swms, num_additional_swms,
                                   imagex_progress_func);

+       if (ret == 0)
+               printf("Done applying WIM image.\n");

 out:
        wimlib_free(w);
        if (additional_swms) {
 out:
        wimlib_free(w);
        if (additional_swms) {

diff --git a/src/extract_image.c b/src/extract_image.c
index 56c72f870e0947e7c5d05177c5f5228aa647e508..bebd1d32d71b883d6dc20cbb849cffa39c097bc9 100644 (file)
--- a/src/extract_image.c
+++ b/src/extract_image.c
@@ -653,8 +653,10 @@ static int extract_single_image(WIMStruct *w, int image,
        if (ret != 0)
                goto out;
 
        if (ret != 0)
                goto out;
 

-       if (progress_func)
-               progress_func(WIMLIB_PROGRESS_MSG_APPLY_TIMESTAMPS, NULL);
+       if (progress_func) {
+               progress_func(WIMLIB_PROGRESS_MSG_APPLY_TIMESTAMPS,
+                             &args.progress);
+       }

 
        ret = for_dentry_in_tree_depth(wim_root_dentry(w),
                                       ops->apply_dentry_timestamps, &args);
 
        ret = for_dentry_in_tree_depth(wim_root_dentry(w),
                                       ops->apply_dentry_timestamps, &args);