From 8d6c715672023577dca5a6528ff49081dede1052 Mon Sep 17 00:00:00 2001
From: Silarn <jrim@rimpo.org>
Date: Wed, 11 Apr 2018 17:46:59 -0500
Subject: Initial archive conflict parsing

Squashed commit:
  Basic archive conflict parsing - pass 1
  Merge fixes for archive parsing
  Basic archive conflict parsing - pass 1
  Merge fixes for archive parsing
  Should fix conflict detection for archive files
---
 src/modlist.cpp | 40 +++++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

(limited to 'src/modlist.cpp')

diff --git a/src/modlist.cpp b/src/modlist.cpp
index 16d2cd07..e9a12862 100644
--- a/src/modlist.cpp
+++ b/src/modlist.cpp
@@ -163,6 +163,9 @@ QString ModList::getFlagText(ModInfo::EFlag flag, ModInfo::Ptr modInfo) const
     case ModInfo::FLAG_CONFLICT_MIXED: return tr("Overwrites & Overwritten");
     case ModInfo::FLAG_CONFLICT_REDUNDANT: return tr("Redundant");
     case ModInfo::FLAG_ALTERNATE_GAME: return tr("Alternate game source");
+    case ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITE: return tr("Overwrites another archive file");
+    case ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITTEN: return tr("Overwritten by another archive file");
+    case ModInfo::FLAG_ARCHIVE_CONFLICT_MIXED: return tr("Archive files overwrites & overwritten");
     default: return "";
   }
 }
@@ -401,10 +404,18 @@ QVariant ModList::data(const QModelIndex &modelIndex, int role) const
              || (role == ViewMarkingScrollBar::DEFAULT_ROLE)) {
     if (modInfo->getHighlight() & ModInfo::HIGHLIGHT_PLUGIN) {
       return Settings::instance().modlistContainsPluginColor();
-    } else if (m_Overwrite.find(modIndex) != m_Overwrite.end()) {
+    } else if (m_Overwrite.find(modIndex) != m_Overwrite.end() && m_ArchiveOverwritten.find(modIndex) != m_ArchiveOverwritten.end()) {
+        return QColor(255, 0, 255, 32); //TODO: Make configurable
+    } else if (m_Overwrite.find(modIndex) != m_Overwrite.end() && m_ArchiveOverwritten.find(modIndex) != m_ArchiveOverwritten.end()) {
+        return QColor(255, 0, 255, 32); //TODO: Make configurable
+    } else if (m_Overwritten.find(modIndex) != m_Overwritten.end() && m_ArchiveOverwrite.find(modIndex) != m_ArchiveOverwrite.end()) {
+        return QColor(255, 0, 255, 32); //TODO: Make configurable
+    } else if (m_Overwritten.find(modIndex) != m_Overwritten.end() && m_ArchiveOverwrite.find(modIndex) != m_ArchiveOverwrite.end()) {
+        return QColor(255, 0, 255, 32); //TODO: Make configurable
+    } else if (m_Overwrite.find(modIndex) != m_Overwrite.end() || m_ArchiveOverwrite.find(modIndex) != m_ArchiveOverwrite.end()) {
       return Settings::instance().modlistOverwrittenLooseColor();
     }
-    else if (m_Overwritten.find(modIndex) != m_Overwritten.end()) {
+    } else if (m_Overwritten.find(modIndex) != m_Overwritten.end() || m_ArchiveOverwritten.find(modIndex) != m_ArchiveOverwritten.end()) {
       return Settings::instance().modlistOverwritingLooseColor();
     } else if (modInfo->hasFlag(ModInfo::FLAG_SEPARATOR)
                && modInfo->getColor().isValid()
@@ -516,7 +527,6 @@ bool ModList::setData(const QModelIndex &index, const QVariant &value, int role)
   ModInfo::Ptr info = ModInfo::getByIndex(modID);
   IModList::ModStates oldState = state(modID);
 
-
   bool result = false;
 
   emit aboutToChangeData();
@@ -754,9 +764,23 @@ void ModList::setOverwriteMarkers(const std::set<unsigned int> &overwrite, const
   notifyChange(0, rowCount() - 1);
 }
 
+void ModList::setArchiveOverwriteMarkers(const std::set<unsigned int> &overwrite, const std::set<unsigned int> &overwritten)
+{
+    m_ArchiveOverwrite = overwrite;
+    m_ArchiveOverwritten = overwritten;
+    notifyChange(0, rowCount() - 1);
+}
+
 void ModList::setPluginContainer(PluginContainer *pluginContianer)
 {
-  m_PluginContainer = pluginContianer;
+    m_PluginContainer = pluginContianer;
+}
+
+void ModList::setArchiveOverwriteMarkers(const std::set<unsigned int> &overwrite, const std::set<unsigned int> &overwritten)
+{
+    m_ArchiveOverwrite = overwrite;
+    m_ArchiveOverwritten = overwritten;
+    notifyChange(0, rowCount() - 1);
 }
 
 bool ModList::modInfoAboutToChange(ModInfo::Ptr info)
@@ -810,10 +834,10 @@ void ModList::highlightMods(const QItemSelectionModel *selection, const MOShared
     const MOShared::FileEntry::Ptr fileEntry = directoryEntry.findFile(modName.toStdWString());
     if (fileEntry.get() != nullptr) {
       bool archive = false;
-      std::vector<std::pair<int, std::wstring>> origins;
+      std::vector<std::pair<int, std::pair<std::wstring, int>>> origins;
       {
-        std::vector<std::pair<int, std::wstring>> alternatives = fileEntry->getAlternatives();
-        origins.insert(origins.end(), std::pair<int, std::wstring>(fileEntry->getOrigin(archive), fileEntry->getArchive()));
+        std::vector<std::pair<int, std::pair<std::wstring, int>>> alternatives = fileEntry->getAlternatives();
+        origins.insert(origins.end(), std::pair<int, std::pair<std::wstring, int>>(fileEntry->getOrigin(archive), fileEntry->getArchive()));
       }
       for (auto originInfo : origins) {
         MOShared::FilesOrigin &origin = directoryEntry.getOriginByID(originInfo.first);
@@ -1117,6 +1141,8 @@ void ModList::notifyChange(int rowStart, int rowEnd)
   if (rowStart < 0) {
     m_Overwrite.clear();
     m_Overwritten.clear();
+    m_ArchiveOverwrite.clear();
+    m_ArchiveOverwritten.clear();
     beginResetModel();
     endResetModel();
   } else {
-- 
cgit v1.3.1