Bugfix/stable 3.13/cfapi

src/gui/accountsettings.cpp

@@ -1,4 +1,4 @@
 /*
  * Copyright (C) by Daniel Molkentin <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -672,6 +672,7 @@
     if (!folderPaused) {
         ac = menu->addAction(tr("Force sync now"));
         if (folder && folder->isSyncRunning()) {
+            qCWarning(lcAccountSettings) << "=> Restart syncing for" << selectedFolderAlias();
             ac->setText(tr("Restart sync"));
         }
         ac->setEnabled(folderConnected);
@@ -1139,6 +1140,7 @@
 
 void AccountSettings::slotEnableCurrentFolder(bool terminate)
 {
+    qCWarning(lcAccountSettings) << "=> User!! resuming or pausing sync: terminate value is" << terminate;
     const auto alias = selectedFolderAlias();
 
     if (!alias.isEmpty()) {
@@ -1195,8 +1197,9 @@
 
 void AccountSettings::slotScheduleCurrentFolderForceRemoteDiscovery()
 {
-    const auto folderMan = FolderMan::instance();
+    const auto folderMan = FolderMan::instance();    
     if (auto folder = folderMan->folder(selectedFolderAlias())) {
+        qCWarning(lcAccountSettings) << "=> Schedule current folder" << selectedFolderAlias() << "RemoteDiscovery";
         folder->slotWipeErrorBlacklist();
         folder->journalDb()->forceRemoteDiscoveryNextSync();
         folderMan->scheduleFolder(folder);
@@ -1207,6 +1210,7 @@
 {
     FolderMan *folderMan = FolderMan::instance();
     auto selectedFolder = folderMan->folder(selectedFolderAlias());
+    qCWarning(lcAccountSettings) << "=> Force syncing for" << selectedFolderAlias();
     folderMan->forceSyncForFolder(selectedFolder);
 }
 

src/gui/application.cpp

@@ -598,6 +598,7 @@ void Application::slotAccountStateAdded(AccountState *accountState)
 
 void Application::slotCleanup()
 {
+    qCWarning(lcApplication) << "=> User!! Application is about to quite/close!!";
     AccountManager::instance()->save();
     FolderMan::instance()->unloadAndDeleteAllFolders();
 

src/gui/connectionvalidator.cpp

@@ -12,7 +12,7 @@
  * for more details.
  */
 
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QLoggingCategory>
@@ -207,6 +207,8 @@
     auto job = qobject_cast<PropfindJob *>(sender());
     Status stat = Timeout;
 
+    qCWarning(lcConnectionValidator) << "=> reply->error():" << reply->error() << "- job->errorString():" << job->errorString();
+
     if (reply->error() == QNetworkReply::SslHandshakeFailedError) {
         _errors << job->errorStringParsingBody();
         stat = SslError;

src/gui/folder.cpp

@@ -13,7 +13,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
  * for more details.
  */
 #include "common/syncjournaldb.h"
 #include "config.h"
 
 #include "account.h"
@@ -361,6 +361,8 @@
 {
     // re-enable sync if it was disabled because network was down
     FolderMan::instance()->setSyncEnabled(true);
+    qCInfo(lcFolder) << "=> Etag retrieved: last:" << _lastEtag << ", received:" << etag;
+    qCInfo(lcFolder) << "=> For folder:" << _canonicalLocalPath;
 
     if (_lastEtag != etag) {
         qCInfo(lcFolder) << "Compare etag with previous etag: last:" << _lastEtag << ", received:" << etag << "-> CHANGED";

src/gui/folderman.cpp

@@ -654,6 +654,7 @@ void FolderMan::forceSyncForFolder(Folder *folder)
     // Terminate and reschedule any running sync
     for (const auto folderInMap : map()) {
         if (folderInMap->isSyncRunning()) {
+            qCWarning(lcFolderMan) << "=> User!! Terminating syncing for" << folderInMap->path();
             folderInMap->slotTerminateSync();
             scheduleFolder(folderInMap);
         }
@@ -679,7 +680,7 @@ void FolderMan::removeE2eFiles(const AccountPtr &account) const
 void FolderMan::slotScheduleAppRestart()
 {
     _appRestartRequired = true;
-    qCInfo(lcFolderMan) << "Application restart requested!";
+    qCInfo(lcFolderMan) << "=> Application restart requested!";
 }
 
 void FolderMan::slotSyncOnceFileUnlocks(const QString &path)
@@ -1339,6 +1340,7 @@ void FolderMan::removeFolder(Folder *f)
     const bool currentlyRunning = f->isSyncRunning();
     if (currentlyRunning) {
         // abort the sync now
+        qCWarning(lcFolderMan) << "=> User?? Abort syncing for" << f->path();
         f->slotTerminateSync();
     }
 
@@ -1929,6 +1931,8 @@ Folder *FolderMan::currentSyncFolder() const
 
 void FolderMan::restartApplication()
 {
+    qCInfo(lcFolderMan) << "Restarting application NOW!!";
+
     if (Utility::isLinux()) {
         // restart:
         qCInfo(lcFolderMan) << "Restarting application NOW, PID" << qApp->applicationPid() << "is ending.";

src/gui/folderstatusdelegate.cpp

@@ -332,6 +332,17 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
         painter->setFont(progressFont);
 
         painter->drawText(QStyle::visualRect(option.direction, option.rect, overallProgressRect), Qt::AlignLeft | Qt::AlignVCenter, overallString);
+
+        // More detailed sync progress
+        QRect itemStringRect;
+        itemStringRect.setTop(overallProgressRect.bottom());
+        itemStringRect.setHeight(fileNameTextHeight);
+        itemStringRect.setLeft(overallProgressRect.left());
+        itemStringRect.setWidth(overallProgressRect.width());
+        painter->setFont(progressFont);
+
+        painter->drawText(QStyle::visualRect(option.direction, option.rect, itemStringRect), Qt::AlignLeft | Qt::AlignVCenter, itemString);
+
         painter->restore();
     }
 

src/gui/owncloudgui.cpp

@@ -600,6 +600,7 @@ void ownCloudGui::slotShutdown()
 {
     // explicitly close windows. This is somewhat of a hack to ensure
     // that saving the geometries happens ASAP during a OS shutdown
+    qCWarning(lcApplication) << "=> Shutting down!!";
 
     // those do delete on close
     if (!_settingsDialog.isNull())

src/gui/systray.cpp

@@ -452,11 +452,13 @@ void Systray::slotUpdateSyncPausedState()
 
 void Systray::slotUnpauseAllFolders()
 {
+    qCWarning(lcSystray) << "=> User!! Resume/unpause syncing all folders!!";
     setPauseOnAllFoldersHelper(false);
 }
 
 void Systray::slotPauseAllFolders()
 {
+    qCWarning(lcSystray) << "=> User!! Pause syncing all folders!!";
     setPauseOnAllFoldersHelper(true);
 }
 

src/gui/tray/usermodel.cpp

@@ -1,4 +1,4 @@
 #include "notificationhandler.h"
 #include "usermodel.h"
 
 #include "accountmanager.h"
@@ -36,6 +36,8 @@
 }
 
 namespace OCC {
+
+Q_LOGGING_CATEGORY(lcUserModel, "nextcloud.gui.usermodel", QtInfoMsg)
 
 TrayFolderInfo::TrayFolderInfo(const QString &name, const QString &parentPath, const QString &fullPath, FolderType folderType)
     : _name(name)
@@ -1099,6 +1101,7 @@
 
 void User::forceSyncNow() const
 {
+    qCWarning(lcUserModel) << "=> Force sync now for" << getFolder()->path();
     FolderMan::instance()->forceSyncForFolder(getFolder());
 }
 

src/libsync/discovery.cpp

@@ -2120,6 +2120,8 @@ void ProcessDirectoryJob::startAsyncLocalQuery()
     QString localPath = _discoveryData->_localDir + _currentFolder._local;
     auto localJob = new DiscoverySingleLocalDirectoryJob(_discoveryData->_account, localPath, _discoveryData->_syncOptions._vfs.data());
 
+    qCWarning(lcDisco) << "=> ProcessDirectoryJob::startAsyncLocalQuery: localPath:" << localPath;
+
     _discoveryData->_currentlyActiveJobs++;
     _pendingAsyncJobs++;
 

src/libsync/discoveryphase.cpp

@@ -1,4 +1,4 @@
 /*
  * Copyright (C) by Olivier Goffart <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -80,6 +80,7 @@
                                                    << "http://owncloud.org/ns:size");
 
     connect(propfindJob, &PropfindJob::finishedWithError, this, [=] {
+        qCWarning(lcDiscovery) << "=> propfindJob->reply()->error():" << propfindJob->reply()->error() << "- propfindJob->reply()->errorString():" << propfindJob->reply()->errorString();
         return completionCallback(false);
     });
     connect(propfindJob, &PropfindJob::result, this, [=](const QVariantMap &values) {
@@ -228,8 +229,10 @@
 void DiscoveryPhase::startJob(ProcessDirectoryJob *job)
 {
     ENFORCE(!_currentRootJob);
+    qCWarning(lcDiscovery) << "=> DiscoveryPhase::startJob for:" << job->_dirItem;
     connect(this, &DiscoveryPhase::itemDiscovered, this, &DiscoveryPhase::slotItemDiscovered, Qt::UniqueConnection);
     connect(job, &ProcessDirectoryJob::finished, this, [this, job] {
+        qCWarning(lcDiscovery) << "=> ProcessDirectoryJob::finished for" << job->_dirItem;
         ENFORCE(_currentRootJob == sender());
         _currentRootJob = nullptr;
         if (job->_dirItem)
@@ -276,6 +279,10 @@
 
 void DiscoveryPhase::slotItemDiscovered(const OCC::SyncFileItemPtr &item)
 {
+    qCWarning(lcDiscovery) << "=> DiscoveryPhase::slotItemDiscovered:"
+                           << "| item->_file:" << item->_file
+                           << "| item->_direction:" << item->_direction
+                           << "| item->_instruction:" << item->_instruction;
     if (item->_instruction == CSYNC_INSTRUCTION_ERROR && item->_direction == SyncFileItem::Up) {
         _hasUploadErrorItems = true;
     }

src/libsync/networkjobs.cpp

@@ -1,4 +1,4 @@
 /*
  * Copyright (C) by Klaas Freitag <[email protected]>
  * Copyright (C) by Daniel Molkentin <[email protected]>
  *
@@ -13,7 +13,7 @@
  * for more details.
  */
 
 #include <QJsonDocument>
 #include <QLoggingCategory>
 #include <QNetworkRequest>
 #include <QNetworkAccessManager>
@@ -669,6 +669,7 @@
 
         if (!domDocument.setContent(reply(), true, &errorMsg, &errorLine, &errorColumn)) {
             qCWarning(lcPropfindJob) << "XML parser error: " << errorMsg << errorLine << errorColumn;
+            qCWarning(lcPropfindJob) << "=> reply()->error():" << reply()->error() << "- reply()->errorString():" << reply()->errorString();
             emit finishedWithError(reply());
 
         } else {
@@ -679,6 +680,7 @@
     } else {
         qCWarning(lcPropfindJob) << "*not* successful, http result code is" << http_result_code
                                  << (http_result_code == 302 ? reply()->header(QNetworkRequest::LocationHeader).toString() : QLatin1String(""));
+        qCWarning(lcPropfindJob) << "=> reply()->error():" << reply()->error() << "- reply()->errorString():" << reply()->errorString();
         emit finishedWithError(reply());
     }
 
@@ -1270,8 +1272,8 @@
             targetFun(oldUrl);
         }
     });
-    QObject::connect(job, &PropfindJob::finishedWithError, target, [=](QNetworkReply *) {
-        targetFun(oldUrl);
+    QObject::connect(job, &PropfindJob::finishedWithError, target, [=](QNetworkReply * reply) {
+        qCWarning(lcPropfindJob) << "=> reply->error():" << reply->error() << "- job->errorString():" << job->errorString();
     });
     job->start();
 }

src/libsync/propagatedownload.cpp

@@ -1,4 +1,4 @@
 /*
  * Copyright (C) by Olivier Goffart <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -12,7 +12,7 @@
  * for more details.
  */
 
 #include "config.h"
 #include "owncloudpropagator_p.h"
 #include "propagatedownload.h"
 #include "networkjobs.h"
@@ -329,7 +329,7 @@
     }
 
     if (reply()->isFinished() && (reply()->bytesAvailable() == 0 || !_saveBodyToFile)) {
-        qCDebug(lcGetJob) << "Actually finished!";
+        qCDebug(lcGetJob) << "Get file job finished bytesAvailable/_saveBodyToFile:" << reply()->bytesAvailable() << "/" << _saveBodyToFile ;
         if (_bandwidthManager) {
             _bandwidthManager->unregisterDownloadJob(this);
         }
@@ -1132,7 +1132,8 @@
     SyncJournalFileRecord record;
     if (_item->_instruction != CSYNC_INSTRUCTION_CONFLICT && FileSystem::fileExists(localFilePath)
         && (propagator()->_journal->getFileRecord(_item->_file, &record) && record.isValid())
-        && (record._modtime == _item->_modtime && record._etag != _item->_etag)) {
+        && (record._modtime == _item->_modtime && record._etag != _item->_etag)
+        && _item->_type == ItemTypeFile) {
         const auto computeChecksum = new ComputeChecksum(this);
         computeChecksum->setChecksumType(checksumType);
         connect(computeChecksum, &ComputeChecksum::done, this, &PropagateDownloadFile::localFileContentChecksumComputed);

src/libsync/propagateremotemkdir.cpp

@@ -175,6 +175,7 @@ void PropagateRemoteMkdir::finalizeMkColJob(QNetworkReply::NetworkError err, con
     });
     connect(propfindJob, &PropfindJob::finishedWithError, this, [this] (QNetworkReply *reply) {
         const auto err = reply ? reply->error() : QNetworkReply::NetworkError::UnknownNetworkError;
+        qCWarning(lcPropagateRemoteMkdir) << "=> reply->error():" << reply->error() << "- propfindJob->errorString():" << reply->errorString();
         propagator()->_activeJobList.removeOne(this);
         done(SyncFileItem::NormalError, {}, errorCategoryFromNetworkError(err));
     });

src/libsync/syncengine.cpp

@@ -683,6 +683,7 @@ void SyncEngine::startSync()
     connect(_discoveryPhase.data(), &DiscoveryPhase::existingFolderNowBig, this, &SyncEngine::existingFolderNowBig);
     connect(_discoveryPhase.data(), &DiscoveryPhase::fatalError, this, [this](const QString &errorString, ErrorCategory errorCategory) {
         Q_EMIT syncError(errorString, errorCategory);
+        qCWarning(lcEngine) << "=> SyncEngine DiscoveryPhase::fatalError emitted:" << errorString;
         finalize(false);
     });
     connect(_discoveryPhase.data(), &DiscoveryPhase::finished, this, &SyncEngine::slotDiscoveryFinished);