[shotwell] Fix import progress when importing RAW files



commit 272c5c12cc904a940aeec0387e6add75014169d8
Author: Jens Georg <mail jensge org>
Date:   Sun Aug 20 14:59:50 2017 +0200

    Fix import progress when importing RAW files

 src/BatchImport.vala |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/src/BatchImport.vala b/src/BatchImport.vala
index bd15b94..0e31441 100644
--- a/src/BatchImport.vala
+++ b/src/BatchImport.vala
@@ -1282,7 +1282,14 @@ public class BatchImport : Object {
             ready_sources.add(completed_object);
             
             imported(completed_object.source, user_preview, total);
-            report_progress(completed_object.source.get_filesize());
+            // If we have a photo, use master size. For RAW import, we might end up with reporting
+            // the size of the (much smaller) JPEG which will look like no progress at all
+            if (completed_object.source is PhotoSource) {
+                var photo_source = completed_object.source as PhotoSource;
+                report_progress(photo_source.get_master_filesize());
+            } else {
+                report_progress(completed_object.source.get_filesize());
+            }
             file_import_complete();
         }
         


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]