Skip to content

Update file's metadata in the local database when the etag changes while file remains unchanged. Fix subsequent conflict when locking and unlocking. #5293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
allexzander merged 1 commit into from
Dec 30, 2022
Merged

Update file's metadata in the local database when the etag changes while file remains unchanged. Fix subsequent conflict when locking and unlocking. #5293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions src/libsync/propagatedownload.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1106,13 +1106,39 @@ void PropagateDownloadFile::contentChecksumComputed(const QByteArray &checksumTy
{
_item->_checksumHeader = makeChecksumHeader(checksumType, checksum);

const auto localFilePath = propagator()->fullLocalPath(_item->_file);
SyncJournalFileRecord record;
if (_item->_instruction != CSYNC_INSTRUCTION_CONFLICT && FileSystem::fileExists(localFilePath)
&& (propagator()->_journal->getFileRecord(_item->_file, &record) && record.isValid())
&& (record._modtime == _item->_modtime && record._etag != _item->_etag)) {
const auto computeChecksum = new ComputeChecksum(this);
computeChecksum->setChecksumType(checksumType);
connect(computeChecksum, &ComputeChecksum::done, this, &PropagateDownloadFile::localFileContentChecksumComputed);
computeChecksum->start(localFilePath);
return;
}

finalizeDownload();
}

void PropagateDownloadFile::localFileContentChecksumComputed(const QByteArray &checksumType, const QByteArray &checksum)
{
if (_item->_checksumHeader == makeChecksumHeader(checksumType, checksum)) {
FileSystem::remove(_tmpFile.fileName());
updateMetadata(false);
return;
}
finalizeDownload();
}

void PropagateDownloadFile::finalizeDownload()
{
if (_isEncrypted) {
if (_downloadEncryptedHelper->decryptFile(_tmpFile)) {
downloadFinished();
downloadFinished();
} else {
done(SyncFileItem::NormalError, _downloadEncryptedHelper->errorString());
done(SyncFileItem::NormalError, _downloadEncryptedHelper->errorString());
}

} else {
downloadFinished();
}
Expand Down
4 changes: 4 additions & 0 deletions src/libsync/propagatedownload.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,10 @@ private slots:
void transmissionChecksumValidated(const QByteArray &checksumType, const QByteArray &checksum);
/// Called when the download's checksum computation is done
void contentChecksumComputed(const QByteArray &checksumType, const QByteArray &checksum);
/// Called when the local file's checksum computation is done
void localFileContentChecksumComputed(const QByteArray &checksumType, const QByteArray &checksum);

void finalizeDownload();
void downloadFinished();
/// Called when it's time to update the db metadata
void updateMetadata(bool isConflict);
Expand Down
36 changes: 36 additions & 0 deletions test/testsyncconflict.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,42 @@ private slots:
QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
}

void testEtagChangeFileNotChangedGeneratesNoConflicts()
{
FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()};
ItemCompletedSpy completeSpy(fakeFolder);

fakeFolder.remoteModifier().insert("A/fake_conflict", 'W');
QVERIFY(fakeFolder.syncOnce());
QVERIFY(!itemConflict(completeSpy, "A/fake_conflict"));

completeSpy.clear();

fakeFolder.remoteModifier().setContents("A/fake_conflict", 'W');
fakeFolder.localModifier().setContents("A/fake_conflict", 'W');

QVERIFY(fakeFolder.syncOnce());
QVERIFY(!itemConflict(completeSpy, "A/fake_conflict"));
}

void testEtagChangeFileChangedGeneratesConflicts()
{
FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()};
ItemCompletedSpy completeSpy(fakeFolder);

fakeFolder.remoteModifier().insert("A/real_conflict", 'W');
QVERIFY(fakeFolder.syncOnce());
QVERIFY(!itemConflict(completeSpy, "A/real_conflict"));

completeSpy.clear();

fakeFolder.remoteModifier().setContents("A/real_conflict", 'W');
fakeFolder.localModifier().setContents("A/real_conflict", 'L');

QVERIFY(fakeFolder.syncOnce());
QVERIFY(itemConflict(completeSpy, "A/real_conflict"));
}

// Test what happens if we remove entries both on the server, and locally
void testRemoveRemove()
{
Expand Down