mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-25 22:05:53 +03:00
Code Issues Projects Releases Packages Wiki Activity

SyncEngine/SyncJournalDB: Fix creation of .csync_journal

Browse source
This commit is contained in:
Markus Goetz 2014-10-20 14:25:22 +02:00
parent 704c5f2de7
commit cb36a37779
2 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/mirall/syncengine.cpp
View file

@ -525,19 +525,36 @@ void SyncEngine::startSync()
csync_resume(_csync_ctx);
bool usingSelectiveSync = (!_selectiveSyncBlackList.isEmpty());
qDebug() << (usingSelectiveSync ? "====Using Selective Sync" : "====NOT Using Selective Sync");
int fileRecordCount = -1;
if (!_journal->exists()) {
fileRecordCount = _journal->getFileRecordCount(); // this creates the DB
_journal->close(); // Close again so it doesn't interfere with the sync in the the other thread in csync_update
if( fileRecordCount == -1 ) {
// FIXME de-duplicate with logic below
qDebug() << "No way to create a sync journal!";
emit csyncError(tr("Unable to initialize a sync journal."));
finalize();
return;
// database creation error!
}
qDebug() << "=====sync looks new (no DB exists), activating recursive PROPFIND if csync supports it";
bool no_recursive_propfind = false;
csync_set_module_property(_csync_ctx, "no_recursive_propfind", &no_recursive_propfind);
} else {
// retrieve the file count from the db and close it afterwards because
// csync_update also opens the database.
int fileRecordCount = 0;
fileRecordCount = _journal->getFileRecordCount();
bool isUpdateFrom_1_5 = _journal->isUpdateFrom_1_5();
_journal->close();
if( fileRecordCount == -1 ) {
// FIXME de-duplicate with logic above
qDebug() << "No way to create a sync journal!";
emit csyncError(tr("Unable to initialize a sync journal."));
finalize();

9
src/mirall/syncjournaldb.cpp
View file

@ -94,8 +94,8 @@ bool SyncJournalDb::checkConnect()
return true;
}
if( _dbFile.isEmpty() || !QFile::exists(_dbFile) ) {
qDebug() << "Database " + _dbFile + " is empty or does not exist";
if( _dbFile.isEmpty()) {
qDebug() << "Database filename" + _dbFile + " is empty";
return false;
}
@ -105,6 +105,11 @@ bool SyncJournalDb::checkConnect()
return false;
}
if( !QFile::exists(_dbFile) ) {
qDebug() << "Database file" + _dbFile + " does not exist";
return false;
}
SqlQuery pragma1(_db);
pragma1.prepare("SELECT sqlite_version();");
if (!pragma1.exec()) {