More overwrite move / delete restrictions

Author: Silarn

src/modlist.cpp

@@ -1028,15 +1028,46 @@ bool ModList::dropLocalFiles(const ModListDropInfo& dropInfo, int row,
   QList<QPair<QString, QString>> relativePathList;
 
   for (auto localUrl : dropInfo.localUrls()) {
-
     QFileInfo sourceInfo(localUrl.url.toLocalFile());
-    QString sourceFile = sourceInfo.canonicalFilePath();
+    if (localUrl.originName.compare("overwrite", Qt::CaseInsensitive) == 0) {
+      if (sourceInfo.isDir()) {
+        for (auto dir : m_Organizer->managedGame()->getModMappings().keys()) {
+          QDir overDir(m_Organizer->overwritePath());
+          if (sourceInfo.canonicalFilePath().compare(overDir.absoluteFilePath(dir),
+                                                     Qt::CaseInsensitive) == 0) {
+
+            QDirIterator dirIter(overDir.absoluteFilePath(dir),
+                                 QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot);
+            while (dirIter.hasNext()) {
+              auto entry         = dirIter.nextFileInfo();
+              QString sourceFile = entry.canonicalFilePath();
+
+              QFileInfo targetInfo(modDir.absoluteFilePath(overDir.relativeFilePath(entry.absoluteFilePath())));
+              sourceList << sourceFile;
+              targetList << targetInfo.absoluteFilePath();
+              relativePathList << QPair<QString, QString>(localUrl.relativePath,
+                                                          localUrl.originName);
+            }
+          }
+        }
+      } else {
+        QString sourceFile = sourceInfo.canonicalFilePath();
 
-    QFileInfo targetInfo(modDir.absoluteFilePath(localUrl.relativePath));
-    sourceList << sourceFile;
-    targetList << targetInfo.absoluteFilePath();
-    relativePathList << QPair<QString, QString>(localUrl.relativePath,
-                                                localUrl.originName);
+        QFileInfo targetInfo(modDir.absoluteFilePath(localUrl.relativePath));
+        sourceList << sourceFile;
+        targetList << targetInfo.absoluteFilePath();
+        relativePathList << QPair<QString, QString>(localUrl.relativePath,
+                                                    localUrl.originName);
+      }
+    } else {
+      QString sourceFile = sourceInfo.canonicalFilePath();
+
+      QFileInfo targetInfo(modDir.absoluteFilePath(localUrl.relativePath));
+      sourceList << sourceFile;
+      targetList << targetInfo.absoluteFilePath();
+      relativePathList << QPair<QString, QString>(localUrl.relativePath,
+                                                  localUrl.originName);
+    }
   }
 
   if (sourceList.count()) {

src/overwriteinfodialog.cpp

@@ -18,7 +18,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "overwriteinfodialog.h"
-#include "organizercore.h"
 #include "report.h"
 #include "ui_overwriteinfodialog.h"
 #include "utility.h"
@@ -39,7 +38,7 @@ OverwriteInfoDialog::OverwriteInfoDialog(ModInfo::Ptr modInfo, OrganizerCore &or
 
   this->setWindowModality(Qt::NonModal);
 
-  m_FileSystemModel = new OverwriteFileSystemModel(this);
+  m_FileSystemModel = new OverwriteFileSystemModel(this, organizer);
   m_FileSystemModel->setReadOnly(false);
   setModInfo(modInfo);
   ui->filesView->setModel(m_FileSystemModel);

src/overwriteinfodialog.h

@@ -21,6 +21,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #define OVERWRITEINFODIALOG_H
 
 #include "modinfo.h"
+#include "modlistdropinfo.h"
+#include "organizercore.h"
 #include <QDialog>
 #include <QFileSystemModel>
 
@@ -34,8 +36,8 @@ class OverwriteFileSystemModel : public QFileSystemModel
   Q_OBJECT;
 
 public:
-  OverwriteFileSystemModel(QObject* parent)
-      : QFileSystemModel(parent), m_RegularColumnCount(0)
+  OverwriteFileSystemModel(QObject* parent, OrganizerCore &organizer)
+      : QFileSystemModel(parent), m_Organizer(organizer), m_RegularColumnCount(0)
   {}
 
   virtual int columnCount(const QModelIndex& parent) const
@@ -70,8 +72,27 @@ class OverwriteFileSystemModel : public QFileSystemModel
     }
   }
 
+  virtual bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row,
+    int column, const QModelIndex& parent)
+  {
+    ModListDropInfo dropInfo(data, m_Organizer);
+    if (dropInfo.isLocalFileDrop()) {
+      for (auto entry : dropInfo.localUrls()) {
+        QFileInfo sourceInfo(entry.url.toLocalFile());
+        if (sourceInfo.isDir() &&
+            m_Organizer.managedGame()->getModMappings().keys().contains(
+                entry.relativePath, Qt::CaseInsensitive)) {
+          return false;
+        }
+      }
+    }
+    return QFileSystemModel::dropMimeData(data, action, row, column, parent);
+  }
+
 private:
   mutable int m_RegularColumnCount;
+
+  OrganizerCore &m_Organizer;
 };
 
 class OverwriteInfoDialog : public QDialog