Merge lp:~artmello/gallery-app/gallery-app-check_file_metadata into lp:gallery-app

[Arthur Mello]

Add some checks to make sure the file has good metadata before changing it

Add some checks to make sure the file has good metadata before changing it

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1123
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1088/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/16/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/16
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/68
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/338/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/707
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/100
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16647
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/278/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/344
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/344/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1088/rebuild

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

approved

review: Approve

=== modified file 'src/content-communicator.cpp'
--- src/content-communicator.cpp	2014-11-12 22:27:21 +0000
+++ src/content-communicator.cpp	2014-12-17 12:59:43 +0000
@@ -94,8 +94,10 @@
             // to show up on imported date Event
             QFileInfo destfi(destination);
             PhotoMetadata* metadata = PhotoMetadata::fromFile(destfi);
-            metadata->setDateTimeDigitized(QDateTime::currentDateTime());
-            metadata->save();
+            if (metadata != NULL) {
+                metadata->setDateTimeDigitized(QDateTime::currentDateTime());
+                metadata->save();
+            }
         }
     }
     // Allow content-hub to clean up temporary files in .cache/ once we've

=== modified file 'src/medialoader/photo-metadata.cpp'
--- src/medialoader/photo-metadata.cpp	2014-10-24 18:25:32 +0000
+++ src/medialoader/photo-metadata.cpp	2014-12-17 12:59:43 +0000
@@ -215,12 +215,23 @@
  */
 void PhotoMetadata::setOrientation(Orientation orientation)
 {
-    Exiv2::ExifData& exif_data = m_image->exifData();
-
-    exif_data[EXIF_ORIENTATION_KEY] = orientation;
-
-    if (!m_keysPresent.contains(EXIF_ORIENTATION_KEY))
-        m_keysPresent.insert(EXIF_ORIENTATION_KEY);
+    try {
+        if (!m_image->good()) {
+            qDebug("Do not set Orientation, invalid image metadata.");
+            return;
+        }
+ 
+        Exiv2::ExifData& exif_data = m_image->exifData();
+ 
+        exif_data[EXIF_ORIENTATION_KEY] = orientation;
+ 
+        if (!m_keysPresent.contains(EXIF_ORIENTATION_KEY))
+            m_keysPresent.insert(EXIF_ORIENTATION_KEY);
+ 
+    } catch (Exiv2::AnyError& e) {
+        qDebug("Do not set Orientation, error reading image metadata; %s", e.what());
+        return;
+    }
 }
 
 /*!
@@ -229,12 +240,23 @@
  */
 void PhotoMetadata::setDateTimeDigitized(const QDateTime& digitized)
 {
-    Exiv2::ExifData& exif_data = m_image->exifData();
-
-    exif_data[EXIF_DATETIMEDIGITIZED_KEY] = digitized.toString("yyyy:MM:dd hh:mm:ss").toStdString();
-
-    if (!m_keysPresent.contains(EXIF_DATETIMEDIGITIZED_KEY))
-        m_keysPresent.insert(EXIF_DATETIMEDIGITIZED_KEY);
+    try {
+        if (!m_image->good()) {
+            qDebug("Do not set DateTimeDigitized, invalid image metadata.");
+            return;
+        }
+ 
+        Exiv2::ExifData& exif_data = m_image->exifData();
+ 
+        exif_data[EXIF_DATETIMEDIGITIZED_KEY] = digitized.toString("yyyy:MM:dd hh:mm:ss").toStdString();
+ 
+        if (!m_keysPresent.contains(EXIF_DATETIMEDIGITIZED_KEY))
+            m_keysPresent.insert(EXIF_DATETIMEDIGITIZED_KEY);
+ 
+    } catch (Exiv2::AnyError& e) {
+        qDebug("Do not set DateTimeDigitized, error reading image metadata; %s", e.what());
+        return;
+    }
 }
 
 /*!