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

[Arthur Mello]

Make sure we do not monitor hidden directories

Make sure we do not monitor hidden directories

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:953
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/791/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-amd64-ci/216
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/217
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/217/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-i386-ci/216
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-trusty-touch/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4771
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-trusty-armhf/69
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5930
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4900
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4900/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~artmello/gallery-app/gallery-app-ignore_dot_directories]

954. By Arthur Mello on 2014-04-11

Update media monitor unittest

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:954
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/793/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-amd64-ci/218
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/219
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/219/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-i386-ci/218
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-trusty-touch/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4803
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-trusty-armhf/71
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5974
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4935
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4935/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Arthur Mello (artmello)]

Are there any related MPs required for this MP to build/function as expected? Please list:
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes):
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?:
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/gallery-app) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
No UI changes.

If you changed the packaging (debian), did you subscribe a core-dev to this MP?
No packaging changes.

=== modified file 'src/media/media-monitor.cpp'
--- src/media/media-monitor.cpp	2014-03-28 15:34:24 +0000
+++ src/media/media-monitor.cpp	2014-04-11 18:09:40 +0000
@@ -172,7 +172,9 @@
                 // If it's a SymLink and points to a valid target need to get the target path
                 path = info.symLinkTarget();
             }
-            if(!dirList.contains(path)) {
+
+            QFileInfo pathInfo(path);
+            if(!dirList.contains(path) && !pathInfo.isHidden()) {
                 // In case we already visited the folder we didn't expand it anymore
                 dirStack.push(path);
             }

=== modified file 'tests/unittests/mediamonitor/tst_mediamonitor.cpp'
--- tests/unittests/mediamonitor/tst_mediamonitor.cpp	2014-03-14 23:33:01 +0000
+++ tests/unittests/mediamonitor/tst_mediamonitor.cpp	2014-04-11 18:09:40 +0000
@@ -49,6 +49,13 @@
     dir->mkpath("B/A");
     dir->mkpath("B/B");
 
+    // Create a hidden directory
+    dir->mkpath(".H/A");
+    dir->mkpath(".H/B");
+
+    // Create symlink
+    QFile::link(m_tmpDir->path() + "/.H", m_tmpDir->path() + "L");
+
     // Create sample image
     m_sampleImage = new QImage(400, 600, QImage::Format_RGB32);
     m_sampleImage->fill(QColor(Qt::red));
@@ -68,9 +75,14 @@
     m_sampleImage->save(m_tmpDir->path() + "/B/A/sample_BA.jpg", "JPG");
     m_sampleImage->save(m_tmpDir->path() + "/B/B/sample_BB.jpg", "JPG");
 
+    m_sampleImage->save(m_tmpDir->path() + "/.H/A/sample_HA.jpg", "JPG");
+    m_sampleImage->save(m_tmpDir->path() + "/.H/B/sample_HB.jpg", "JPG");
+
     m_sampleImage->save(m_tmpDir->path() + "/A/sample_A.jpg", "JPG");
     m_sampleImage->save(m_tmpDir->path() + "/B/sample_B.jpg", "JPG");
 
+    m_sampleImage->save(m_tmpDir->path() + "/.H/sample_H.jpg", "JPG");
+
     m_sampleImage->save(m_tmpDir->path() + "/sample.jpg", "JPG");
 
     QTRY_COMPARE_WITH_TIMEOUT(m_monitor->manifest().count(), 7, 10000);