improve logging of the discovery policy when scanning a folder

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
nextcloud · Nov 17, 2022 · 30badcc · 30badcc
1 parent 7de310c
commit 30badcc
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 18 deletions.
diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
@@ -37,6 +37,28 @@ namespace OCC {
 
 Q_LOGGING_CATEGORY(lcDisco, "nextcloud.sync.discovery", QtInfoMsg)
 
+ProcessDirectoryJob::ProcessDirectoryJob(DiscoveryPhase *data, PinState basePinState, qint64 lastSyncTimestamp, QObject *parent)
+ : QObject(parent)
+ , _lastSyncTimestamp(lastSyncTimestamp)
+ , _discoveryData(data)
+{
+ qCDebug(lcDisco) << data;
+ computePinState(basePinState);
+}
+
+ProcessDirectoryJob::ProcessDirectoryJob(const PathTuple &path, const SyncFileItemPtr &dirItem, QueryMode queryLocal, QueryMode queryServer, qint64 lastSyncTimestamp, ProcessDirectoryJob *parent)
+ : QObject(parent)
+ , _dirItem(dirItem)
+ , _lastSyncTimestamp(lastSyncTimestamp)
+ , _queryServer(queryServer)
+ , _queryLocal(queryLocal)
+ , _discoveryData(parent->_discoveryData)
+ , _currentFolder(path)
+{
+ qCDebug(lcDisco) << path._server << queryServer << path._local << queryLocal << lastSyncTimestamp;
+ computePinState(parent->_pinState);
+}
+
 void ProcessDirectoryJob::start()
 {
  qCInfo(lcDisco) << "STARTING" << _currentFolder._server << _queryServer << _currentFolder._local << _queryLocal;
@@ -52,6 +74,7 @@ void ProcessDirectoryJob::start()
  if (!_discoveryData->_shouldDiscoverLocaly(_currentFolder._local)
  && (_currentFolder._local == _currentFolder._original || !_discoveryData->_shouldDiscoverLocaly(_currentFolder._original))) {
  _queryLocal = ParentNotChanged;
+ qCDebug(lcDisco) << "adjusted discovery policy" << _currentFolder._server << _queryServer << _currentFolder._local << _queryLocal;
  }
  }
 

diff --git a/src/libsync/discovery.h b/src/libsync/discovery.h
@@ -64,28 +64,12 @@ class ProcessDirectoryJob : public QObject
  * The base pin state is used if the root dir's pin state can't be retrieved.
  */
  explicit ProcessDirectoryJob(DiscoveryPhase *data, PinState basePinState,
- qint64 lastSyncTimestamp, QObject *parent)
- : QObject(parent)
- , _lastSyncTimestamp(lastSyncTimestamp)
- , _discoveryData(data)
- {
- computePinState(basePinState);
- }
+ qint64 lastSyncTimestamp, QObject *parent);
 
  /// For creating subjobs
  explicit ProcessDirectoryJob(const PathTuple &path, const SyncFileItemPtr &dirItem,
  QueryMode queryLocal, QueryMode queryServer, qint64 lastSyncTimestamp,
- ProcessDirectoryJob *parent)
- : QObject(parent)
- , _dirItem(dirItem)
- , _lastSyncTimestamp(lastSyncTimestamp)
- , _queryServer(queryServer)
- , _queryLocal(queryLocal)
- , _discoveryData(parent->_discoveryData)
- , _currentFolder(path)
- {
- computePinState(parent->_pinState);
- }
+ ProcessDirectoryJob *parent);
 
  void start();
  /** Start up to nbJobs, return the number of job started; emit finished() when done */