Propagation: Fix dir <-> file changes propagating to server #4302

* Ensure every time a file becomes a directory or the other way around
  the item is flagged as INSTRUCTION_TYPE_CHANGE.
* Delete the badly-typed entity if necessary in the propagation jobs.

1 files changed, 15 insertions, 1 deletions

diff --git a/src/libsync/propagatedownload.h b/src/libsync/propagatedownload.h
index 32e05db28..8ba11f1b5 100644
--- a/src/libsync/propagatedownload.h
+++ b/src/libsync/propagatedownload.h
@@ -110,10 +110,21 @@ class PropagateDownloadFileQNAM : public PropagateItemJob {
     Q_OBJECT
 public:
     PropagateDownloadFileQNAM(OwncloudPropagator* propagator,const SyncFileItemPtr& item)
-        : PropagateItemJob(propagator, item), _resumeStart(0), _downloadProgress(0) {}
+        : PropagateItemJob(propagator, item), _resumeStart(0), _downloadProgress(0), _deleteExisting(false) {}
     void start() Q_DECL_OVERRIDE;
     qint64 committedDiskSpace() const Q_DECL_OVERRIDE;
 
+    /**
+     * Whether an existing folder with the same name may be deleted before
+     * the download.
+     *
+     * If it's a non-empty folder, it'll be renamed to a conflict-style name
+     * to preserve any non-synced content that may be inside.
+     *
+     * Default: false.
+     */
+    void setDeleteExistingFolder(bool enabled);
+
 private slots:
     void slotGetFinished();
     void abort() Q_DECL_OVERRIDE;
@@ -122,10 +133,13 @@ private slots:
     void slotChecksumFail( const QString& errMsg );
 
 private:
+    void deleteExistingFolder();
+
     quint64 _resumeStart;
     qint64 _downloadProgress;
     QPointer<GETFileJob> _job;
     QFile _tmpFile;
+    bool _deleteExisting;
 };
 
 }