Fix GUI hang with localdocs by removing file system watcher in modell…

…ist.
nomic-ai · Nov 17, 2023 · 9a3dd88 · 9a3dd88
1 parent c1809a2
commit 9a3dd88
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/gpt4all-chat/download.cpp b/gpt4all-chat/download.cpp
@@ -385,8 +385,9 @@ void HashAndSaveFile::hashAndSave(const QString &expectedHash, const QString &sa
         qWarning() << errorString;
         tempFile->close();
         emit hashAndSaveFinished(false, errorString, tempFile, modelReply);
-        return;
     }
+
+    ModelList::globalInstance()->updateModelsFromDirectory();
 }
 
 void Download::handleModelDownloadFinished()

diff --git a/gpt4all-chat/modellist.cpp b/gpt4all-chat/modellist.cpp
@@ -264,11 +264,7 @@ ModelList::ModelList()
     m_embeddingModels->setSourceModel(this);
     m_installedModels->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::updateModelsFromJson);
     connect(MySettings::globalInstance(), &MySettings::modelPathChanged, this, &ModelList::updateModelsFromSettings);

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