Differential D21578 Diff 59129 src/file/unindexedfileiterator.cpp

Changeset View

Standalone View

View Options

src/file/unindexedfileiterator.cpp

Show First 20 Lines • Show All 68 Lines • ▼ Show 20 Line(s)67 while (1) {
69 m_mTimeChanged = false; 69​ m_mTimeChanged = false;
70 m_cTimeChanged = false; 70​ m_cTimeChanged = false;
71 71​
72 if (filePath.isEmpty()) { 72​ if (filePath.isEmpty()) {
73 m_mimetype.clear(); 73​ m_mimetype.clear();
74 return QString(); 74​ return QString();
75 } 75​ }
76 76​
77 // This mimetype may not be completely accurate, but that's okay. This is 77​ if (shouldIndex(filePath)) {
78 // just the initial phase of indexing. The second phase can try to find ​
79 // a more accurate mimetype. ​
80 m_mimetype = m_mimeDb.mimeTypeForFile(filePath, QMimeDatabase::MatchExtension).name(); ​
81 ​
82 if (shouldIndex(filePath, m_mimetype)) { ​
83 return filePath; 78​ return filePath;
84 } 79​ }
85 } 80​ }
86} 81​}
87 82​
88bool UnIndexedFileIterator::shouldIndex(const QString& filePath, const QString& mimetype) 83​bool UnIndexedFileIterator::shouldIndex(const QString& filePath)
89{ 84​{
90 bool shouldIndexType = m_config->shouldMimeTypeBeIndexed(mimetype); ​
91 if (!shouldIndexType) ​
92 return false; ​
93 ​
94 const QFileInfo fileInfo = m_iter.fileInfo(); 85​ const QFileInfo fileInfo = m_iter.fileInfo();
95 if (!fileInfo.exists()) 86​ if (!fileInfo.exists())
96 return false; 87​ return false;
97 88​
98 quint64 fileId = filePathToId(QFile::encodeName(filePath)); 89​ quint64 fileId = filePathToId(QFile::encodeName(filePath));
99 if (!fileId) { 90​ if (!fileId) {
100 // stat has failed, e.g. when file has been deleted after iteration 91​ // stat has failed, e.g. when file has been deleted after iteration
101 return false; 92​ return false;
Show All 16 Lines
118 // A folders mtime is updated when a new file is added / removed / renamed 109​ // A folders mtime is updated when a new file is added / removed / renamed
119 // we don't really need to reindex a folder when that happens 110​ // we don't really need to reindex a folder when that happens
120 // In fact, we never need to reindex a folder 111​ // In fact, we never need to reindex a folder
121 if (timeInfo.mTime && fileInfo.isDir()) { 112​ if (timeInfo.mTime && fileInfo.isDir()) {
122 return false; 113​ return false;
123 } 114​ }
124 115​
125 if (m_mTimeChanged || m_cTimeChanged) { 116​ if (m_mTimeChanged || m_cTimeChanged) {
117​ if (fileInfo.isDir()) {
118​ m_mimetype = QStringLiteral("inode/directory");
119​ return true;
120​ }
121​
122​ // This mimetype may not be completely accurate, but that's okay. This is
123​ // just the initial phase of indexing. The second phase can try to find
124​ // a more accurate mimetype.
125​ m_mimetype = m_mimeDb.mimeTypeForFile(filePath, QMimeDatabase::MatchExtension).name();
126​ if (!m_config->shouldMimeTypeBeIndexed(m_mimetype)) {
127​ return false;
128​ }
129​
126 qCDebug(BALOO) << filePath << "mtime/ctime changed:" 130​ qCDebug(BALOO) << filePath << "mtime/ctime changed:"
127 << timeInfo.mTime << "/" << timeInfo.cTime << "->" 131​ << timeInfo.mTime << "/" << timeInfo.cTime << "->"
128 << fileInfo.lastModified().toSecsSinceEpoch() << "/" 132​ << fileInfo.lastModified().toSecsSinceEpoch() << "/"
129 << fileInfo.metadataChangeTime().toSecsSinceEpoch(); 133​ << fileInfo.metadataChangeTime().toSecsSinceEpoch();
130 return true; 134​ return true;
131 } 135​ }
132 136​
133 return false; 137​ return false;
134} 138​}