Merge lp:~fboucault/camera-app/video_thumbnails into lp:camera-app

[Florian Boucault]

Ensure video thumbnails are generated as soon as possible by monitoring changes to files themselves.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:351
http://jenkins.qa.ubuntu.com/job/camera-app-ci/255/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/71
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/71/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/71
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/241
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2621
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/380
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/397
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11275
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2895
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2895/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Ugo Riboni (uriboni)]

Everything seems to be ok

review: Approve

=== modified file 'CameraApp/foldersmodel.cpp'
--- CameraApp/foldersmodel.cpp	2014-07-31 19:03:14 +0000
+++ CameraApp/foldersmodel.cpp	2014-08-11 17:43:28 +0000
@@ -25,6 +25,7 @@
 {
     m_watcher = new QFileSystemWatcher(this);
     connect(m_watcher, SIGNAL(directoryChanged(QString)), this, SLOT(directoryChanged(QString)));
+    connect(m_watcher, SIGNAL(fileChanged(QString)), this, SLOT(fileChanged(QString)));
 }
 
 QStringList FoldersModel::folders() const
@@ -83,6 +84,7 @@
         QFileInfoList fileInfoList = currentDir.entryInfoList(QDir::Files | QDir::Readable,
                                                               QDir::Time | QDir::Reversed);
         Q_FOREACH (QFileInfo fileInfo, fileInfoList) {
+            m_watcher->addPath(fileInfo.absoluteFilePath());
             QString type = m_mimeDatabase.mimeTypeForFile(fileInfo).name();
             Q_FOREACH (QString filterType, m_typeFilters) {
                 if (type.startsWith(filterType)) {
@@ -178,6 +180,11 @@
     updateFileInfoList();
 }
 
+void FoldersModel::fileChanged(const QString &filePath)
+{
+    updateFileInfoList();
+}
+
 void FoldersModel::toggleSelected(int row)
 {
     if (m_selectedFiles.contains(row)) {

=== modified file 'CameraApp/foldersmodel.h'
--- CameraApp/foldersmodel.h	2014-07-31 19:03:14 +0000
+++ CameraApp/foldersmodel.h	2014-08-11 17:43:28 +0000
@@ -63,6 +63,7 @@
 
 public Q_SLOTS:
     void directoryChanged(const QString &directoryPath);
+    void fileChanged(const QString &directoryPath);
 
 Q_SIGNALS:
     void foldersChanged();