feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

MimeDatabase: Avoid opening files even if already file name matches

Browse Source 
Change-Id: If669985f8ef852c31ecbaae76c533c7286e5a294
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Eike Ziller
2015-02-25 15:32:18 +01:00
parent 1e29d5c09e
commit 25989cbf94
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/utils/mimetypes/mimedatabase.cpp
View File

@@ -175,12 +175,16 @@ MimeType MimeDatabasePrivate::mimeTypeForFileNameAndData(const QString &fileName
// Extension is unknown, or matches multiple mimetypes. // Extension is unknown, or matches multiple mimetypes.
// Pass 2) Match on content, if we can read the data // Pass 2) Match on content, if we can read the data
const bool openedByUs = !device->isOpen() && device->open(QIODevice::ReadOnly);
if (device->isOpen()) { if (device->isOpen()) {
// Read 16K in one go (QIODEVICE_BUFFERSIZE in qiodevice_p.h). // Read 16K in one go (QIODEVICE_BUFFERSIZE in qiodevice_p.h).
// This is much faster than seeking back and forth into QIODevice. // This is much faster than seeking back and forth into QIODevice.
const QByteArray data = device->peek(16384); const QByteArray data = device->peek(16384);
if (openedByUs)
device->close();
int magicAccuracy = 0; int magicAccuracy = 0;
MimeType candidateByData(findByData(data, &magicAccuracy)); MimeType candidateByData(findByData(data, &magicAccuracy));
@@ -485,7 +489,6 @@ MimeType MimeDatabase::mimeTypeForFile(const QFileInfo &fileInfo, MatchMode mode
int priority = 0; int priority = 0;
switch (mode) { switch (mode) {
case MatchDefault: case MatchDefault:
file.open(QIODevice::ReadOnly); // isOpen() will be tested by method below
return d->mimeTypeForFileNameAndData(fileInfo.absoluteFilePath(), &file, &priority); return d->mimeTypeForFileNameAndData(fileInfo.absoluteFilePath(), &file, &priority);
case MatchExtension: case MatchExtension:
locker.unlock(); locker.unlock();
@@ -655,10 +658,7 @@ MimeType MimeDatabase::mimeTypeForUrl(const QUrl &url) const
MimeType MimeDatabase::mimeTypeForFileNameAndData(const QString &fileName, QIODevice *device) const MimeType MimeDatabase::mimeTypeForFileNameAndData(const QString &fileName, QIODevice *device) const
{ {
int accuracy = 0; int accuracy = 0;
const bool openedByUs = !device->isOpen() && device->open(QIODevice::ReadOnly);
const MimeType result = d->mimeTypeForFileNameAndData(fileName, device, &accuracy); const MimeType result = d->mimeTypeForFileNameAndData(fileName, device, &accuracy);
if (openedByUs)
device->close();
return result; return result;
} }