diff options
| author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2021-12-13 20:55:24 +0300 |
|---|---|---|
| committer | Hannah von Reth <hannah.vonreth@owncloud.com> | 2021-12-13 20:55:24 +0300 |
| commit | 9f5a57b08584deafd2874e5797becac77753ebd6 (patch) | |
| tree | f9204516c493cc7ea2359bbad928961888cc774b /src/gui/folder.cpp | |
| parent | 4fbf5e21b3678613df4400587c44f555044f3e40 (diff) | |
| parent | f776818cf599a55df4431dc21a20173e6a9d11bf (diff) | |
Merge remote-tracking branch 'origin/2.10'
Diffstat (limited to 'src/gui/folder.cpp')
| -rw-r--r-- | src/gui/folder.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp index bbce18b53..2a45c69a2 100644 --- a/src/gui/folder.cpp +++ b/src/gui/folder.cpp @@ -98,6 +98,9 @@ Folder::Folder(const FolderDefinition &definition, _syncResult.setFolder(_definition.alias); + // those errors should not persist over sessions + _journal.wipeErrorBlacklistCategory(SyncJournalErrorBlacklistRecord::Category::LocalSoftError); + _engine.reset(new SyncEngine(_accountState->account(), path(), remotePath(), &_journal)); // pass the setting if hidden files are to be ignored, will be read in csync_update _engine->setIgnoreHiddenFiles(_definition.ignoreHiddenFiles); @@ -602,7 +605,10 @@ void Folder::slotWatchedPathChanged(const QString &path, ChangeReason reason) return; } - auto relativePath = path.midRef(this->path().size()); + auto relativePath = path.mid(this->path().size()); + if (reason == ChangeReason::UnLock) { + journalDb()->wipeErrorBlacklistEntry(relativePath); + } // Add to list of locally modified paths // @@ -637,7 +643,7 @@ void Folder::slotWatchedPathChanged(const QString &path, ChangeReason reason) && !FileSystem::fileChanged(path, record._fileSize, record._modtime)) { spurious = true; - if (auto pinState = _vfs->pinState(relativePath.toString())) { + if (auto pinState = _vfs->pinState(relativePath)) { if (*pinState == PinState::AlwaysLocal && record.isVirtualFile()) spurious = false; if (*pinState == PinState::OnlineOnly && record.isFile()) @@ -1158,7 +1164,7 @@ void Folder::slotFolderConflicts(const QString &folder, const QStringList &confl r.setNumOldConflictItems(conflictPaths.size() - r.numNewConflictItems()); } -void Folder::warnOnNewExcludedItem(const SyncJournalFileRecord &record, const QStringRef &path) +void Folder::warnOnNewExcludedItem(const SyncJournalFileRecord &record, QStringView path) { // Never warn for items in the database if (record.isValid()) |