Split polling watcher out to its own seperate files.
Just helps maintain sanity and clarity a bit. Change-Id: Iaf00f9ecf2d959afcd8fe18bbca71a403cf9818d Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
This commit is contained in:
Robin Burchell
Qt by Nokia
parent
73187281c3
commit
4b31b4e9e7
@ -35,6 +35,7 @@ HEADERS += \
|
||||
io/qfsfileengine_iterator_p.h \
|
||||
io/qfilesystemwatcher.h \
|
||||
io/qfilesystemwatcher_p.h \
|
||||
io/qfilesystemwatcher_polling_p.h \
|
||||
io/qfilesystementry_p.h \
|
||||
io/qfilesystemengine_p.h \
|
||||
io/qfilesystemmetadata_p.h \
|
||||
@ -65,6 +66,7 @@ SOURCES += \
|
||||
io/qfsfileengine.cpp \
|
||||
io/qfsfileengine_iterator.cpp \
|
||||
io/qfilesystemwatcher.cpp \
|
||||
io/qfilesystemwatcher_polling.cpp \
|
||||
io/qfilesystementry.cpp \
|
||||
io/qfilesystemengine.cpp
|
||||
|
||||
|
||||
@ -52,6 +52,8 @@
|
||||
#include <qset.h>
|
||||
#include <qtimer.h>
|
||||
|
||||
|
||||
#include "qfilesystemwatcher_polling_p.h"
|
||||
#if defined(Q_OS_WIN)
|
||||
# include "qfilesystemwatcher_win_p.h"
|
||||
#elif defined(Q_OS_LINUX)
|
||||
@ -65,182 +67,6 @@
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
enum { PollingInterval = 1000 };
|
||||
|
||||
class QPollingFileSystemWatcherEngine : public QFileSystemWatcherEngine
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
class FileInfo
|
||||
{
|
||||
uint ownerId;
|
||||
uint groupId;
|
||||
QFile::Permissions permissions;
|
||||
QDateTime lastModified;
|
||||
QStringList entries;
|
||||
|
||||
public:
|
||||
FileInfo(const QFileInfo &fileInfo)
|
||||
: ownerId(fileInfo.ownerId()),
|
||||
groupId(fileInfo.groupId()),
|
||||
permissions(fileInfo.permissions()),
|
||||
lastModified(fileInfo.lastModified())
|
||||
{
|
||||
if (fileInfo.isDir()) {
|
||||
entries = fileInfo.absoluteDir().entryList(QDir::AllEntries);
|
||||
}
|
||||
}
|
||||
FileInfo &operator=(const QFileInfo &fileInfo)
|
||||
{
|
||||
*this = FileInfo(fileInfo);
|
||||
return *this;
|
||||
}
|
||||
|
||||
bool operator!=(const QFileInfo &fileInfo) const
|
||||
{
|
||||
if (fileInfo.isDir() && entries != fileInfo.absoluteDir().entryList(QDir::AllEntries))
|
||||
return true;
|
||||
return (ownerId != fileInfo.ownerId()
|
||||
|| groupId != fileInfo.groupId()
|
||||
|| permissions != fileInfo.permissions()
|
||||
|| lastModified != fileInfo.lastModified());
|
||||
}
|
||||
};
|
||||
|
||||
mutable QMutex mutex;
|
||||
QHash<QString, FileInfo> files, directories;
|
||||
|
||||
public:
|
||||
QPollingFileSystemWatcherEngine();
|
||||
|
||||
void run();
|
||||
|
||||
QStringList addPaths(const QStringList &paths, QStringList *files, QStringList *directories);
|
||||
QStringList removePaths(const QStringList &paths, QStringList *files, QStringList *directories);
|
||||
|
||||
void stop();
|
||||
|
||||
private Q_SLOTS:
|
||||
void timeout();
|
||||
};
|
||||
|
||||
QPollingFileSystemWatcherEngine::QPollingFileSystemWatcherEngine()
|
||||
{
|
||||
#ifndef QT_NO_THREAD
|
||||
moveToThread(this);
|
||||
#endif
|
||||
}
|
||||
|
||||
void QPollingFileSystemWatcherEngine::run()
|
||||
{
|
||||
QTimer timer;
|
||||
connect(&timer, SIGNAL(timeout()), SLOT(timeout()));
|
||||
timer.start(PollingInterval);
|
||||
(void) exec();
|
||||
}
|
||||
|
||||
QStringList QPollingFileSystemWatcherEngine::addPaths(const QStringList &paths,
|
||||
QStringList *files,
|
||||
QStringList *directories)
|
||||
{
|
||||
QMutexLocker locker(&mutex);
|
||||
QStringList p = paths;
|
||||
QMutableListIterator<QString> it(p);
|
||||
while (it.hasNext()) {
|
||||
QString path = it.next();
|
||||
QFileInfo fi(path);
|
||||
if (!fi.exists())
|
||||
continue;
|
||||
if (fi.isDir()) {
|
||||
if (!directories->contains(path))
|
||||
directories->append(path);
|
||||
if (!path.endsWith(QLatin1Char('/')))
|
||||
fi = QFileInfo(path + QLatin1Char('/'));
|
||||
this->directories.insert(path, fi);
|
||||
} else {
|
||||
if (!files->contains(path))
|
||||
files->append(path);
|
||||
this->files.insert(path, fi);
|
||||
}
|
||||
it.remove();
|
||||
}
|
||||
start();
|
||||
return p;
|
||||
}
|
||||
|
||||
QStringList QPollingFileSystemWatcherEngine::removePaths(const QStringList &paths,
|
||||
QStringList *files,
|
||||
QStringList *directories)
|
||||
{
|
||||
QMutexLocker locker(&mutex);
|
||||
QStringList p = paths;
|
||||
QMutableListIterator<QString> it(p);
|
||||
while (it.hasNext()) {
|
||||
QString path = it.next();
|
||||
if (this->directories.remove(path)) {
|
||||
directories->removeAll(path);
|
||||
it.remove();
|
||||
} else if (this->files.remove(path)) {
|
||||
files->removeAll(path);
|
||||
it.remove();
|
||||
}
|
||||
}
|
||||
if (this->files.isEmpty() && this->directories.isEmpty()) {
|
||||
locker.unlock();
|
||||
stop();
|
||||
wait();
|
||||
}
|
||||
return p;
|
||||
}
|
||||
|
||||
void QPollingFileSystemWatcherEngine::stop()
|
||||
{
|
||||
quit();
|
||||
}
|
||||
|
||||
void QPollingFileSystemWatcherEngine::timeout()
|
||||
{
|
||||
QMutexLocker locker(&mutex);
|
||||
QMutableHashIterator<QString, FileInfo> fit(files);
|
||||
while (fit.hasNext()) {
|
||||
QHash<QString, FileInfo>::iterator x = fit.next();
|
||||
QString path = x.key();
|
||||
QFileInfo fi(path);
|
||||
if (!fi.exists()) {
|
||||
fit.remove();
|
||||
emit fileChanged(path, true);
|
||||
} else if (x.value() != fi) {
|
||||
x.value() = fi;
|
||||
emit fileChanged(path, false);
|
||||
}
|
||||
}
|
||||
QMutableHashIterator<QString, FileInfo> dit(directories);
|
||||
while (dit.hasNext()) {
|
||||
QHash<QString, FileInfo>::iterator x = dit.next();
|
||||
QString path = x.key();
|
||||
QFileInfo fi(path);
|
||||
if (!path.endsWith(QLatin1Char('/')))
|
||||
fi = QFileInfo(path + QLatin1Char('/'));
|
||||
if (!fi.exists()) {
|
||||
dit.remove();
|
||||
emit directoryChanged(path, true);
|
||||
} else if (x.value() != fi) {
|
||||
fi.refresh();
|
||||
if (!fi.exists()) {
|
||||
dit.remove();
|
||||
emit directoryChanged(path, true);
|
||||
} else {
|
||||
x.value() = fi;
|
||||
emit directoryChanged(path, false);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
QFileSystemWatcherEngine *QFileSystemWatcherPrivate::createNativeEngine()
|
||||
{
|
||||
#if defined(Q_OS_WIN)
|
||||
@ -632,7 +458,5 @@ QT_END_NAMESPACE
|
||||
|
||||
#include "moc_qfilesystemwatcher.cpp"
|
||||
|
||||
#include "qfilesystemwatcher.moc"
|
||||
|
||||
#endif // QT_NO_FILESYSTEMWATCHER
|
||||
|
||||
|
||||
160
src/corelib/io/qfilesystemwatcher_polling.cpp
Normal file
160
src/corelib/io/qfilesystemwatcher_polling.cpp
Normal file
@ -0,0 +1,160 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** All rights reserved.
|
||||
** Contact: Nokia Corporation (qt-info@nokia.com)
|
||||
**
|
||||
** This file is part of the QtCore module of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** GNU Lesser General Public License Usage
|
||||
** This file may be used under the terms of the GNU Lesser General Public
|
||||
** License version 2.1 as published by the Free Software Foundation and
|
||||
** appearing in the file LICENSE.LGPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU Lesser
|
||||
** General Public License version 2.1 requirements will be met:
|
||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Nokia gives you certain additional
|
||||
** rights. These rights are described in the Nokia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU General
|
||||
** Public License version 3.0 as published by the Free Software Foundation
|
||||
** and appearing in the file LICENSE.GPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU General
|
||||
** Public License version 3.0 requirements will be met:
|
||||
** http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
** Other Usage
|
||||
** Alternatively, this file may be used in accordance with the terms and
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "qfilesystemwatcher_polling_p.h"
|
||||
#include <QtCore/qtimer.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
QPollingFileSystemWatcherEngine::QPollingFileSystemWatcherEngine()
|
||||
{
|
||||
#ifndef QT_NO_THREAD
|
||||
moveToThread(this);
|
||||
#endif
|
||||
}
|
||||
|
||||
void QPollingFileSystemWatcherEngine::run()
|
||||
{
|
||||
QTimer timer;
|
||||
connect(&timer, SIGNAL(timeout()), SLOT(timeout()));
|
||||
timer.start(PollingInterval);
|
||||
(void) exec();
|
||||
}
|
||||
|
||||
QStringList QPollingFileSystemWatcherEngine::addPaths(const QStringList &paths,
|
||||
QStringList *files,
|
||||
QStringList *directories)
|
||||
{
|
||||
QMutexLocker locker(&mutex);
|
||||
QStringList p = paths;
|
||||
QMutableListIterator<QString> it(p);
|
||||
while (it.hasNext()) {
|
||||
QString path = it.next();
|
||||
QFileInfo fi(path);
|
||||
if (!fi.exists())
|
||||
continue;
|
||||
if (fi.isDir()) {
|
||||
if (!directories->contains(path))
|
||||
directories->append(path);
|
||||
if (!path.endsWith(QLatin1Char('/')))
|
||||
fi = QFileInfo(path + QLatin1Char('/'));
|
||||
this->directories.insert(path, fi);
|
||||
} else {
|
||||
if (!files->contains(path))
|
||||
files->append(path);
|
||||
this->files.insert(path, fi);
|
||||
}
|
||||
it.remove();
|
||||
}
|
||||
start();
|
||||
return p;
|
||||
}
|
||||
|
||||
QStringList QPollingFileSystemWatcherEngine::removePaths(const QStringList &paths,
|
||||
QStringList *files,
|
||||
QStringList *directories)
|
||||
{
|
||||
QMutexLocker locker(&mutex);
|
||||
QStringList p = paths;
|
||||
QMutableListIterator<QString> it(p);
|
||||
while (it.hasNext()) {
|
||||
QString path = it.next();
|
||||
if (this->directories.remove(path)) {
|
||||
directories->removeAll(path);
|
||||
it.remove();
|
||||
} else if (this->files.remove(path)) {
|
||||
files->removeAll(path);
|
||||
it.remove();
|
||||
}
|
||||
}
|
||||
if (this->files.isEmpty() && this->directories.isEmpty()) {
|
||||
locker.unlock();
|
||||
stop();
|
||||
wait();
|
||||
}
|
||||
return p;
|
||||
}
|
||||
|
||||
void QPollingFileSystemWatcherEngine::stop()
|
||||
{
|
||||
quit();
|
||||
}
|
||||
|
||||
void QPollingFileSystemWatcherEngine::timeout()
|
||||
{
|
||||
QMutexLocker locker(&mutex);
|
||||
QMutableHashIterator<QString, FileInfo> fit(files);
|
||||
while (fit.hasNext()) {
|
||||
QHash<QString, FileInfo>::iterator x = fit.next();
|
||||
QString path = x.key();
|
||||
QFileInfo fi(path);
|
||||
if (!fi.exists()) {
|
||||
fit.remove();
|
||||
emit fileChanged(path, true);
|
||||
} else if (x.value() != fi) {
|
||||
x.value() = fi;
|
||||
emit fileChanged(path, false);
|
||||
}
|
||||
}
|
||||
QMutableHashIterator<QString, FileInfo> dit(directories);
|
||||
while (dit.hasNext()) {
|
||||
QHash<QString, FileInfo>::iterator x = dit.next();
|
||||
QString path = x.key();
|
||||
QFileInfo fi(path);
|
||||
if (!path.endsWith(QLatin1Char('/')))
|
||||
fi = QFileInfo(path + QLatin1Char('/'));
|
||||
if (!fi.exists()) {
|
||||
dit.remove();
|
||||
emit directoryChanged(path, true);
|
||||
} else if (x.value() != fi) {
|
||||
fi.refresh();
|
||||
if (!fi.exists()) {
|
||||
dit.remove();
|
||||
emit directoryChanged(path, true);
|
||||
} else {
|
||||
x.value() = fi;
|
||||
emit directoryChanged(path, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
QT_END_NAMESPACE
|
||||
127
src/corelib/io/qfilesystemwatcher_polling_p.h
Normal file
127
src/corelib/io/qfilesystemwatcher_polling_p.h
Normal file
@ -0,0 +1,127 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** All rights reserved.
|
||||
** Contact: Nokia Corporation (qt-info@nokia.com)
|
||||
**
|
||||
** This file is part of the QtCore module of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** GNU Lesser General Public License Usage
|
||||
** This file may be used under the terms of the GNU Lesser General Public
|
||||
** License version 2.1 as published by the Free Software Foundation and
|
||||
** appearing in the file LICENSE.LGPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU Lesser
|
||||
** General Public License version 2.1 requirements will be met:
|
||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Nokia gives you certain additional
|
||||
** rights. These rights are described in the Nokia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU General
|
||||
** Public License version 3.0 as published by the Free Software Foundation
|
||||
** and appearing in the file LICENSE.GPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU General
|
||||
** Public License version 3.0 requirements will be met:
|
||||
** http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
** Other Usage
|
||||
** Alternatively, this file may be used in accordance with the terms and
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef QFILESYSTEMWATCHER_POLLING_P_H
|
||||
#define QFILESYSTEMWATCHER_POLLING_P_H
|
||||
|
||||
//
|
||||
// W A R N I N G
|
||||
// -------------
|
||||
//
|
||||
// This file is not part of the Qt API. It exists for the convenience
|
||||
// of the QLibrary class. This header file may change from
|
||||
// version to version without notice, or even be removed.
|
||||
//
|
||||
// We mean it.
|
||||
//
|
||||
|
||||
#include <QtCore/qfileinfo.h>
|
||||
#include <QtCore/qmutex.h>
|
||||
#include <QtCore/qdatetime.h>
|
||||
#include <QtCore/qdir.h>
|
||||
|
||||
#include "qfilesystemwatcher_p.h"
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
enum { PollingInterval = 1000 };
|
||||
|
||||
class QPollingFileSystemWatcherEngine : public QFileSystemWatcherEngine
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
class FileInfo
|
||||
{
|
||||
uint ownerId;
|
||||
uint groupId;
|
||||
QFile::Permissions permissions;
|
||||
QDateTime lastModified;
|
||||
QStringList entries;
|
||||
|
||||
public:
|
||||
FileInfo(const QFileInfo &fileInfo)
|
||||
: ownerId(fileInfo.ownerId()),
|
||||
groupId(fileInfo.groupId()),
|
||||
permissions(fileInfo.permissions()),
|
||||
lastModified(fileInfo.lastModified())
|
||||
{
|
||||
if (fileInfo.isDir()) {
|
||||
entries = fileInfo.absoluteDir().entryList(QDir::AllEntries);
|
||||
}
|
||||
}
|
||||
FileInfo &operator=(const QFileInfo &fileInfo)
|
||||
{
|
||||
*this = FileInfo(fileInfo);
|
||||
return *this;
|
||||
}
|
||||
|
||||
bool operator!=(const QFileInfo &fileInfo) const
|
||||
{
|
||||
if (fileInfo.isDir() && entries != fileInfo.absoluteDir().entryList(QDir::AllEntries))
|
||||
return true;
|
||||
return (ownerId != fileInfo.ownerId()
|
||||
|| groupId != fileInfo.groupId()
|
||||
|| permissions != fileInfo.permissions()
|
||||
|| lastModified != fileInfo.lastModified());
|
||||
}
|
||||
};
|
||||
|
||||
mutable QMutex mutex;
|
||||
QHash<QString, FileInfo> files, directories;
|
||||
|
||||
public:
|
||||
QPollingFileSystemWatcherEngine();
|
||||
|
||||
void run();
|
||||
|
||||
QStringList addPaths(const QStringList &paths, QStringList *files, QStringList *directories);
|
||||
QStringList removePaths(const QStringList &paths, QStringList *files, QStringList *directories);
|
||||
|
||||
void stop();
|
||||
|
||||
private Q_SLOTS:
|
||||
void timeout();
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // QFILESYSTEMWATCHER_POLLING_P_H
|
||||
|
||||
Loading…
Reference in New Issue
Block a user