diff --git a/src/models/documentsmodel.cpp b/src/models/documentsmodel.cpp index 25e5303..bd34c4a 100644 --- a/src/models/documentsmodel.cpp +++ b/src/models/documentsmodel.cpp @@ -1,72 +1,70 @@ #include "documentsmodel.h" #include Q_DECLARE_METATYPE (FMH::MODEL_LIST) Q_DECLARE_METATYPE (FMH::MODEL) DocumentsModel::DocumentsModel(QObject * parent) : MauiList (parent) { qRegisterMetaType("MODEL_LIST"); qRegisterMetaType("MODEL"); FileLoader *loader = new FileLoader; loader->moveToThread(&m_worker); connect(&m_worker, &QThread::finished, loader, &QObject::deleteLater); - connect(this, &DocumentsModel::start, loader, &FileLoader::fetch); - // connect(loader, &FileLoader::resultReady, this, &DocumentsModel::setList); - connect(loader, &FileLoader::itemReady, this, &DocumentsModel::append); + connect(this, &DocumentsModel::start, loader, &FileLoader::fetch); + connect(loader, &FileLoader::itemReady, this, &DocumentsModel::append); m_worker.start(); } DocumentsModel::~DocumentsModel() { m_worker.quit(); - m_worker.wait(); + m_worker.wait(); } void DocumentsModel::setList(const FMH::MODEL_LIST &list) { emit this->preListChanged (); this->m_list = list; emit this->postListChanged (); } void DocumentsModel::append(const FMH::MODEL &item) { emit this->preItemAppended (); this->m_list << item; emit this->postItemAppended (); } void FileLoader::fetch(const QList & urls) { FMH::MODEL_LIST res; for(const auto &url : urls) { QDirIterator it(url.toLocalFile(), FMH::FILTER_LIST[FMH::FILTER_TYPE::TEXT], QDir::Files | QDir::NoDotAndDotDot | QDir::NoSymLinks, QDirIterator::Subdirectories); while (it.hasNext()) { const auto item = FMH::getFileInfoModel (QUrl::fromLocalFile (it.next ())); res << item; emit this->itemReady (item); } } - - emit this->resultReady(res); +// emit this->resultReady(res); } FMH::MODEL_LIST DocumentsModel::items() const { return this->m_list; } void DocumentsModel::componentComplete() { - emit this->start({FMH::HomePath}); + emit this->start({FMH::DocumentsPath, FMH::DownloadsPath, FMH::DesktopPath}); }