Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/cmd/cmd.cpp2
-rw-r--r--src/common/syncjournaldb.cpp6
-rw-r--r--src/common/syncjournaldb.h8
-rw-r--r--src/gui/accountsettings.cpp3
-rw-r--r--src/gui/folder.cpp10
-rw-r--r--src/gui/folder.h8
-rw-r--r--src/gui/folderstatusmodel.cpp6
-rw-r--r--src/gui/selectivesyncdialog.cpp3
-rw-r--r--src/gui/sharemanager.cpp2
-rw-r--r--src/libsync/propagatedownload.cpp2
-rw-r--r--src/libsync/propagateupload.cpp2
-rw-r--r--src/libsync/syncengine.cpp2
-rw-r--r--test/testselectivesync.cpp4
-rw-r--r--test/testsyncengine.cpp2
-rw-r--r--test/testsyncjournaldb.cpp2
-rw-r--r--test/testsyncmove.cpp2
-rw-r--r--test/testsyncvirtualfiles.cpp4
17 files changed, 43 insertions, 25 deletions
diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp
index e0af1abaa..26ea165fd 100644
--- a/src/cmd/cmd.cpp
+++ b/src/cmd/cmd.cpp
@@ -311,7 +311,7 @@ void selectiveSyncFixup(OCC::SyncJournalDb *journal, const QStringList &newList)
auto blackListSet = newList.toSet();
auto changes = (oldBlackListSet - blackListSet) + (blackListSet - oldBlackListSet);
foreach (const auto &it, changes) {
- journal->avoidReadFromDbOnNextSync(it);
+ journal->schedulePathForRemoteDiscovery(it);
}
journal->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, newList);
diff --git a/src/common/syncjournaldb.cpp b/src/common/syncjournaldb.cpp
index e90d4b8e6..66e3bea47 100644
--- a/src/common/syncjournaldb.cpp
+++ b/src/common/syncjournaldb.cpp
@@ -1752,10 +1752,10 @@ void SyncJournalDb::avoidRenamesOnNextSync(const QByteArray &path)
// We also need to remove the ETags so the update phase refreshes the directory paths
// on the next sync
- avoidReadFromDbOnNextSync(path);
+ schedulePathForRemoteDiscovery(path);
}
-void SyncJournalDb::avoidReadFromDbOnNextSync(const QByteArray &fileName)
+void SyncJournalDb::schedulePathForRemoteDiscovery(const QByteArray &fileName)
{
QMutexLocker locker(&_mutex);
@@ -2009,7 +2009,7 @@ void SyncJournalDb::markVirtualFileForDownloadRecursively(const QByteArray &path
query.bindValue(1, path);
query.exec();
- // We also must make sure we do not read the files from the database (same logic as in avoidReadFromDbOnNextSync)
+ // We also must make sure we do not read the files from the database (same logic as in schedulePathForRemoteDiscovery)
// This includes all the parents up to the root, but also all the directory within the selected dir.
static_assert(ItemTypeDirectory == 2, "");
query.prepare("UPDATE metadata SET md5='_invalid_' WHERE "
diff --git a/src/common/syncjournaldb.h b/src/common/syncjournaldb.h
index e92afaebf..e3888290c 100644
--- a/src/common/syncjournaldb.h
+++ b/src/common/syncjournaldb.h
@@ -180,8 +180,8 @@ public:
* Any setFileRecord() call to affected directories before the next sync run will be
* adjusted to retain the invalid etag via _etagStorageFilter.
*/
- void avoidReadFromDbOnNextSync(const QString &fileName) { avoidReadFromDbOnNextSync(fileName.toUtf8()); }
- void avoidReadFromDbOnNextSync(const QByteArray &fileName);
+ void schedulePathForRemoteDiscovery(const QString &fileName) { schedulePathForRemoteDiscovery(fileName.toUtf8()); }
+ void schedulePathForRemoteDiscovery(const QByteArray &fileName);
/**
* Wipe _etagStorageFilter. Also done implicitly on close().
@@ -191,7 +191,7 @@ public:
/**
* Ensures full remote discovery happens on the next sync.
*
- * Equivalent to calling avoidReadFromDbOnNextSync() for all files.
+ * Equivalent to calling schedulePathForRemoteDiscovery() for all files.
*/
void forceRemoteDiscoveryNextSync();
@@ -400,7 +400,7 @@ private:
/* Storing etags to these folders, or their parent folders, is filtered out.
*
- * When avoidReadFromDbOnNextSync() is called some etags to _invalid_ in the
+ * When schedulePathForRemoteDiscovery() is called some etags to _invalid_ in the
* database. If this is done during a sync run, a later propagation job might
* undo that by writing the correct etag to the database instead. This filter
* will prevent this write and instead guarantee the _invalid_ etag stays in
diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index b5954e714..4ac6f2f70 100644
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -556,7 +556,8 @@ void AccountSettings::slotEnableVfsCurrentFolder()
auto oldBlacklist = folder->journalDb()->getSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, &ok);
folder->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, {});
for (const auto &entry : oldBlacklist) {
- folder->journalDb()->avoidReadFromDbOnNextSync(entry);
+ folder->journalDb()->schedulePathForRemoteDiscovery(entry);
+ folder->schedulePathForLocalDiscovery(entry);
}
// Change the folder vfs mode and load the plugin
diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index 2bde6516e..f10641b1a 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -590,8 +590,9 @@ void Folder::downloadVirtualFile(const QString &_relativepath)
if (record._type == ItemTypeVirtualFile) {
record._type = ItemTypeVirtualFileDownload;
_journal.setFileRecord(record);
- // Make sure we go over that file during the discovery
- _journal.avoidReadFromDbOnNextSync(relativepath);
+ // Make sure we go over that file during the discovery even if
+ // no actual remote discovery would be necessary
+ _journal.schedulePathForRemoteDiscovery(relativepath);
} else if (record._type == ItemTypeDirectory || relativepath.isEmpty()) {
_journal.markVirtualFileForDownloadRecursively(relativepath);
} else {
@@ -1127,6 +1128,11 @@ void Folder::slotNextSyncFullLocalDiscovery()
_timeSinceLastFullLocalDiscovery.invalidate();
}
+void Folder::schedulePathForLocalDiscovery(const QString &relativePath)
+{
+ _localDiscoveryTracker->addTouchedPath(relativePath.toUtf8());
+}
+
void Folder::slotFolderConflicts(const QString &folder, const QStringList &conflictPaths)
{
if (folder != _definition.alias)
diff --git a/src/gui/folder.h b/src/gui/folder.h
index 4fa7ccb85..2217e7dfa 100644
--- a/src/gui/folder.h
+++ b/src/gui/folder.h
@@ -357,6 +357,14 @@ public slots:
/** Ensures that the next sync performs a full local discovery. */
void slotNextSyncFullLocalDiscovery();
+ /** Adds the path to the local discovery list
+ *
+ * A weaker version of slotNextSyncFullLocalDiscovery() that just
+ * schedules all parent and child items of the path for local
+ * discovery.
+ */
+ void schedulePathForLocalDiscovery(const QString &relativePath);
+
private slots:
void slotSyncStarted();
void slotSyncFinished(bool);
diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
index 6c56d660d..bc69d2c03 100644
--- a/src/gui/folderstatusmodel.cpp
+++ b/src/gui/folderstatusmodel.cpp
@@ -851,7 +851,8 @@ void FolderStatusModel::slotApplySelectiveSync()
//The part that changed should not be read from the DB on next sync because there might be new folders
// (the ones that are no longer in the blacklist)
foreach (const auto &it, changes) {
- folder->journalDb()->avoidReadFromDbOnNextSync(it);
+ folder->journalDb()->schedulePathForRemoteDiscovery(it);
+ folder->schedulePathForLocalDiscovery(it);
}
// Also make sure we see the local file that had been ignored before
folder->slotNextSyncFullLocalDiscovery();
@@ -1164,7 +1165,8 @@ void FolderStatusModel::slotSyncAllPendingBigFolders()
// The part that changed should not be read from the DB on next sync because there might be new folders
// (the ones that are no longer in the blacklist)
foreach (const auto &it, undecidedList) {
- folder->journalDb()->avoidReadFromDbOnNextSync(it);
+ folder->journalDb()->schedulePathForRemoteDiscovery(it);
+ folder->schedulePathForLocalDiscovery(it);
}
// Also make sure we see the local file that had been ignored before
folder->slotNextSyncFullLocalDiscovery();
diff --git a/src/gui/selectivesyncdialog.cpp b/src/gui/selectivesyncdialog.cpp
index 92afbce5d..b924bb110 100644
--- a/src/gui/selectivesyncdialog.cpp
+++ b/src/gui/selectivesyncdialog.cpp
@@ -490,7 +490,8 @@ void SelectiveSyncDialog::accept()
auto blackListSet = blackList.toSet();
auto changes = (oldBlackListSet - blackListSet) + (blackListSet - oldBlackListSet);
foreach (const auto &it, changes) {
- _folder->journalDb()->avoidReadFromDbOnNextSync(it);
+ _folder->journalDb()->schedulePathForRemoteDiscovery(it);
+ _folder->schedulePathForLocalDiscovery(it);
}
// Also make sure we see the local file that had been ignored before
_folder->slotNextSyncFullLocalDiscovery();
diff --git a/src/gui/sharemanager.cpp b/src/gui/sharemanager.cpp
index 555dd03f8..a1be4ce30 100644
--- a/src/gui/sharemanager.cpp
+++ b/src/gui/sharemanager.cpp
@@ -38,7 +38,7 @@ static void updateFolder(const AccountPtr &account, const QString &path)
// Workaround the fact that the server does not invalidate the etags of parent directories
// when something is shared.
auto relative = path.midRef(f->remotePathTrailingSlash().length());
- f->journalDb()->avoidReadFromDbOnNextSync(relative.toString());
+ f->journalDb()->schedulePathForRemoteDiscovery(relative.toString());
// Schedule a sync so it can update the remote permission flag and let the socket API
// know about the shared icon.
diff --git a/src/libsync/propagatedownload.cpp b/src/libsync/propagatedownload.cpp
index 27868d1d7..81e18beaa 100644
--- a/src/libsync/propagatedownload.cpp
+++ b/src/libsync/propagatedownload.cpp
@@ -697,7 +697,7 @@ void PropagateDownloadFile::slotGetFinished()
// As a precaution against bugs that cause our database and the
// reality on the server to diverge, rediscover this folder on the
// next sync run.
- propagator()->_journal->avoidReadFromDbOnNextSync(_item->_file);
+ propagator()->_journal->schedulePathForRemoteDiscovery(_item->_file);
}
QByteArray errorBody;
diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp
index d7898b803..05ddd6566 100644
--- a/src/libsync/propagateupload.cpp
+++ b/src/libsync/propagateupload.cpp
@@ -516,7 +516,7 @@ void PropagateUploadFileCommon::commonErrorHandling(AbstractNetworkJob *job)
// Maybe the bad etag is in the database, we need to clear the
// parent folder etag so we won't read from DB next sync.
- propagator()->_journal->avoidReadFromDbOnNextSync(_item->_file);
+ propagator()->_journal->schedulePathForRemoteDiscovery(_item->_file);
propagator()->_anotherSyncNeeded = true;
}
diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index b2d810c30..551106a46 100644
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -485,7 +485,7 @@ void SyncEngine::startSync()
}
// Functionality like selective sync might have set up etag storage
- // filtering via avoidReadFromDbOnNextSync(). This *is* the next sync, so
+ // filtering via schedulePathForRemoteDiscovery(). This *is* the next sync, so
// undo the filter to allow this sync to retrieve and store the correct etags.
_journal->clearEtagStorageFilter();
diff --git a/test/testselectivesync.cpp b/test/testselectivesync.cpp
index c6278866b..c91bd8b76 100644
--- a/test/testselectivesync.cpp
+++ b/test/testselectivesync.cpp
@@ -69,7 +69,7 @@ private slots:
auto oldSync = fakeFolder.currentLocalState();
// syncing again should do the same
- fakeFolder.syncEngine().journal()->avoidReadFromDbOnNextSync(QString("A/newBigDir"));
+ fakeFolder.syncEngine().journal()->schedulePathForRemoteDiscovery(QString("A/newBigDir"));
QVERIFY(fakeFolder.syncOnce());
QCOMPARE(fakeFolder.currentLocalState(), oldSync);
QCOMPARE(newBigFolder.count(), 1); // (since we don't have a real Folder, the files were not added to any list)
@@ -80,7 +80,7 @@ private slots:
// Simulate that we accept all files by seting a wildcard white list
fakeFolder.syncEngine().journal()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncWhiteList,
QStringList() << QLatin1String("/"));
- fakeFolder.syncEngine().journal()->avoidReadFromDbOnNextSync(QString("A/newBigDir"));
+ fakeFolder.syncEngine().journal()->schedulePathForRemoteDiscovery(QString("A/newBigDir"));
QVERIFY(fakeFolder.syncOnce());
QCOMPARE(newBigFolder.count(), 0);
QCOMPARE(sizeRequests.count(), 0);
diff --git a/test/testsyncengine.cpp b/test/testsyncengine.cpp
index be70c1930..830d25d8f 100644
--- a/test/testsyncengine.cpp
+++ b/test/testsyncengine.cpp
@@ -171,7 +171,7 @@ private slots:
// Remove subFolderA with selectiveSync:
fakeFolder.syncEngine().journal()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList,
{"parentFolder/subFolderA/"});
- fakeFolder.syncEngine().journal()->avoidReadFromDbOnNextSync(QByteArrayLiteral("parentFolder/subFolderA/"));
+ fakeFolder.syncEngine().journal()->schedulePathForRemoteDiscovery(QByteArrayLiteral("parentFolder/subFolderA/"));
auto getEtag = [&](const QByteArray &file) {
SyncJournalFileRecord rec;
fakeFolder.syncJournal().getFileRecord(file, &rec);
diff --git a/test/testsyncjournaldb.cpp b/test/testsyncjournaldb.cpp
index 2a5e98762..ceb23d4cc 100644
--- a/test/testsyncjournaldb.cpp
+++ b/test/testsyncjournaldb.cpp
@@ -243,7 +243,7 @@ private slots:
makeEntry("foodir/subdir/subsubdir/file", fileType);
makeEntry("foodir/subdir/otherdir", dirType);
- _db.avoidReadFromDbOnNextSync(QByteArray("foodir/subdir"));
+ _db.schedulePathForRemoteDiscovery(QByteArray("foodir/subdir"));
// Direct effects of parent directories being set to _invalid_
QCOMPARE(getEtag("foodir"), invalidEtag);
diff --git a/test/testsyncmove.cpp b/test/testsyncmove.cpp
index a18b7c562..92aac8e28 100644
--- a/test/testsyncmove.cpp
+++ b/test/testsyncmove.cpp
@@ -126,7 +126,7 @@ private slots:
// Remove subFolderA with selectiveSync:
fakeFolder.syncEngine().journal()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList,
{ "parentFolder/subFolderA/" });
- fakeFolder.syncEngine().journal()->avoidReadFromDbOnNextSync(QByteArrayLiteral("parentFolder/subFolderA/"));
+ fakeFolder.syncEngine().journal()->schedulePathForRemoteDiscovery(QByteArrayLiteral("parentFolder/subFolderA/"));
fakeFolder.syncOnce();
diff --git a/test/testsyncvirtualfiles.cpp b/test/testsyncvirtualfiles.cpp
index 14d823cf8..5539b8f5b 100644
--- a/test/testsyncvirtualfiles.cpp
+++ b/test/testsyncvirtualfiles.cpp
@@ -44,7 +44,7 @@ void triggerDownload(FakeFolder &folder, const QByteArray &path)
return;
record._type = ItemTypeVirtualFileDownload;
journal.setFileRecord(record);
- journal.avoidReadFromDbOnNextSync(record._path);
+ journal.schedulePathForRemoteDiscovery(record._path);
}
void markForDehydration(FakeFolder &folder, const QByteArray &path)
@@ -56,7 +56,7 @@ void markForDehydration(FakeFolder &folder, const QByteArray &path)
return;
record._type = ItemTypeVirtualFileDehydration;
journal.setFileRecord(record);
- journal.avoidReadFromDbOnNextSync(record._path);
+ journal.schedulePathForRemoteDiscovery(record._path);
}
QSharedPointer<Vfs> setupVfs(FakeFolder &folder)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-28 02:19:00 +0300