[gnome-autoar/wip/razvan/general-improvements: 10/20] AutoarCreate: report correct size for non-regular files

[Răzvan-Mihai Chițu <razvanchitu src gnome org>]

commit a0317efd4ea41abbb03c2a4750e417d2d0ef4ab6
Author: Razvan Chitu <razvan ch95 gmail com>
Date:   Sat Aug 13 19:10:50 2016 +0300

    AutoarCreate: report correct size for non-regular files
    
    The size reported for non-regular files was the size in the archive and not the
    size on the disk, which would lead to bad progress information. In order to fix
    this, make sure that the size on the disk is the one reported.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=768645

 gnome-autoar/autoar-create.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/gnome-autoar/autoar-create.c b/gnome-autoar/autoar-create.c
index 5f3a8b2..d1ac236 100644
--- a/gnome-autoar/autoar-create.c
+++ b/gnome-autoar/autoar-create.c
@@ -943,6 +943,15 @@ autoar_create_do_add_to_archive (AutoarCreate *arcreate,
       pathname_in_entry = archive_entry_pathname (entry);
       file_to_read = g_hash_table_lookup (priv->pathname_to_g_file, pathname_in_entry);
       autoar_create_do_write_data (arcreate, entry, file_to_read);
+      /* Entries for non-regular files might have their size attribute
+       * different to their actual size on the disk
+       */
+      if (archive_entry_filetype (entry) != AE_IFREG &&
+          archive_entry_size (entry) != g_file_info_get_size (info)) {
+        priv->completed_size += g_file_info_get_size (info);
+        autoar_create_signal_progress (arcreate);
+      }
+
       g_hash_table_remove (priv->pathname_to_g_file, pathname_in_entry);
       /* We have registered g_object_unref function to free the GFile object,
        * so we do not have to unref it here. */