Merge lp:~phablet-team/camera-app/watch-refresh-thumbs into lp:camera-app

[Ugo Riboni]

Refresh properly the thumbnails when the picture is changed. Make sure after the first change the file is still being watched.

Refresh properly the thumbnails when the picture is changed. Make sure after the first change the file is still being watched.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:480
http://jenkins.qa.ubuntu.com/job/camera-app-ci/372/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/68/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/109
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/485/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/748
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/210
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17552
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/591/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:483
http://jenkins.qa.ubuntu.com/job/camera-app-ci/374/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/70/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/70/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/70/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/111
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/489/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/750
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/212
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17565
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/595/console

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

review: Needs Fixing (continuous-integration)

[Florian Boucault (fboucault)]

"?at=" + Date.now() makes it so that the thumbnail is _always_ recomputed even though the file might not have changed.

review: Needs Fixing

[Florian Boucault (fboucault)]

> "?at=" + Date.now() makes it so that the thumbnail is _always_ recomputed even
> though the file might not have changed.

Not sure about that anymore, my brain is failing. Let's discuss it ASAP

=== modified file 'CameraApp/foldersmodel.cpp'
--- CameraApp/foldersmodel.cpp	2015-01-25 18:54:51 +0000
+++ CameraApp/foldersmodel.cpp	2015-01-28 15:58:22 +0000
@@ -275,6 +275,11 @@
             m_fileInfoList[fileIndex] = fileInfo;
             Q_EMIT dataChanged(modelIndex, modelIndex);
         }
+
+        // As the documentation states, in some cases the watch is removed on a
+        // fileChanged signal, so we will need to add it back again.
+        // addPath() will safely do nothing if the file is still being watched.
+        m_watcher->addPath(filePath);
     } else {
         // file has either been removed or renamed
         if (fileIndex != -1) {

=== modified file 'PhotogridView.qml'
--- PhotogridView.qml	2015-01-24 13:05:54 +0000
+++ PhotogridView.qml	2015-01-28 15:58:22 +0000
@@ -111,7 +111,9 @@
                 
                 asynchronous: true
                 cache: false
-                source: photogridView.inView ? "image://thumbnailer/" + fileURL.toString() : ""
+                // The thumbnailer does not seem to check when an image has been changed on disk,
+                // so we use this hack to force it to check and refresh if necessary.
+                source: photogridView.inView ? "image://thumbnailer/" + fileURL.toString() + "?at=" + Date.now() : ""
                 sourceSize {
                     width: width
                     height: height