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

[Arthur Mello]

Change the fallback for videos from created to lastModified

Change the fallback for videos from created to lastModified

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1123
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1089/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/17/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/17
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/73
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/373
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/712
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/126
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16906
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/306
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/379
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/379/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

1123. By Arthur Mello on 2015-01-07

Change the fallback for videos from created to lastModified

=== modified file 'src/media-object-factory.cpp'
--- src/media-object-factory.cpp	2014-05-31 02:01:13 +0000
+++ src/media-object-factory.cpp	2015-01-07 22:45:20 +0000
@@ -261,7 +261,7 @@
     if (!ok)
         return false;
 
-    m_timeStamp = file.created();
+    m_timeStamp = file.lastModified();
     if (metadata.rotation() == 90) {
         m_orientation = LEFT_BOTTOM_ORIGIN;
     } else if (metadata.rotation() == 180) {
@@ -272,7 +272,8 @@
         m_orientation = TOP_LEFT_ORIGIN;
     }
     m_fileSize = file.size();
-    m_exposureTime = metadata.exposureTime();
+    m_exposureTime = metadata.exposureTime().isValid() ?
+                metadata.exposureTime() : m_timeStamp;
     m_size = metadata.frameSize();
 
     return true;

=== modified file 'src/medialoader/video-metadata.cpp'
--- src/medialoader/video-metadata.cpp	2014-04-30 23:40:50 +0000
+++ src/medialoader/video-metadata.cpp	2015-01-07 22:45:20 +0000
@@ -94,7 +94,7 @@
     it = m_tags.find(ENCODED_DATE_KEY);
     if ( it == m_tags.end()) {
         // Fallback for date that the file was created
-        return m_file.created();
+        return m_file.lastModified();
     }
 
     return it.value().toDateTime();