1
=== modified file 'src/media/media-monitor.cpp'
2
--- src/media/media-monitor.cpp	2014-03-28 15:34:24 +0000
3
+++ src/media/media-monitor.cpp	2014-04-11 18:09:40 +0000
4
@@ -172,7 +172,9 @@
5
172
                // If it's a SymLink and points to a valid target need to get the target path
172
                // If it's a SymLink and points to a valid target need to get the target path
6
173
                path = info.symLinkTarget();
173
                path = info.symLinkTarget();
7
174
            }
174
            }
9
175
            if(!dirList.contains(path)) {
175
10
176
            QFileInfo pathInfo(path);
11
177
            if(!dirList.contains(path) && !pathInfo.isHidden()) {
12
176
                // In case we already visited the folder we didn't expand it anymore
178
                // In case we already visited the folder we didn't expand it anymore
13
177
                dirStack.push(path);
179
                dirStack.push(path);
14
178
            }
180
            }
15
179
181
16
=== modified file 'tests/unittests/mediamonitor/tst_mediamonitor.cpp'
17
--- tests/unittests/mediamonitor/tst_mediamonitor.cpp	2014-03-14 23:33:01 +0000
18
+++ tests/unittests/mediamonitor/tst_mediamonitor.cpp	2014-04-11 18:09:40 +0000
19
@@ -49,6 +49,13 @@
20
49
    dir->mkpath("B/A");
49
    dir->mkpath("B/A");
21
50
    dir->mkpath("B/B");
50
    dir->mkpath("B/B");
22
51
51
23
52
    // Create a hidden directory
24
53
    dir->mkpath(".H/A");
25
54
    dir->mkpath(".H/B");
26
55
27
56
    // Create symlink
28
57
    QFile::link(m_tmpDir->path() + "/.H", m_tmpDir->path() + "L");
29
58
30
52
    // Create sample image
59
    // Create sample image
31
53
    m_sampleImage = new QImage(400, 600, QImage::Format_RGB32);
60
    m_sampleImage = new QImage(400, 600, QImage::Format_RGB32);
32
54
    m_sampleImage->fill(QColor(Qt::red));
61
    m_sampleImage->fill(QColor(Qt::red));
33
@@ -68,9 +75,14 @@
34
68
    m_sampleImage->save(m_tmpDir->path() + "/B/A/sample_BA.jpg", "JPG");
75
    m_sampleImage->save(m_tmpDir->path() + "/B/A/sample_BA.jpg", "JPG");
35
69
    m_sampleImage->save(m_tmpDir->path() + "/B/B/sample_BB.jpg", "JPG");
76
    m_sampleImage->save(m_tmpDir->path() + "/B/B/sample_BB.jpg", "JPG");
36
70
77
37
78
    m_sampleImage->save(m_tmpDir->path() + "/.H/A/sample_HA.jpg", "JPG");
38
79
    m_sampleImage->save(m_tmpDir->path() + "/.H/B/sample_HB.jpg", "JPG");
39
80
40
71
    m_sampleImage->save(m_tmpDir->path() + "/A/sample_A.jpg", "JPG");
81
    m_sampleImage->save(m_tmpDir->path() + "/A/sample_A.jpg", "JPG");
41
72
    m_sampleImage->save(m_tmpDir->path() + "/B/sample_B.jpg", "JPG");
82
    m_sampleImage->save(m_tmpDir->path() + "/B/sample_B.jpg", "JPG");
42
73
83
43
84
    m_sampleImage->save(m_tmpDir->path() + "/.H/sample_H.jpg", "JPG");
44
85
45
74
    m_sampleImage->save(m_tmpDir->path() + "/sample.jpg", "JPG");
86
    m_sampleImage->save(m_tmpDir->path() + "/sample.jpg", "JPG");
46
75
87
47
76
    QTRY_COMPARE_WITH_TIMEOUT(m_monitor->manifest().count(), 7, 10000);
88
    QTRY_COMPARE_WITH_TIMEOUT(m_monitor->manifest().count(), 7, 10000);
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-04-11
Ubuntu Phablet Team		2014-04-10	Pending
Review via email: mp+215285@code.launchpad.net
1	=== modified file 'src/media/media-monitor.cpp'
2	--- src/media/media-monitor.cpp 2014-03-28 15:34:24 +0000
3	+++ src/media/media-monitor.cpp 2014-04-11 18:09:40 +0000
4	@@ -172,7 +172,9 @@
5	172	// If it's a SymLink and points to a valid target need to get the target path	172	// If it's a SymLink and points to a valid target need to get the target path
6	173	path = info.symLinkTarget();	173	path = info.symLinkTarget();
7	174	}	174	}
9	175	if(!dirList.contains(path)) {	175
10			176	QFileInfo pathInfo(path);
11			177	if(!dirList.contains(path) && !pathInfo.isHidden()) {
12	176	// In case we already visited the folder we didn't expand it anymore	178	// In case we already visited the folder we didn't expand it anymore
13	177	dirStack.push(path);	179	dirStack.push(path);
14	178	}	180	}
15	179		181
16	=== modified file 'tests/unittests/mediamonitor/tst_mediamonitor.cpp'
17	--- tests/unittests/mediamonitor/tst_mediamonitor.cpp 2014-03-14 23:33:01 +0000
18	+++ tests/unittests/mediamonitor/tst_mediamonitor.cpp 2014-04-11 18:09:40 +0000
19	@@ -49,6 +49,13 @@
20	49	dir->mkpath("B/A");	49	dir->mkpath("B/A");
21	50	dir->mkpath("B/B");	50	dir->mkpath("B/B");
22	51		51
23			52	// Create a hidden directory
24			53	dir->mkpath(".H/A");
25			54	dir->mkpath(".H/B");
26			55
27			56	// Create symlink
28			57	QFile::link(m_tmpDir->path() + "/.H", m_tmpDir->path() + "L");
29			58
30	52	// Create sample image	59	// Create sample image
31	53	m_sampleImage = new QImage(400, 600, QImage::Format_RGB32);	60	m_sampleImage = new QImage(400, 600, QImage::Format_RGB32);
32	54	m_sampleImage->fill(QColor(Qt::red));	61	m_sampleImage->fill(QColor(Qt::red));
33	@@ -68,9 +75,14 @@
34	68	m_sampleImage->save(m_tmpDir->path() + "/B/A/sample_BA.jpg", "JPG");	75	m_sampleImage->save(m_tmpDir->path() + "/B/A/sample_BA.jpg", "JPG");
35	69	m_sampleImage->save(m_tmpDir->path() + "/B/B/sample_BB.jpg", "JPG");	76	m_sampleImage->save(m_tmpDir->path() + "/B/B/sample_BB.jpg", "JPG");
36	70		77
37			78	m_sampleImage->save(m_tmpDir->path() + "/.H/A/sample_HA.jpg", "JPG");
38			79	m_sampleImage->save(m_tmpDir->path() + "/.H/B/sample_HB.jpg", "JPG");
39			80
40	71	m_sampleImage->save(m_tmpDir->path() + "/A/sample_A.jpg", "JPG");	81	m_sampleImage->save(m_tmpDir->path() + "/A/sample_A.jpg", "JPG");
41	72	m_sampleImage->save(m_tmpDir->path() + "/B/sample_B.jpg", "JPG");	82	m_sampleImage->save(m_tmpDir->path() + "/B/sample_B.jpg", "JPG");
42	73		83
43			84	m_sampleImage->save(m_tmpDir->path() + "/.H/sample_H.jpg", "JPG");
44			85
45	74	m_sampleImage->save(m_tmpDir->path() + "/sample.jpg", "JPG");	86	m_sampleImage->save(m_tmpDir->path() + "/sample.jpg", "JPG");
46	75		87
47	76	QTRY_COMPARE_WITH_TIMEOUT(m_monitor->manifest().count(), 7, 10000);	88	QTRY_COMPARE_WITH_TIMEOUT(m_monitor->manifest().count(), 7, 10000);