Improve propagator log

owncloud · Aug 30, 2023 · c4f95f7 · c4f95f7
1 parent 94b8383
commit c4f95f7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
@@ -113,7 +113,7 @@ bool PropagateItemJob::scheduleSelfOrChild()
     if (_state != NotYetStarted) {
         return false;
     }
-    qCInfo(lcPropagator) << "Starting" << _item->_instruction << "propagation of" << _item->destination() << "by" << this;
+    qCInfo(lcPropagator) << "Starting propagation of" << _item << "by" << this;
 
     _state = Running;
     if (thread() != QApplication::instance()->thread()) {
@@ -321,7 +321,8 @@ void PropagateItemJob::done(SyncFileItem::Status statusArg, const QString &error
 
 PropagateItemJob *OwncloudPropagator::createJob(const SyncFileItemPtr &item)
 {
-    bool deleteExisting = item->_instruction == CSYNC_INSTRUCTION_TYPE_CHANGE;
+    qCDebug(lcPropagator) << "Propagating:" << item;
+    const bool deleteExisting = item->_instruction == CSYNC_INSTRUCTION_TYPE_CHANGE;
     switch (item->_instruction) {
     case CSYNC_INSTRUCTION_REMOVE:
         if (item->_direction == SyncFileItem::Down)
@@ -571,7 +572,6 @@ Result<QString, bool> OwncloudPropagator::localFileNameClash(const QString &relF
     OC_ASSERT(!relFile.isEmpty());
     if (!relFile.isEmpty() && Utility::fsCasePreserving()) {
         const QFileInfo fileInfo(_localDir + relFile);
-        qCDebug(lcPropagator) << "CaseClashCheck for " << fileInfo.filePath();
 #ifdef Q_OS_MAC
         if (!fileInfo.exists()) {
             return false;

diff --git a/src/libsync/propagatedownload.cpp b/src/libsync/propagatedownload.cpp
@@ -415,7 +415,6 @@ void PropagateDownloadFile::start()
     if (propagator()->_abortRequested)
         return;
 
-    qCDebug(lcPropagateDownload) << _item->_file << propagator()->_activeJobList.count();
     _stopwatch.start();
 
     auto &syncOptions = propagator()->syncOptions();
@@ -850,6 +849,7 @@ void PropagateDownloadFile::deleteExistingFolder()
     // Delete the directory if it is empty!
     QDir dir(existingDir);
     if (dir.entryList(QDir::NoDotAndDotDot | QDir::AllEntries).count() == 0) {
+        qCDebug(lcPropagateDownload) << "deleting existing dir" << existingDir << "to replace it with a file";
         if (dir.rmdir(existingDir)) {
             return;
         }

diff --git a/src/libsync/propagatorjobs.cpp b/src/libsync/propagatorjobs.cpp
@@ -155,6 +155,7 @@ void PropagateLocalMkdir::start()
     QFileInfo fi(newDirStr);
     if (fi.exists() && fi.isFile()) {
         if (_deleteExistingFile) {
+            qDebug(lcPropagateLocalMkdir) << "deleting existing file" << newDirStr << "to replace it with a dir";
             QString removeError;
             if (!FileSystem::remove(newDirStr, &removeError)) {
                 done(SyncFileItem::NormalError,

diff --git a/src/libsync/syncfileitem.cpp b/src/libsync/syncfileitem.cpp
@@ -78,7 +78,6 @@ SyncFileItemPtr SyncFileItem::fromSyncJournalFileRecord(const SyncJournalFileRec
 template <>
 QString Utility::enumToDisplayName(SyncFileItem::Status s)
 {
-    // TODO: 2.11 enumDisplayName  https://github.com/owncloud/client/issues/9043
     switch (s) {
     case SyncFileItem::NoStatus:
         return QCoreApplication::translate("SyncFileItem::Status", "Undefined");
@@ -120,7 +119,11 @@ QDebug operator<<(QDebug debug, const OCC::SyncFileItem *item)
     } else {
         QDebugStateSaver saver(debug);
         debug.setAutoInsertSpaces(false);
-        debug << "OCC::SyncFileItem(destination=" << item->destination() << ", type=" << item->_type << ", status=" << item->_status << ")";
+        debug << "OCC::SyncFileItem(file=" << item->_file;
+        if (!item->_renameTarget.isEmpty()) {
+            debug << ", destination=" << item->destination();
+        }
+        debug << ", type=" << item->_type << ", instruction=" << item->_instruction << ", status=" << item->_status << ")";
     }
     return debug;
 }