mirror of
https://github.com/nextcloud/desktop.git
synced 2024-11-22 21:15:55 +03:00
a7c0cfc8eb
If the server has the 'uploadConflictFiles' capability conflict files will be uploaded instead of ignored. Uploaded conflict files have the following headers set during upload OC-Conflict: 1 OC-ConflictBaseFileId: 172489174instanceid OC-ConflictBaseMtime: 1235789213 OC-ConflictBaseEtag: myetag when the data is available. Downloads accept the same headers in return when downloading a conflict file. In the absence of server support clients will identify conflict files through the file name pattern and attempt to deduce the base fileid. Base etag and mtime can't be deduced though. The upload job for a new conflict file will be triggered directly from the job that created the conflict file now. No second sync run is necessary anymore. This commit does not yet introduce a 'username' like identifier that automatically gets added to conflict file filenames (to name the files foo_conflict-Fred-1345.txt instead of just foo_conflict-1345.txt).
213 lines
6.9 KiB
C++
213 lines
6.9 KiB
C++
/*
|
|
* This software is in the public domain, furnished "as is", without technical
|
|
* support, and with no warranty, express or implied, as to its usefulness for
|
|
* any purpose.
|
|
* */
|
|
|
|
#include <QtTest>
|
|
|
|
#include <sqlite3.h>
|
|
|
|
#include "common/syncjournaldb.h"
|
|
#include "common/syncjournalfilerecord.h"
|
|
|
|
using namespace OCC;
|
|
|
|
class TestSyncJournalDB : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
QTemporaryDir _tempDir;
|
|
|
|
public:
|
|
TestSyncJournalDB()
|
|
: _db((_tempDir.path() + "/sync.db"))
|
|
{
|
|
QVERIFY(_tempDir.isValid());
|
|
}
|
|
|
|
qint64 dropMsecs(QDateTime time)
|
|
{
|
|
return Utility::qDateTimeToTime_t(time);
|
|
}
|
|
|
|
private slots:
|
|
|
|
void initTestCase()
|
|
{
|
|
}
|
|
|
|
void cleanupTestCase()
|
|
{
|
|
const QString file = _db.databaseFilePath();
|
|
QFile::remove(file);
|
|
}
|
|
|
|
void testFileRecord()
|
|
{
|
|
SyncJournalFileRecord record;
|
|
QVERIFY(_db.getFileRecord(QByteArrayLiteral("nonexistant"), &record));
|
|
QVERIFY(!record.isValid());
|
|
|
|
record._path = "foo";
|
|
// Use a value that exceeds uint32 and isn't representable by the
|
|
// signed int being cast to uint64 either (like uint64::max would be)
|
|
record._inode = std::numeric_limits<quint32>::max() + 12ull;
|
|
record._modtime = dropMsecs(QDateTime::currentDateTime());
|
|
record._type = ItemTypeDirectory;
|
|
record._etag = "789789";
|
|
record._fileId = "abcd";
|
|
record._remotePerm = RemotePermissions("RW");
|
|
record._fileSize = 213089055;
|
|
record._checksumHeader = "MD5:mychecksum";
|
|
QVERIFY(_db.setFileRecord(record));
|
|
|
|
SyncJournalFileRecord storedRecord;
|
|
QVERIFY(_db.getFileRecord(QByteArrayLiteral("foo"), &storedRecord));
|
|
QVERIFY(storedRecord == record);
|
|
|
|
// Update checksum
|
|
record._checksumHeader = "Adler32:newchecksum";
|
|
_db.updateFileRecordChecksum("foo", "newchecksum", "Adler32");
|
|
QVERIFY(_db.getFileRecord(QByteArrayLiteral("foo"), &storedRecord));
|
|
QVERIFY(storedRecord == record);
|
|
|
|
// Update metadata
|
|
record._modtime = dropMsecs(QDateTime::currentDateTime().addDays(1));
|
|
// try a value that only fits uint64, not int64
|
|
record._inode = std::numeric_limits<quint64>::max() - std::numeric_limits<quint32>::max() - 1;
|
|
record._type = ItemTypeFile;
|
|
record._etag = "789FFF";
|
|
record._fileId = "efg";
|
|
record._remotePerm = RemotePermissions("NV");
|
|
record._fileSize = 289055;
|
|
_db.setFileRecordMetadata(record);
|
|
QVERIFY(_db.getFileRecord(QByteArrayLiteral("foo"), &storedRecord));
|
|
QVERIFY(storedRecord == record);
|
|
|
|
QVERIFY(_db.deleteFileRecord("foo"));
|
|
QVERIFY(_db.getFileRecord(QByteArrayLiteral("foo"), &record));
|
|
QVERIFY(!record.isValid());
|
|
}
|
|
|
|
void testFileRecordChecksum()
|
|
{
|
|
// Try with and without a checksum
|
|
{
|
|
SyncJournalFileRecord record;
|
|
record._path = "foo-checksum";
|
|
record._remotePerm = RemotePermissions("RW");
|
|
record._checksumHeader = "MD5:mychecksum";
|
|
record._modtime = Utility::qDateTimeToTime_t(QDateTime::currentDateTimeUtc());
|
|
QVERIFY(_db.setFileRecord(record));
|
|
|
|
SyncJournalFileRecord storedRecord;
|
|
QVERIFY(_db.getFileRecord(QByteArrayLiteral("foo-checksum"), &storedRecord));
|
|
QVERIFY(storedRecord._path == record._path);
|
|
QVERIFY(storedRecord._remotePerm == record._remotePerm);
|
|
QVERIFY(storedRecord._checksumHeader == record._checksumHeader);
|
|
|
|
// qDebug()<< "OOOOO " << storedRecord._modtime.toTime_t() << record._modtime.toTime_t();
|
|
|
|
// Attention: compare time_t types here, as QDateTime seem to maintain
|
|
// milliseconds internally, which disappear in sqlite. Go for full seconds here.
|
|
QVERIFY(storedRecord._modtime == record._modtime);
|
|
QVERIFY(storedRecord == record);
|
|
}
|
|
{
|
|
SyncJournalFileRecord record;
|
|
record._path = "foo-nochecksum";
|
|
record._remotePerm = RemotePermissions("RWN");
|
|
record._modtime = Utility::qDateTimeToTime_t(QDateTime::currentDateTimeUtc());
|
|
|
|
QVERIFY(_db.setFileRecord(record));
|
|
|
|
SyncJournalFileRecord storedRecord;
|
|
QVERIFY(_db.getFileRecord(QByteArrayLiteral("foo-nochecksum"), &storedRecord));
|
|
QVERIFY(storedRecord == record);
|
|
}
|
|
}
|
|
|
|
void testDownloadInfo()
|
|
{
|
|
typedef SyncJournalDb::DownloadInfo Info;
|
|
Info record = _db.getDownloadInfo("nonexistant");
|
|
QVERIFY(!record._valid);
|
|
|
|
record._errorCount = 5;
|
|
record._etag = "ABCDEF";
|
|
record._valid = true;
|
|
record._tmpfile = "/tmp/foo";
|
|
_db.setDownloadInfo("foo", record);
|
|
|
|
Info storedRecord = _db.getDownloadInfo("foo");
|
|
QVERIFY(storedRecord == record);
|
|
|
|
_db.setDownloadInfo("foo", Info());
|
|
Info wipedRecord = _db.getDownloadInfo("foo");
|
|
QVERIFY(!wipedRecord._valid);
|
|
}
|
|
|
|
void testUploadInfo()
|
|
{
|
|
typedef SyncJournalDb::UploadInfo Info;
|
|
Info record = _db.getUploadInfo("nonexistant");
|
|
QVERIFY(!record._valid);
|
|
|
|
record._errorCount = 5;
|
|
record._chunk = 12;
|
|
record._transferid = 812974891;
|
|
record._size = 12894789147;
|
|
record._modtime = dropMsecs(QDateTime::currentDateTime());
|
|
record._valid = true;
|
|
_db.setUploadInfo("foo", record);
|
|
|
|
Info storedRecord = _db.getUploadInfo("foo");
|
|
QVERIFY(storedRecord == record);
|
|
|
|
_db.setUploadInfo("foo", Info());
|
|
Info wipedRecord = _db.getUploadInfo("foo");
|
|
QVERIFY(!wipedRecord._valid);
|
|
}
|
|
|
|
void testNumericId()
|
|
{
|
|
SyncJournalFileRecord record;
|
|
|
|
// Typical 8-digit padded id
|
|
record._fileId = "00000001abcd";
|
|
QCOMPARE(record.numericFileId(), QByteArray("00000001"));
|
|
|
|
// When the numeric id overflows the 8-digit boundary
|
|
record._fileId = "123456789ocidblaabcd";
|
|
QCOMPARE(record.numericFileId(), QByteArray("123456789"));
|
|
}
|
|
|
|
void testConflictRecord()
|
|
{
|
|
ConflictRecord record;
|
|
record.path = "abc";
|
|
record.baseFileId = "def";
|
|
record.baseModtime = 1234;
|
|
record.baseEtag = "ghi";
|
|
|
|
QVERIFY(!_db.conflictRecord(record.path).isValid());
|
|
|
|
_db.setConflictRecord(record);
|
|
auto newRecord = _db.conflictRecord(record.path);
|
|
QVERIFY(newRecord.isValid());
|
|
QCOMPARE(newRecord.path, record.path);
|
|
QCOMPARE(newRecord.baseFileId, record.baseFileId);
|
|
QCOMPARE(newRecord.baseModtime, record.baseModtime);
|
|
QCOMPARE(newRecord.baseEtag, record.baseEtag);
|
|
|
|
_db.deleteConflictRecord(record.path);
|
|
QVERIFY(!_db.conflictRecord(record.path).isValid());
|
|
}
|
|
|
|
private:
|
|
SyncJournalDb _db;
|
|
};
|
|
|
|
QTEST_APPLESS_MAIN(TestSyncJournalDB)
|
|
#include "testsyncjournaldb.moc"
|