diff --git a/liteidex/src/liteapp/filemanager.cpp b/liteidex/src/liteapp/filemanager.cpp index 66fad801d..ca76e7c9e 100644 --- a/liteidex/src/liteapp/filemanager.cpp +++ b/liteidex/src/liteapp/filemanager.cpp @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -547,12 +548,27 @@ void FileManager::applyOption(QString id) m_fileWatcherAutoReload = m_liteApp->settings()->value(LITEAPP_FILEWATCHERAUTORELOAD,false).toBool(); } +static QByteArray fileContentHash(const QString &fileName) +{ + QFile file(fileName); + if (!file.open(QIODevice::ReadOnly)) { + return QByteArray(); + } + QCryptographicHash hash(QCryptographicHash::Sha256); + if (!hash.addData(&file)) { + return QByteArray(); + } + return hash.result(); +} + void FileManager::updateFileState(const QString &fileName) { if (fileName.isEmpty()) { return; } m_fileStateMap.insert(fileName,QFileInfo(fileName).lastModified()); + m_fileSizeMap.insert(fileName,QFileInfo(fileName).size()); + m_fileHashMap.insert(fileName,fileContentHash(fileName)); if (!m_fileWatcher->files().contains(fileName)) { m_fileWatcher->addPath(fileName);; } @@ -563,6 +579,7 @@ void FileManager::editorCreated(LiteApi::IEditor *editor) if (!editor) { return; } + connect(editor,SIGNAL(reloaded()),this,SLOT(editorReloaded())); QString fileName = editor->filePath(); if (!fileName.isEmpty()) { updateFileState(fileName); @@ -577,6 +594,8 @@ void FileManager::editorAboutToClose(LiteApi::IEditor *editor) QString fileName = editor->filePath(); if (!fileName.isEmpty()) { m_fileStateMap.remove(fileName); + m_fileSizeMap.remove(fileName); + m_fileHashMap.remove(fileName); m_changedFiles.remove(fileName); m_fileWatcher->removePath(fileName); } @@ -590,6 +609,11 @@ void FileManager::editorSaved(LiteApi::IEditor *editor) updateFileState(editor->filePath()); } +void FileManager::editorReloaded() +{ + editorSaved(qobject_cast(sender())); +} + void FileManager::fileChanged(QString fileName) { const bool wasempty = m_changedFiles.isEmpty(); @@ -712,6 +736,14 @@ void FileManager::checkForReload() if (!m_fileWatcher->files().contains(fileName)) { m_fileWatcher->addPath(fileName);; } + // Compare with the last loaded/saved file, not the unsaved editor buffer. + const QFileInfo fileInfo(fileName); + const bool sameSize = fileInfo.size() == m_fileSizeMap.value(fileName, -1); + const QByteArray hash = sameSize ? fileContentHash(fileName) : QByteArray(); + if (sameSize && !hash.isEmpty() && hash == m_fileHashMap.value(fileName)) { + m_fileStateMap.insert(fileName,lastModified); + continue; + } if (lastModified > modified) { int ret = QMessageBox::Yes; if (lastReloadRet != QMessageBox::YesToAll) { @@ -734,9 +766,10 @@ void FileManager::checkForReload() QDateTime lastModified = QFileInfo(fileName).lastModified(); QDateTime modified = m_fileStateMap.value(fileName); if (lastModified != modified) { - editor->reload(); - m_fileStateMap.insert(fileName,lastModified); - m_liteApp->appendLog("EditorManager",fileName+" reload",false); + if (editor->reload()) { + updateFileState(fileName); + m_liteApp->appendLog("EditorManager",fileName+" reload",false); + } } } diff --git a/liteidex/src/liteapp/filemanager.h b/liteidex/src/liteapp/filemanager.h index 38beba995..6a5005bac 100644 --- a/liteidex/src/liteapp/filemanager.h +++ b/liteidex/src/liteapp/filemanager.h @@ -94,6 +94,7 @@ public slots: void fileChanged(QString); void editorSaved(LiteApi::IEditor*); void editorCreated(LiteApi::IEditor*); + void editorReloaded(); void editorAboutToClose(LiteApi::IEditor*); void checkForReload(); void applyOption(QString); @@ -107,6 +108,8 @@ public slots: IFolderWindow *m_folderWindow; QFileSystemWatcher *m_fileWatcher; QMap m_fileStateMap; + QMap m_fileSizeMap; + QMap m_fileHashMap; QSet m_changedFiles; bool m_checkBlockActivated; bool m_checkOnFocusChange;