diff options
author | allexzander <blackslayer4@gmail.com> | 2022-08-05 12:23:07 +0300 |
---|---|---|
committer | Matthieu Gallien <matthieu_gallien@yahoo.fr> | 2022-09-17 10:47:15 +0300 |
commit | d425005a29301f1b34c438937b7c7cdf9d25155c (patch) | |
tree | 8a98d928b5d5b4b56a7a82f4703659a66b8a815b /src | |
parent | 84cf9c833ddf4456b883e8abe00ac3d880b80ea3 (diff) |
Remove behavior changes.
Signed-off-by: allexzander <blackslayer4@gmail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/common/syncjournaldb.cpp | 20 | ||||
-rw-r--r-- | src/gui/folder.cpp | 2 | ||||
-rw-r--r-- | src/libsync/discovery.cpp | 1 | ||||
-rw-r--r-- | src/libsync/owncloudpropagator.cpp | 7 | ||||
-rw-r--r-- | src/libsync/propagatedownload.cpp | 6 | ||||
-rw-r--r-- | src/libsync/propagateremotedelete.cpp | 2 | ||||
-rw-r--r-- | src/libsync/propagateremotemove.cpp | 4 | ||||
-rw-r--r-- | src/libsync/propagatorjobs.cpp | 6 | ||||
-rw-r--r-- | src/libsync/syncengine.cpp | 3 | ||||
-rw-r--r-- | src/libsync/vfs/cfapi/hydrationjob.cpp | 1 |
10 files changed, 9 insertions, 43 deletions
diff --git a/src/common/syncjournaldb.cpp b/src/common/syncjournaldb.cpp index 801aa5f50..964a20f0d 100644 --- a/src/common/syncjournaldb.cpp +++ b/src/common/syncjournaldb.cpp @@ -1722,7 +1722,7 @@ void SyncJournalDb::deleteStaleFlagsEntries() SqlQuery delQuery("DELETE FROM flags WHERE path != '' AND path NOT IN (SELECT path from metadata);", _db); if (!delQuery.exec()) { - sqlFail(QStringLiteral("deleteStaleFlagsEntries"), delQuery); + qCWarning(lcDb) << QStringLiteral("deleteStaleFlagsEntries") << delQuery.error(); } } @@ -1865,7 +1865,7 @@ void SyncJournalDb::setPollInfo(const SyncJournalDb::PollInfo &info) SqlQuery query("DELETE FROM async_poll WHERE path=?", _db); query.bindValue(1, info._file); if (!query.exec()) { - sqlFail(QStringLiteral("setPollInfo DELETE FROM async_poll"), query); + qCWarning(lcDb) << QStringLiteral("setPollInfo DELETE FROM async_poll") << query.error(); } } else { SqlQuery query("INSERT OR REPLACE INTO async_poll (path, modtime, filesize, pollpath) VALUES( ? , ? , ? , ? )", _db); @@ -1874,7 +1874,7 @@ void SyncJournalDb::setPollInfo(const SyncJournalDb::PollInfo &info) query.bindValue(3, info._fileSize); query.bindValue(4, info._url); if (!query.exec()) { - sqlFail(QStringLiteral("setPollInfo INSERT OR REPLACE INTO async_poll"), query); + qCWarning(lcDb) << QStringLiteral("setPollInfo INSERT OR REPLACE INTO async_poll") << query.error(); } } } @@ -1963,7 +1963,7 @@ void SyncJournalDb::avoidRenamesOnNextSync(const QByteArray &path) query.bindValue(1, path); if (!query.exec()) { - sqlFail(QStringLiteral("avoidRenamesOnNextSync path: %1").arg(QString::fromUtf8(path)), query); + qCWarning(lcDb) << QStringLiteral("avoidRenamesOnNextSync path: %1").arg(QString::fromUtf8(path)) << query.error(); } // We also need to remove the ETags so the update phase refreshes the directory paths @@ -1991,7 +1991,7 @@ void SyncJournalDb::schedulePathForRemoteDiscovery(const QByteArray &fileName) query.bindValue(1, argument); if (!query.exec()) { - sqlFail(QStringLiteral("schedulePathForRemoteDiscovery path: %1").arg(QString::fromUtf8(fileName)), query); + qCWarning(lcDb) << QStringLiteral("schedulePathForRemoteDiscovery path: %11").arg(QString::fromUtf8(fileName)) << query.error(); } // Prevent future overwrite of the etags of this folder and all @@ -2023,7 +2023,7 @@ void SyncJournalDb::forceRemoteDiscoveryNextSyncLocked() deleteRemoteFolderEtagsQuery.prepare("UPDATE metadata SET md5='_invalid_' WHERE type=2;"); if (!deleteRemoteFolderEtagsQuery.exec()) { - sqlFail(QStringLiteral("forceRemoteDiscoveryNextSyncLocked"), deleteRemoteFolderEtagsQuery); + qCWarning(lcDb) << QStringLiteral("forceRemoteDiscoveryNextSyncLocked") << deleteRemoteFolderEtagsQuery.error(); } } @@ -2233,7 +2233,7 @@ void SyncJournalDb::clearFileTable() query.prepare("DELETE FROM metadata;"); if (!query.exec()) { - sqlFail(QStringLiteral("clearFileTable"), query); + qCWarning(lcDb) << QStringLiteral("clearFileTable") << query.error(); } } @@ -2250,7 +2250,7 @@ void SyncJournalDb::markVirtualFileForDownloadRecursively(const QByteArray &path query.bindValue(1, path); if (!query.exec()) { - sqlFail(QStringLiteral("markVirtualFileForDownloadRecursively UPDATE metadata SET type=5 path: %1").arg(QString::fromUtf8(path)), query); + qCWarning(lcDb) << QStringLiteral("markVirtualFileForDownloadRecursively UPDATE metadata SET type=5 path: %1").arg(QString::fromUtf8(path)) << query.error(); } // We also must make sure we do not read the files from the database (same logic as in schedulePathForRemoteDiscovery) @@ -2261,7 +2261,7 @@ void SyncJournalDb::markVirtualFileForDownloadRecursively(const QByteArray &path query.bindValue(1, path); if (!query.exec()) { - sqlFail(QStringLiteral("markVirtualFileForDownloadRecursively UPDATE metadata SET md5='_invalid_' path: %1").arg(QString::fromUtf8(path)), query); + qCWarning(lcDb) << QStringLiteral("markVirtualFileForDownloadRecursively UPDATE metadata SET md5='_invalid_' path: %1").arg(QString::fromUtf8(path)) << query.error(); } } @@ -2395,8 +2395,6 @@ SyncJournalDb::PinStateInterface::rawList() if (!query.exec()) { qCWarning(lcDb) << "SQL Error" << "PinStateInterface::rawList" << query.error(); - _db->close(); - ASSERT(false); } QVector<QPair<QByteArray, PinState>> result; diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp index 9a50716a1..c036678d2 100644 --- a/src/gui/folder.cpp +++ b/src/gui/folder.cpp @@ -618,7 +618,6 @@ void Folder::implicitlyHydrateFile(const QString &relativepath) ; if (!_journal.getFileRecord(relativepath.toUtf8(), &record)) { qCWarning(lcFolder) << "could not get file from local DB" << relativepath; - return; } if (!record.isValid()) { qCInfo(lcFolder) << "Did not find file in db"; @@ -634,7 +633,6 @@ void Folder::implicitlyHydrateFile(const QString &relativepath) const auto result = _journal.setFileRecord(record); if (!result) { qCWarning(lcFolder) << "Error when setting the file record to the database" << record._path << result.error(); - return; } // Change the file's pin state if it's contradictory to being hydrated diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp index 7a59f1fa9..a2d998185 100644 --- a/src/libsync/discovery.cpp +++ b/src/libsync/discovery.cpp @@ -915,7 +915,6 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo( // Not locally, not on the server. The entry is stale! qCInfo(lcDisco) << "Stale DB entry"; if (!_discoveryData->_statedb->deleteFileRecord(path._original, true)) { - _discoveryData->fatalError(tr("Error while deleting file record %1 from the database").arg(path._original)); qCWarning(lcDisco) << "Failed to delete a file record from the local DB" << path._original; } return; diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp index aba3f437f..092b4fc76 100644 --- a/src/libsync/owncloudpropagator.cpp +++ b/src/libsync/owncloudpropagator.cpp @@ -1199,13 +1199,6 @@ void PropagateDirectory::slotSubJobsFinished(SyncFileItem::Status status) if (_item->_instruction == CSYNC_INSTRUCTION_RENAME && _item->_originalFile != _item->_renameTarget) { if (!propagator()->_journal->deleteFileRecord(_item->_originalFile, true)) { qCWarning(lcDirectory) << "could not delete file from local DB" << _item->_originalFile; - _state = Finished; - status = _item->_status = SyncFileItem::FatalError; - _item->_errorString = tr("could not delete file %1 from local DB").arg(_item->_originalFile); - qCInfo(lcPropagator) << "PropagateDirectory::slotSubJobsFinished" - << "emit finished" << status; - emit finished(status); - return; } } diff --git a/src/libsync/propagatedownload.cpp b/src/libsync/propagatedownload.cpp index 088ce7289..4d6a0e8cf 100644 --- a/src/libsync/propagatedownload.cpp +++ b/src/libsync/propagatedownload.cpp @@ -461,8 +461,6 @@ void PropagateDownloadFile::start() SyncJournalFileRecord parentRec; if (!propagator()->_journal->getFileRecord(parentPath, &parentRec)) { qCWarning(lcPropagateDownload) << "could not get file from local DB" << parentPath; - done(SyncFileItem::NormalError, tr("could not get file %1 from local DB").arg(parentPath)); - return; } const auto account = propagator()->account(); @@ -509,8 +507,6 @@ void PropagateDownloadFile::startAfterIsEncryptedIsChecked() if (!propagator()->_journal->deleteFileRecord(_item->_originalFile)) { qCWarning(lcPropagateDownload) << "could not delete file from local DB" << _item->_originalFile; - done(SyncFileItem::NormalError, tr("Could not delete file record %1 from local DB").arg(_item->_originalFile)); - return; } updateMetadata(false); @@ -1249,8 +1245,6 @@ void PropagateDownloadFile::downloadFinished() if (!propagator()->_journal->deleteFileRecord(virtualFile)) { qCWarning(lcPropagateDownload) << "could not delete file from local DB" << virtualFile; - done(SyncFileItem::NormalError, tr("Could not delete file record %1 from local DB").arg(virtualFile)); - return; } // Move the pin state to the new location diff --git a/src/libsync/propagateremotedelete.cpp b/src/libsync/propagateremotedelete.cpp index ddf3f11f7..b1a828534 100644 --- a/src/libsync/propagateremotedelete.cpp +++ b/src/libsync/propagateremotedelete.cpp @@ -115,8 +115,6 @@ void PropagateRemoteDelete::slotDeleteJobFinished() if (!propagator()->_journal->deleteFileRecord(_item->_originalFile, _item->isDirectory())) { qCWarning(lcPropagateRemoteDelete) << "could not delete file from local DB" << _item->_originalFile; - done(SyncFileItem::NormalError, tr("Could not delete file record %1 from local DB").arg(_item->_originalFile)); - return; } propagator()->_journal->commit("Remote Remove"); diff --git a/src/libsync/propagateremotemove.cpp b/src/libsync/propagateremotemove.cpp index 882d7e077..e75fb4aa8 100644 --- a/src/libsync/propagateremotemove.cpp +++ b/src/libsync/propagateremotemove.cpp @@ -247,8 +247,6 @@ void PropagateRemoteMove::finalize() SyncJournalFileRecord oldRecord; if (!propagator()->_journal->getFileRecord(_item->_originalFile, &oldRecord)) { qCWarning(lcPropagateRemoteMove) << "could not get file from local DB" << _item->_originalFile; - done(SyncFileItem::NormalError, tr("could not get file %1 from local DB").arg(_item->_originalFile)); - return; } auto &vfs = propagator()->syncOptions()._vfs; auto pinState = vfs->pinState(_item->_originalFile); @@ -259,8 +257,6 @@ void PropagateRemoteMove::finalize() // Delete old db data. if (!propagator()->_journal->deleteFileRecord(_item->_originalFile)) { qCWarning(lcPropagateRemoteMove) << "could not delete file from local DB" << _item->_originalFile; - done(SyncFileItem::NormalError, tr("Could not delete file record %1 from local DB").arg(_item->_originalFile)); - return; } if (!vfs->setPinState(_item->_originalFile, PinState::Inherited)) { qCWarning(lcPropagateRemoteMove) << "Could not set pin state of" << _item->_originalFile << "to inherited"; diff --git a/src/libsync/propagatorjobs.cpp b/src/libsync/propagatorjobs.cpp index 8f57eb18d..4912bc1a1 100644 --- a/src/libsync/propagatorjobs.cpp +++ b/src/libsync/propagatorjobs.cpp @@ -130,8 +130,6 @@ void PropagateLocalRemove::start() propagator()->reportProgress(*_item, 0); if (!propagator()->_journal->deleteFileRecord(_item->_originalFile, _item->isDirectory())) { qCWarning(lcPropagateLocalRename) << "could not delete file from local DB" << _item->_originalFile; - done(SyncFileItem::NormalError, tr("Could not delete file record %1 from local DB").arg(_item->_originalFile)); - return; } propagator()->_journal->commit("Local remove"); done(SyncFileItem::Success); @@ -251,13 +249,9 @@ void PropagateLocalRename::start() SyncJournalFileRecord oldRecord; if (!propagator()->_journal->getFileRecord(_item->_originalFile, &oldRecord)) { qCWarning(lcPropagateLocalRename) << "could not get file from local DB" << _item->_originalFile; - done(SyncFileItem::NormalError, tr("could not get file %1 from local DB").arg(_item->_originalFile)); - return; } if (!propagator()->_journal->deleteFileRecord(_item->_originalFile)) { qCWarning(lcPropagateLocalRename) << "could not delete file from local DB" << _item->_originalFile; - done(SyncFileItem::NormalError, tr("Could not delete file record %1 from local DB").arg(_item->_originalFile)); - return; } auto &vfs = propagator()->syncOptions()._vfs; diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp index 2f0b8eda8..98aa755b7 100644 --- a/src/libsync/syncengine.cpp +++ b/src/libsync/syncengine.cpp @@ -381,9 +381,6 @@ void OCC::SyncEngine::slotItemDiscovered(const OCC::SyncFileItemPtr &item) // Updating the db happens on success if (!_journal->setFileRecord(rec)) { - item->_status = SyncFileItem::Status::NormalError; - item->_instruction = CSYNC_INSTRUCTION_ERROR; - item->_errorString = tr("Could not set file record to local DB: %1").arg(rec.path()); qCWarning(lcEngine) << "Could not set file record to local DB" << rec.path(); } diff --git a/src/libsync/vfs/cfapi/hydrationjob.cpp b/src/libsync/vfs/cfapi/hydrationjob.cpp index 26c8a19e7..ea7728152 100644 --- a/src/libsync/vfs/cfapi/hydrationjob.cpp +++ b/src/libsync/vfs/cfapi/hydrationjob.cpp @@ -291,7 +291,6 @@ void OCC::HydrationJob::finalize(OCC::VfsCfApi *vfs) SyncJournalFileRecord record; if (!_journal->getFileRecord(_folderPath, &record)) { qCWarning(lcHydration) << "could not get file from local DB" << _folderPath; - return; } Q_ASSERT(record.isValid()); if (!record.isValid()) { |