github/gpt4all
1
0
Fork 0
mirror of https://github.com/nomic-ai/gpt4all.git synced 2025-07-05 03:27:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix GUI hang with localdocs by removing file system watcher in modellist.

Browse Source
This commit is contained in:
Adam Treat 2023-11-17 13:27:17 -05:00
parent c1809a23ba
commit 9a3dd8815d
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gpt4all-chat/download.cpp
View File

@ -385,8 +385,9 @@ void HashAndSaveFile::hashAndSave(const QString &expectedHash, const QString &sa
qWarning() << errorString; qWarning() << errorString;
tempFile->close(); tempFile->close();
emit hashAndSaveFinished(false, errorString, tempFile, modelReply); emit hashAndSaveFinished(false, errorString, tempFile, modelReply);
return;
} }
ModelList::globalInstance()->updateModelsFromDirectory();
} }
void Download::handleModelDownloadFinished() void Download::handleModelDownloadFinished()

6
gpt4all-chat/modellist.cpp
View File

@ -264,11 +264,7 @@ ModelList::ModelList()
m_embeddingModels->setSourceModel(this); m_embeddingModels->setSourceModel(this);
m_installedModels->setSourceModel(this); m_installedModels->setSourceModel(this);
m_downloadableModels->setSourceModel(this); m_downloadableModels->setSourceModel(this);
m_watcher = new QFileSystemWatcher(this);
const QString exePath = QCoreApplication::applicationDirPath() + QDir::separator();
m_watcher->addPath(exePath);
m_watcher->addPath(MySettings::globalInstance()->modelPath());
connect(m_watcher, &QFileSystemWatcher::directoryChanged, this, &ModelList::updateModelsFromDirectory);
connect(MySettings::globalInstance(), &MySettings::modelPathChanged, this, &ModelList::updateModelsFromDirectory); connect(MySettings::globalInstance(), &MySettings::modelPathChanged, this, &ModelList::updateModelsFromDirectory);
connect(MySettings::globalInstance(), &MySettings::modelPathChanged, this, &ModelList::updateModelsFromJson); connect(MySettings::globalInstance(), &MySettings::modelPathChanged, this, &ModelList::updateModelsFromJson);
connect(MySettings::globalInstance(), &MySettings::modelPathChanged, this, &ModelList::updateModelsFromSettings); connect(MySettings::globalInstance(), &MySettings::modelPathChanged, this, &ModelList::updateModelsFromSettings);

4
gpt4all-chat/modellist.h
View File

@ -320,6 +320,8 @@ public:
QString incompleteDownloadPath(const QString &modelFile); QString incompleteDownloadPath(const QString &modelFile);
bool asyncModelRequestOngoing() const { return m_asyncModelRequestOngoing; } bool asyncModelRequestOngoing() const { return m_asyncModelRequestOngoing; }
void updateModelsFromDirectory();
Q_SIGNALS: Q_SIGNALS:
void countChanged(); void countChanged();
void embeddingModelsChanged(); void embeddingModelsChanged();
@ -333,7 +335,6 @@ private Q_SLOTS:
void updateModelsFromJson(); void updateModelsFromJson();
void updateModelsFromJsonAsync(); void updateModelsFromJsonAsync();
void updateModelsFromSettings(); void updateModelsFromSettings();
void updateModelsFromDirectory();
void updateDataForSettings(); void updateDataForSettings();
void handleModelsJsonDownloadFinished(); void handleModelsJsonDownloadFinished();
void handleModelsJsonDownloadErrorOccurred(QNetworkReply::NetworkError code); void handleModelsJsonDownloadErrorOccurred(QNetworkReply::NetworkError code);
@ -355,7 +356,6 @@ private:
DownloadableModels *m_downloadableModels; DownloadableModels *m_downloadableModels;
QList<ModelInfo*> m_models; QList<ModelInfo*> m_models;
QHash<QString, ModelInfo*> m_modelMap; QHash<QString, ModelInfo*> m_modelMap;
QFileSystemWatcher *m_watcher;
bool m_asyncModelRequestOngoing; bool m_asyncModelRequestOngoing;
private: private: