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

1 files changed, 17 insertions, 8 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 931fa2af..832f42d0 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1263,9 +1263,9 @@ void MainWindow::updateTo(QTreeWidgetItem *subTree, const std::wstring &director
         source = modInfo->name();

       }

 

-      std::wstring archive = current->getArchive();

-      if (archive.length() != 0) {

-        source.append(" (").append(ToQString(archive)).append(")");

+      std::pair<std::wstring, int> archive = current->getArchive();

+      if (archive.first.length() != 0) {

+        source.append(" (").append(ToQString(archive.first)).append(")");

       }

       columns.append(source);

       QTreeWidgetItem *fileChild = new QTreeWidgetItem(columns);

@@ -1287,12 +1287,12 @@ void MainWindow::updateTo(QTreeWidgetItem *subTree, const std::wstring &director
       fileChild->setData(1, Qt::UserRole, source);

       fileChild->setData(1, Qt::UserRole + 1, originID);

 

-      std::vector<std::pair<int, std::wstring>> alternatives = current->getAlternatives();

+      std::vector<std::pair<int, std::pair<std::wstring, int>>> alternatives = current->getAlternatives();

 

       if (!alternatives.empty()) {

         std::wostringstream altString;

         altString << ToWString(tr("Also in: <br>"));

-        for (std::vector<std::pair<int, std::wstring>>::iterator altIter = alternatives.begin();

+        for (std::vector<std::pair<int, std::pair<std::wstring, int>>>::iterator altIter = alternatives.begin();

              altIter != alternatives.end(); ++altIter) {

           if (altIter != alternatives.begin()) {

             altString << " , ";

@@ -2196,9 +2196,16 @@ void MainWindow::modorder_changed()
       for (int i :  modInfo->getModOverwritten()) {

         ModInfo::getByIndex(i)->clearCaches();

       }

+      for (int i : modInfo->getModArchiveOverwrite()) {

+          ModInfo::getByIndex(i)->clearCaches();

+      }

+      for (int i : modInfo->getModArchiveOverwritten()) {

+          ModInfo::getByIndex(i)->clearCaches();

+      }

       // update conflict check on the moved mod

       modInfo->doConflictCheck();

       m_OrganizerCore.modList()->setOverwriteMarkers(modInfo->getModOverwrite(), modInfo->getModOverwritten());

+      m_OrganizerCore.modList()->setArchiveOverwriteMarkers(modInfo->getModArchiveOverwrite(), modInfo->getModArchiveOverwritten());

       if (m_ModListSortProxy != nullptr) {

         m_ModListSortProxy->invalidate();

       }

@@ -2274,7 +2281,7 @@ void MainWindow::fileMoved(const QString &filePath, const QString &oldOriginName
         WIN32_FIND_DATAW findData;

 		HANDLE hFind;

 		hFind = ::FindFirstFileW(ToWString(fullNewPath).c_str(), &findData);

-        filePtr->addOrigin(newOrigin.getID(), findData.ftCreationTime, L"");

+        filePtr->addOrigin(newOrigin.getID(), findData.ftCreationTime, L"", -1);

 		FindClose(hFind);

       }

       if (m_OrganizerCore.directoryStructure()->originExists(ToWString(oldOriginName))) {

@@ -2434,8 +2441,10 @@ void MainWindow::modlistSelectionChanged(const QModelIndex &current, const QMode
   if (current.isValid()) {

     ModInfo::Ptr selectedMod = ModInfo::getByIndex(current.data(Qt::UserRole + 1).toInt());

     m_OrganizerCore.modList()->setOverwriteMarkers(selectedMod->getModOverwrite(), selectedMod->getModOverwritten());

+    m_OrganizerCore.modList()->setArchiveOverwriteMarkers(selectedMod->getModArchiveOverwrite(), selectedMod->getModArchiveOverwritten());

   } else {

     m_OrganizerCore.modList()->setOverwriteMarkers(std::set<unsigned int>(), std::set<unsigned int>());

+    m_OrganizerCore.modList()->setArchiveOverwriteMarkers(std::set<unsigned int>(), std::set<unsigned int>());

   }

 /*  if ((m_ModListSortProxy != nullptr)

       && !m_ModListSortProxy->beingInvalidated()) {

@@ -2656,7 +2665,7 @@ void MainWindow::displayModInformation(ModInfo::Ptr modInfo, unsigned int index,
     }

   } else {

     modInfo->saveMeta();

-    ModInfoDialog dialog(modInfo, m_OrganizerCore.directoryStructure(), modInfo->hasFlag(ModInfo::FLAG_FOREIGN), &m_OrganizerCore, &m_PluginContainer,this);

+    ModInfoDialog dialog(modInfo, m_OrganizerCore.directoryStructure(), modInfo->hasFlag(ModInfo::FLAG_FOREIGN), &m_OrganizerCore, &m_PluginContainer, this);

     connect(&dialog, SIGNAL(linkActivated(QString)), this, SLOT(linkClicked(QString)));

     connect(&dialog, SIGNAL(downloadRequest(QString)), &m_OrganizerCore, SLOT(downloadRequestedNXM(QString)));

     connect(&dialog, SIGNAL(modOpen(QString, int)), this, SLOT(displayModInformation(QString, int)), Qt::QueuedConnection);

@@ -2691,7 +2700,6 @@ void MainWindow::displayModInformation(ModInfo::Ptr modInfo, unsigned int index,
     m_OrganizerCore.settings().directInterface().setValue("mod_info_tabs", dialog.saveTabState());

     settings.setValue(key, dialog.saveGeometry());

 

-

     modInfo->saveMeta();

     emit modInfoDisplayed();

     m_OrganizerCore.modList()->modInfoChanged(modInfo);

@@ -2713,6 +2721,7 @@ void MainWindow::displayModInformation(ModInfo::Ptr modInfo, unsigned int index,
                                              , modInfo->stealFiles()

                                              , modInfo->archives());

       DirectoryRefresher::cleanStructure(m_OrganizerCore.directoryStructure());

+      m_OrganizerCore.directoryStructure()->getFileRegister()->sortOrigins();

       m_OrganizerCore.refreshLists();

     }

   }