summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2010-01-25 02:48:13 +0100
committerGravatar Martin Szulecki2010-01-25 02:48:13 +0100
commitd6cbfafa5372557d41bb4f97eb3f8e33ee92fa8e (patch)
tree39d85b9cc34a6ffda26a29cc58c59890325271cb
parenta6bb8a89e42b6b301214d5f6e52522e5be7870eb (diff)
downloadlibimobiledevice-d6cbfafa5372557d41bb4f97eb3f8e33ee92fa8e.tar.gz
libimobiledevice-d6cbfafa5372557d41bb4f97eb3f8e33ee92fa8e.tar.bz2
Do not print progress for Manifest.plist
-rw-r--r--tools/iphonebackup.c39
1 files changed, 27 insertions, 12 deletions
diff --git a/tools/iphonebackup.c b/tools/iphonebackup.c
index 927d195..f7be8ca 100644
--- a/tools/iphonebackup.c
+++ b/tools/iphonebackup.c
@@ -432,6 +432,7 @@ int main(int argc, char *argv[])
char *filename_mddata = NULL;
char *filename_source = NULL;
char *format_size = NULL;
+ gboolean is_manifest = FALSE;
do {
mobilebackup_receive(mobilebackup, &message);
node = plist_array_get_item(message, 0);
@@ -452,23 +453,33 @@ int main(int argc, char *argv[])
/* print out "received" if DLFileStatusKey is 2 (last file piece) */
node = plist_dict_get_item(node_tmp, "DLFileStatusKey");
plist_get_uint_val(node, &c);
+
+ /* get source filename */
+ node = plist_dict_get_item(node_tmp, "DLFileSource");
+ plist_get_string_val(node, &filename_source);
+
+ if (!strcmp(filename_source, "/tmp/Manifest.plist"))
+ is_manifest = TRUE;
+ else
+ is_manifest = FALSE;
+
if (c == 2) {
node = plist_dict_get_item(node_tmp, "DLFileAttributesKey");
node = plist_dict_get_item(node, "FileSize");
plist_get_uint_val(node, &length);
+
+ /* increased received size for each completed file */
backup_real_size += length;
- format_size = g_format_size_for_display(backup_real_size);
- printf("(%s", format_size);
- g_free(format_size);
- format_size = g_format_size_for_display(backup_total_size);
- printf("/%s): ", format_size);
- g_free(format_size);
- /* get source filename and print it */
- node = plist_dict_get_item(node_tmp, "DLFileSource");
- plist_get_string_val(node, &filename_source);
- printf("Received file %s... ", filename_source);
- free(filename_source);
+ if (!is_manifest) {
+ format_size = g_format_size_for_display(backup_real_size);
+ printf("(%s", format_size);
+ g_free(format_size);
+ format_size = g_format_size_for_display(backup_total_size);
+ printf("/%s): ", format_size);
+ g_free(format_size);
+ printf("Received file %s... ", filename_source);
+ }
}
/* save <hash>.mdinfo */
@@ -499,8 +510,12 @@ int main(int argc, char *argv[])
g_free(filename_mddata);
}
- if (c == 2)
+ if ((c == 2) && (!is_manifest)) {
printf("DONE\n");
+ }
+
+ if (filename_source)
+ free(filename_source);
if (file_ext)
free(file_ext);