diff options
Diffstat (limited to 'tools/idevicebackup2.c')
| -rw-r--r-- | tools/idevicebackup2.c | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/tools/idevicebackup2.c b/tools/idevicebackup2.c index ff31189..bfb84c6 100644 --- a/tools/idevicebackup2.c +++ b/tools/idevicebackup2.c | |||
| @@ -671,20 +671,15 @@ static void mb2_handle_send_files(plist_t message, const char *backup_dir) | |||
| 671 | uint32_t i = 0; | 671 | uint32_t i = 0; |
| 672 | uint32_t sent; | 672 | uint32_t sent; |
| 673 | plist_t errplist = NULL; | 673 | plist_t errplist = NULL; |
| 674 | double progress = 0; | 674 | |
| 675 | |||
| 676 | if (!message || (plist_get_node_type(message) != PLIST_ARRAY) || (plist_array_get_size(message) < 2) || !backup_dir) return; | 675 | if (!message || (plist_get_node_type(message) != PLIST_ARRAY) || (plist_array_get_size(message) < 2) || !backup_dir) return; |
| 677 | 676 | ||
| 678 | plist_t files = plist_array_get_item(message, 1); | 677 | plist_t files = plist_array_get_item(message, 1); |
| 679 | cnt = plist_array_get_size(files); | 678 | cnt = plist_array_get_size(files); |
| 680 | if (cnt == 0) return; | 679 | if (cnt == 0) return; |
| 681 | 680 | ||
| 682 | plist_t val = plist_array_get_item(message, 3); | ||
| 683 | plist_get_real_val(val, &progress); | ||
| 684 | val = NULL; | ||
| 685 | |||
| 686 | for (i = 0; i < cnt; i++) { | 681 | for (i = 0; i < cnt; i++) { |
| 687 | val = plist_array_get_item(files, i); | 682 | plist_t val = plist_array_get_item(files, i); |
| 688 | if (plist_get_node_type(val) != PLIST_STRING) { | 683 | if (plist_get_node_type(val) != PLIST_STRING) { |
| 689 | continue; | 684 | continue; |
| 690 | } | 685 | } |
| @@ -710,11 +705,6 @@ static void mb2_handle_send_files(plist_t message, const char *backup_dir) | |||
| 710 | mobilebackup2_send_status_response(mobilebackup2, -13, "Multi status", errplist); | 705 | mobilebackup2_send_status_response(mobilebackup2, -13, "Multi status", errplist); |
| 711 | plist_free(errplist); | 706 | plist_free(errplist); |
| 712 | } | 707 | } |
| 713 | |||
| 714 | if (progress > 0) { | ||
| 715 | print_progress_real(progress, 1); | ||
| 716 | PRINT_VERBOSE(1, "\n"); | ||
| 717 | } | ||
| 718 | } | 708 | } |
| 719 | 709 | ||
| 720 | static int mb2_handle_receive_files(plist_t message, const char *backup_dir) | 710 | static int mb2_handle_receive_files(plist_t message, const char *backup_dir) |
| @@ -1640,14 +1630,17 @@ checkpoint: | |||
| 1640 | } | 1630 | } |
| 1641 | 1631 | ||
| 1642 | /* print status */ | 1632 | /* print status */ |
| 1643 | /*if (plist_array_get_size(message) >= 4) { | 1633 | if (plist_array_get_size(message) >= 3) { |
| 1644 | plist_t pnode = plist_array_get_item(message, 4); | 1634 | plist_t pnode = plist_array_get_item(message, 3); |
| 1645 | if (pnode && (plist_get_node_type(pnode) == PLIST_REAL)) { | 1635 | if (pnode && (plist_get_node_type(pnode) == PLIST_REAL)) { |
| 1646 | double progress = 0.0; | 1636 | double progress = 0.0; |
| 1647 | plist_get_real_val(pnode, &progress); | 1637 | plist_get_real_val(pnode, &progress); |
| 1648 | printf("Progress: %f\n", progress); | 1638 | if (progress > 0) { |
| 1639 | print_progress_real(progress, 0); | ||
| 1640 | PRINT_VERBOSE(1, " Finished\n"); | ||
| 1641 | } | ||
| 1649 | } | 1642 | } |
| 1650 | }*/ | 1643 | } |
| 1651 | 1644 | ||
| 1652 | if (message) | 1645 | if (message) |
| 1653 | plist_free(message); | 1646 | plist_free(message); |
