diff options
| author | Frank Reininghaus <[email protected]> | 2014-03-16 18:02:43 +0100 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2014-03-16 18:02:43 +0100 |
| commit | d803ecec242cc4b84f89b396f216d2d33439f810 (patch) | |
| tree | 011ee5ee83bf01f671e8512f24b52877ecbad8a8 /src | |
| parent | c5d9791ad392efffa19108c3ce7a4e6a67453a09 (diff) | |
Use MIME type inheritance to find out if a file contains text
Before this commit, filenamesearch checked if a file's MIME type begins
with "text/" to determine if its content can be searched. This prevented
that text inside shell scripts is found.
BUG: 332143
REVIEW: 116805
FIXED-IN: 4.12.4
Diffstat (limited to 'src')
| -rw-r--r-- | src/search/filenamesearchprotocol.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/search/filenamesearchprotocol.cpp b/src/search/filenamesearchprotocol.cpp index 4d6f59fa4..fd7f09a88 100644 --- a/src/search/filenamesearchprotocol.cpp +++ b/src/search/filenamesearchprotocol.cpp @@ -91,8 +91,11 @@ void FileNameSearchProtocol::searchDirectory(const KUrl& directory) bool addItem = false; if (!m_regExp || item.name().contains(*m_regExp)) { addItem = true; - } else if (m_checkContent && item.mimetype().startsWith(QLatin1String("text/"))) { + } else if (m_checkContent && item.determineMimeType()->is(QLatin1String("text/plain"))) { + qDebug() << "### Checking" << item; addItem = contentContainsPattern(item.url()); + } else { + qDebug() << "### NOT Checking" << item; } if (addItem) { |