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

Merge pull request #4679 from nextcloud/bugfix/improveLogs

Browse source 
print sync direction in SyncFileStatusTracker::slotAboutToPropagate
This commit is contained in:
Claudio Cambra 2022-07-20 15:13:48 +02:00 committed by GitHub
commit 2630b3c72b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libsync/owncloudpropagator.cpp
View file

@ -682,7 +682,6 @@ bool OwncloudPropagator::localFileNameClash(const QString &relFile)
Q_ASSERT(!file.isEmpty());
if (!file.isEmpty() && Utility::fsCasePreserving()) {
qCDebug(lcPropagator) << "CaseClashCheck for " << file;
#ifdef Q_OS_MAC
const QFileInfo fileInfo(file);
if (!fileInfo.exists()) {
@ -718,6 +717,7 @@ bool OwncloudPropagator::localFileNameClash(const QString &relFile)
const QString fn = fileInfo.fileName();
const QStringList list = fileInfo.dir().entryList({ fn });
if (list.count() > 1 || (list.count() == 1 && list[0] != fn)) {
qCWarning(lcPropagator) << "Detected case clash between" << file << "and" << list.constFirst();
return true;
}
#endif

2
src/libsync/syncfilestatustracker.cpp
View file

@ -226,7 +226,7 @@ void SyncFileStatusTracker::slotAboutToPropagate(SyncFileItemVector &items)
std::swap(_syncProblems, oldProblems);
foreach (const SyncFileItemPtr &item, items) {
qCDebug(lcStatusTracker) << "Investigating" << item->destination() << item->_status << item->_instruction;
qCDebug(lcStatusTracker) << "Investigating" << item->destination() << item->_status << item->_instruction << item->_direction;
_dirtyPaths.remove(item->destination());
if (hasErrorStatus(*item)) {