Grimmauld/gio-qt
1
0
Fork 0
forked from mirrors/gio-qt
Code Pull requests Activity

feat: optional timeout parameter for DGioFile::createFileInfo.

Browse source
This commit is contained in:
Chris Xiong 2019-10-09 13:25:23 +08:00
parent 48ed50bc3c
commit 1203a0f839
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gio-qt/include/dgiofile.h
View file

@ -55,7 +55,7 @@ public:
QString path() const; QString path() const;
QString uri() const; QString uri() const;
QExplicitlySharedDataPointer<DGioFileInfo> createFileInfo(QString attr = "*", DGioFileQueryInfoFlags queryInfoFlags = FILE_QUERY_INFO_NONE); QExplicitlySharedDataPointer<DGioFileInfo> createFileInfo(QString attr = "*", DGioFileQueryInfoFlags queryInfoFlags = FILE_QUERY_INFO_NONE, unsigned long timeout_msec = ULONG_MAX);
QExplicitlySharedDataPointer<DGioFileInfo> createFileSystemInfo(QString attr = "*"); QExplicitlySharedDataPointer<DGioFileInfo> createFileSystemInfo(QString attr = "*");
QExplicitlySharedDataPointer<DGioFileIterator> createFileIterator(QString attr = "*", DGioFileQueryInfoFlags queryInfoFlags = FILE_QUERY_INFO_NONE); QExplicitlySharedDataPointer<DGioFileIterator> createFileIterator(QString attr = "*", DGioFileQueryInfoFlags queryInfoFlags = FILE_QUERY_INFO_NONE);
void createFileIteratorAsync(QString attr = "*", DGioFileQueryInfoFlags queryInfoFlags = FILE_QUERY_INFO_NONE); void createFileIteratorAsync(QString attr = "*", DGioFileQueryInfoFlags queryInfoFlags = FILE_QUERY_INFO_NONE);

23
gio-qt/source/dgiofile.cpp
View file

@ -29,6 +29,10 @@
#include <giomm/fileenumerator.h> #include <giomm/fileenumerator.h>
#include <QDebug> #include <QDebug>
#include <QWaitCondition>
#include <QMutex>
#include <QTime>
#include <QtConcurrent/QtConcurrentRun>
#include <dgiomountoperation.h> #include <dgiomountoperation.h>
using namespace Gio; using namespace Gio;
@ -223,15 +227,28 @@ QString DGioFile::uri() const
* *
* \return the created file info object, or nullptr if create failed. * \return the created file info object, or nullptr if create failed.
*/ */
QExplicitlySharedDataPointer<DGioFileInfo> DGioFile::createFileInfo(QString attr, DGioFileQueryInfoFlags queryInfoFlags) QExplicitlySharedDataPointer<DGioFileInfo> DGioFile::createFileInfo(QString attr, DGioFileQueryInfoFlags queryInfoFlags, unsigned long timeout_msec)
{ {
Q_D(DGioFile); Q_D(DGioFile);
try { try {
unsigned int flagValue = queryInfoFlags; unsigned int flagValue = queryInfoFlags;
FileQueryInfoFlags flags = static_cast<FileQueryInfoFlags>(flagValue); FileQueryInfoFlags flags = static_cast<FileQueryInfoFlags>(flagValue);
Glib::RefPtr<FileInfo> gmmFileInfo = d->getGmmFileInstance()->query_info(attr.toStdString(), flags); Glib::RefPtr<FileInfo> gmmFileInfo;
if (gmmFileInfo) { QWaitCondition cond;
QtConcurrent::run([&] {
QTime t;
t.start();
gmmFileInfo = d->getGmmFileInstance()->query_info(attr.toStdString(), flags);
if (t.elapsed() < timeout_msec) {
cond.wakeAll();
}
});
QMutex m;
m.lock();
bool finished = cond.wait(&m, timeout_msec);
m.unlock();
if (finished && gmmFileInfo) {
QExplicitlySharedDataPointer<DGioFileInfo> fileInfoPtr(new DGioFileInfo(gmmFileInfo.release())); QExplicitlySharedDataPointer<DGioFileInfo> fileInfoPtr(new DGioFileInfo(gmmFileInfo.release()));
return fileInfoPtr; return fileInfoPtr;
} }